commit 6017447e3ae8f3cd53c7c6fff1f8660c29affde4 Merge: ff70cc84f 94f300762 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 13 09:58:04 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)