commit 2460b4461f61c3b0fdeedb5bbfb21847a256a867 Merge: ec213ae8a add0f89c1 Author: teor teor@torproject.org Date: Fri Apr 19 11:42:09 2019 +1000

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

changes/bug29665 | 7 +++++++ src/or/circuituse.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-)