[tor-commits] [tor/master] Merge branch 'ticket12399_035' into maint-0.4.1

[nickm at torproject.org]

commit e3a458e441fe9f823d564ca66753e3b76c7c0943
Merge: 25e7fc5b7 05fa1689e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 2 14:11:18 2019 -0400

    Merge branch 'ticket12399_035' into maint-0.4.1

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