commit d1af4d65df8b5ef8049707029335049db147829f Merge: 9d7b4f1ca a8580a683 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.3.5'

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