commit a0823d20eb94075ae75be3dbd9527f9ed1fdd0cf Merge: ca0089066 2460b4461 Author: teor <teor@torproject.org> Date: Fri Apr 19 11:56:25 2019 +1000 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug23790 | 6 ++++++ changes/bug29665 | 7 +++++++ src/or/circuituse.c | 5 ++++- src/or/rendservice.c | 27 +++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-)