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

[nickm at torproject.org]

commit 5dc6d2318c9aed60bfd17d856216323ec21eb3da
Merge: 448448120 9ce1978b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 22 08:04:55 2019 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

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