[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3

[teor at torproject.org]

commit 259fad5877ae4aefea7996eac4cac436d28e2ee6
Merge: 85414e1c1 ee3e98789
Author: teor <teor at torproject.org>
Date:   Thu Mar 19 16:56:49 2020 +1000

    Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3

 changes/ticket33623  | 2 ++
 src/core/or/sendme.h | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)