commit e47080a4d7e8f532e2278ddf75c7a144a6596b84 Merge: 720f044a2 6aaafb067 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 29 15:00:46 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

doc/tor.1.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)