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

[nickm at torproject.org]

commit c9de30c590b7e47a6263b0e4d6b324c237b99330
Merge: 61d87dfa1 2d6914e39
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 13 13:05:53 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug25691      | 6 ++++++
 src/or/circuitbuild.c | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)