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

[nickm at torproject.org]

commit 049ba66746006e45d8033d8f88f97ba61d8c5631
Merge: 1c80eb92f 6017447e3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 09:58:05 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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