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

[nickm at torproject.org]

commit a7a0cebb59d3956a43ed65c22b15f60007b16f77
Merge: e8a6a6635 46f167886
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 5 19:49:45 2017 -0500

    Merge branch 'more_directories_squashed'

 changes/ticket22703            |   6 +
 doc/tor.1.txt                  |  71 ++++++----
 src/or/config.c                | 307 ++++++++++++++++++++++++++++-------------
 src/or/config.h                |  70 ++++++++--
 src/or/conscache.c             |   2 +-
 src/or/control.c               |   2 +-
 src/or/main.c                  | 159 ++++++++++++---------
 src/or/microdesc.c             |   4 +-
 src/or/networkstatus.c         |  18 ++-
 src/or/or.h                    |  15 +-
 src/or/router.c                |  43 ++----
 src/or/routerkeys.c            |  31 ++---
 src/or/routerlist.c            |  16 +--
 src/test/test_conscache.c      |  12 +-
 src/test/test_consdiffmgr.c    |   8 +-
 src/test/test_dir.c            |   6 +-
 src/test/test_dir_handle_get.c |   1 +
 src/test/test_microdesc.c      |  36 ++---
 src/test/test_routerkeys.c     |   9 +-
 src/test/testing_common.c      |   3 +
 20 files changed, 513 insertions(+), 306 deletions(-)