[tor-commits] [tor/master] Merge branch 'tor-github/pr/1850'

[asn at torproject.org]

commit 3121e5c103473255002761ac9aed6874b10aa78d
Merge: fb281daf2 cc5319bf8
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu May 21 16:24:32 2020 +0300

    Merge branch 'tor-github/pr/1850'

 changes/ticket33778        |  3 +++
 doc/tor.1.txt              | 19 +++++++++----------
 src/app/config/testnet.inc |  2 ++
 3 files changed, 14 insertions(+), 10 deletions(-)