commit 001367eb13579332739694f82905c71f2e91a351 Merge: 33c8150dd 761f1bf71 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug29029 | 5 +++++ src/or/rendmid.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)