[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

commit 50406c272024be63047576a19a8159bd25239164 Merge: 6963aca6a 2d6914e39 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Apr 13 13:05:53 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug25691 | 6 ++++++ src/or/circuitbuild.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)