commit a51630cc9af96642b05b9d0db345ea2d7d3ce128 Merge: 0c8f901ee 0803d79f5 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Apr 11 15:38:00 2018 -0400 Merge branch 'maint-0.3.3' changes/bug25581 | 4 ++++ doc/tor.1.txt | 20 ++++++++++---------- src/or/config.c | 7 +++++-- 3 files changed, 19 insertions(+), 12 deletions(-)