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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.1'

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