commit 25ccecd0f0c72fd6f8e7a7ec1af4dfadac5a46ec Merge: 2e3dce604 6017447e3 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 13 09:58:04 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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