[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4

[teor at torproject.org]

commit 8154b33f9c01bc8da652849805e4badf531bc4b1
Merge: 4d504bf09 a3bc950e4
Author: teor <teor at torproject.org>
Date:   Fri Apr 19 11:43:46 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/791' into maint-0.3.4

 changes/bug29665    | 7 +++++++
 src/or/circuituse.c | 4 ++++
 2 files changed, 11 insertions(+)