commit b655e77ec5d8d793e4313e7dd24da1d5c8e9e898 Merge: 9609d1325 4cca7fb99 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jan 18 12:25:08 2019 -0500 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug29029 | 5 +++++ src/or/rendmid.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)