commit c7d2671f78df07bd66b750f05e6a4699dc7e18b2 Merge: 2e71f3ccf 049ba6674 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 13 09:58:05 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)