commit 4cca7fb99b814d772587facbabfc9b5ad5b40d45 Merge: b5fdb91ad 89a0b7774 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 18 12:25:08 2019 -0500

Merge branch 'maint-0.2.9' into maint-0.3.3

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