commit 8d908b961fc90628c449b344f5181eeec3e3bd70 Merge: 8cc57bccf b95ef19a7 Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 24 19:37:11 2017 -0400

Merge branch 'maint-0.3.2'

changes/feature18329 | 9 ++++ doc/tor.1.txt | 11 +++++ src/or/config.c | 62 ++++++++++++++++++++++++++- src/or/config.h | 2 + src/or/or.h | 4 ++ src/or/router.c | 12 ++++++ src/test/include.am | 1 + src/test/test.c | 1 + src/test/test_config.c | 71 +++++++++++++++++++++++++++++++ src/test/test_router.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 284 insertions(+), 1 deletion(-)