commit 63312e0299090bb61de62cd5ed45166a70b7f698 Merge: 1e6ffeaea aebe8a82c Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 15 16:47:25 2018 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

changes/ticket26913 | 7 +++++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 21 +++++++++++++++++++-- 3 files changed, 30 insertions(+), 4 deletions(-)