commit 8a8b4ae69b4f8a28afcc245f98c11b34165ddaaf Merge: 01037c106 ac3e389db Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 5 08:21:43 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

changes/bug25582 | 3 +++ changes/bug25679 | 4 ++++ configure.ac | 12 ++++++------ doc/tor.1.txt | 6 +++++- 4 files changed, 18 insertions(+), 7 deletions(-)