commit 511e1cfde4152b3ad40cbc4ec6880f9035c5a3b9 Merge: 1b106cded 881f50a9a Author: Alexander Færøy ahf@torproject.org Date: Tue Jun 30 14:16:16 2020 +0000

Merge branch 'maint-0.4.2' into release-0.4.2

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