[tor-commits] [tor/master] Merge branch 'dirreq'

[nickm at torproject.org]

commit 33a2fd065d1fd34eb4378fa2c8eb799ee5e7b172
Merge: 224259a b4fe0a6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 27 10:08:32 2017 -0400

    Merge branch 'dirreq'

 changes/ticket21646        |   6 +
 src/or/bridges.c           |  18 +-
 src/or/connection_edge.c   |   2 +-
 src/or/directory.c         | 579 ++++++++++++++++++++++++++++-----------------
 src/or/directory.h         |  62 ++---
 src/or/or.h                |  10 +-
 src/or/rendclient.c        |  16 +-
 src/or/rendservice.c       |  17 +-
 src/or/router.c            |  22 +-
 src/or/routerlist.c        |  42 ++--
 src/test/test_connection.c |   2 +-
 src/test/test_dir.c        |  56 ++---
 12 files changed, 492 insertions(+), 340 deletions(-)