commit 27965f1ef2ff44e2ce7e3f1af72f9112fb30bde5 Merge: 003be727c 05fa1689e Author: teor teor@torproject.org Date: Wed Oct 23 08:30:48 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5

changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)