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