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

[dgoulet at torproject.org]

commit 31d0f9aea751f17a348d62c39cab6e8ac818b20b
Merge: f60051708 4bd63bcae
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Nov 26 14:57:56 2018 -0500

    Merge branch 'maint-0.3.5' into release-0.3.5

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