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

commit 4027bd2e9680cb5922b006847aa4db6170826bf6 Merge: 8eef7fc84 1b5e34bad Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 12 10:38:35 2017 -0400

Merge branch 'bug23347_squashed'

changes/bug23347 | 9 +++++++++ doc/tor.1.txt | 21 ++++++++++++++------ src/or/bridges.c | 22 ++++++++++++++++----- src/or/bridges.h | 2 +- src/or/config.c | 16 ++++++++++++++-- src/or/directory.c | 13 ++++++++++--- src/or/or.h | 4 ++++ src/test/test_dir.c | 48 +++++++++++++++++++++++++++++++++++++--------- src/test/test_entrynodes.c | 2 ++ src/test/test_options.c | 1 + 10 files changed, 112 insertions(+), 26 deletions(-)