commit 761f1bf71e301f0b68718854379dd42e06fcd202 Merge: 41bb77822 4cca7fb99 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

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