[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/109'

[asn at torproject.org]

commit b46942d37fa0f67bb2367e11280dc35844a50935
Merge: f971a8fbad d89c1799af
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Aug 11 15:09:12 2020 +0300

    Merge remote-tracking branch 'tor-gitlab/mr/109'

 changes/ticket23378 | 4 ++++
 doc/man/tor.1.txt   | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)