[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit 06338dc605231d7c83b10a864d765a0fe5af79ec
Merge: ad70dd403 89a0b7774
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 18 12:25:08 2019 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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