commit ec213ae8a09505e97215cf9c54d1003c314c91f9 Merge: a0db5ade3 b4e44a371 Author: teor teor@torproject.org Date: Fri Apr 19 11:38:52 2019 +1000

Merge remote-tracking branch 'tor-github/pr/772' into maint-0.2.9

changes/bug23790 | 6 ++++++ src/or/rendservice.c | 27 +++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)