commit 8edc0be74baf61d5bd3db92106c83241289525c0 Merge: c7c043d2b 3618bd616 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 5 16:41:35 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/ticket24681 | 6 ++++++ doc/tor.1.txt | 3 ++- src/or/config.c | 9 ++++++++- 3 files changed, 16 insertions(+), 2 deletions(-)