commit ed10b34efeb29e75e214e37e04fc01d61fb07612 Merge: 3d966f57a 7c1f33dd0 Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 5 14:09:21 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/ticket21031 | 7 +++++++ doc/tor.1.txt | 17 ++++++++--------- src/or/config.c | 18 ++++++++++++------ src/or/connection_edge.c | 2 +- src/or/or.h | 2 +- src/or/relay.c | 6 +++--- src/test/test_options.c | 5 +++-- src/test/test_relaycell.c | 4 ++-- 8 files changed, 37 insertions(+), 24 deletions(-)