commit 448448120fbdc66dc03a354fae311a46e8266a2f Merge: 0ce74ec7e a8580a683 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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