commit 53c4068e80e20e0e7d57639108bb1bf4ad1bc983 Merge: 443df7e0d b45048fea Author: teor teor@torproject.org Date: Wed Oct 23 08:47:27 2019 +1000

Merge branch 'maint-0.4.2' into release-0.4.2

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