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

[nickm at torproject.org]

commit d6f3e225194cce776d2c3dc51be61cbc7ade65fb
Merge: 6bb876ccd e3a458e44
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 2 14:11:32 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

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