commit fe5ecaa270b037e76226bd7acda10a14611eef93 Merge: 78b2984ac 259fad587 Author: teor <teor@torproject.org> Date: Thu Mar 19 17:02:02 2020 +1000 Merge branch 'maint-0.4.3' changes/ticket33623 | 2 ++ doc/tor.1.txt | 2 +- src/core/or/sendme.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)