[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

[nickm at torproject.org]

commit 62482ea279d51768e5cd510d5e23808333709182
Merge: 27c3a1d65 cc7de9ce1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Mar 3 11:53:05 2018 -0500

    Merge branch 'maint-0.3.3'

 changes/refactor23814      |   4 +
 doc/tor.1.txt              |  30 ---
 src/or/bridges.c           |   4 +-
 src/or/config.c            |  70 +------
 src/or/control.c           |  39 +---
 src/or/directory.c         | 122 ++++--------
 src/or/directory.h         |  25 +--
 src/or/microdesc.c         |   3 +-
 src/or/networkstatus.c     |  27 +--
 src/or/or.h                |  40 ----
 src/or/routerlist.c        |  19 +-
 src/or/routerparse.c       |   1 -
 src/test/test_controller.c |  26 ++-
 src/test/test_dir.c        | 467 ++-------------------------------------------
 src/test/test_options.c    |  19 --
 15 files changed, 109 insertions(+), 787 deletions(-)