commit 34ea50b32a189d22df535ba283a1d404a263780b Merge: 03461d5d4 94f300762 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 13 09:58:04 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug26158 | 5 +++++ src/or/circuitbuild.c | 1 + 2 files changed, 6 insertions(+)