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

[dgoulet at torproject.org]

commit 4bd63bcaeb2f4a2ac06a5371cda15fb9debb85fd
Merge: a9820f072 f41bec129
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Nov 26 14:56:50 2018 -0500

    Merge branch 'ticket28128_035_01' into maint-0.3.5

 changes/ticket28128 | 4 ++++
 doc/tor.1.txt       | 1 +
 2 files changed, 5 insertions(+)