commit dc9f2cdf73a4a55288f2321aa78b72ea188fedec Merge: dd5ca2505 bf89b0893 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 12 19:27:14 2017 -0500

Merge branch 'maint-0.3.2' into release-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(-)