commit bf89b089306067cffa4d2ca6b7fa7cd54790a961 Merge: cf5ab5934 19a4abf2a Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 12 19:17:38 2017 -0500

Merge branch 'bug24367_032_squashed' into maint-0.3.2

changes/bug24367 | 13 +++++++++++++ src/or/bridges.c | 38 +++++++------------------------------- src/or/bridges.h | 1 - src/or/circuituse.c | 15 ++++++++++++--- src/or/directory.c | 9 +++++---- src/or/entrynodes.c | 26 ++++++++++++++++++++------ src/or/entrynodes.h | 3 +-- src/or/networkstatus.c | 4 +++- src/test/test_dir.c | 22 ++++++++++++---------- 9 files changed, 73 insertions(+), 58 deletions(-)