commit 6c749bf38ccf0ed9967482e1f0ca79b41ba7f9c7 Merge: ff5205175 e4245e2a6 Author: George Kadianakis desnacked@riseup.net Date: Tue Feb 4 13:06:00 2020 +0100

Merge branch 'tor-github/pr/1700'

changes/ticket32706 | 4 ++++ src/feature/rend/rendmid.c | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-)