commit d8ac7d557c0af199d21639a52a8c8c9dd201f555 Merge: 3bf9974b6 cb813a352 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 20 14:40:09 2018 -0400

Merge branch 'maint-0.3.3'

changes/25857 | 3 +++ doc/tor.1.txt | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)