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

[teor at torproject.org]

commit 6c2b153db0a82b1f8afb10d0a9f58f3daddc28a8
Merge: 1e9e3e3ea 259fad587
Author: teor <teor at torproject.org>
Date:   Thu Mar 19 17:01:58 2020 +1000

    Merge branch 'maint-0.4.3' into release-0.4.3

 changes/ticket33623  | 2 ++
 doc/tor.1.txt        | 2 +-
 src/core/or/sendme.h | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)