[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[teor at torproject.org]

commit 9db1602ec53aa74332c6faff40354a2b1c7f074d
Merge: 339c18d6c b45048fea
Author: teor <teor at torproject.org>
Date:   Wed Oct 23 08:47:30 2019 +1000

    Merge branch 'maint-0.4.2'

 changes/bug32106 |  5 +++++
 doc/tor.1.txt    | 21 +++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)