commit 881f50a9a98102a4540575713b621652f108aef1 Merge: c9c4a3d0f ee3e98789 Author: Alexander Færøy ahf@torproject.org Date: Tue Jun 30 14:15:57 2020 +0000

Merge branch 'tor-github/pr/1806' into maint-0.4.2

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