[tor-commits] [tor/maint-0.3.5] Merge branch 'bug28979_035' into maint-0.3.5

[nickm at torproject.org]

commit 9ce1978b5ea630bca699eb1cf7f3f1c178f8e939
Merge: a8580a683 7c6a8c674
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 22 08:04:52 2019 -0500

    Merge branch 'bug28979_035' into maint-0.3.5

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