commit 03f748d0ca00fa27279b3060eb19b5db23e18f6b Merge: c6d364e8a f0f2fab5e Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 13 11:03:08 2018 -0400

Merge branch 'maint-0.3.3'

changes/ticket23635 | 3 +++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)