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

[nickm at torproject.org]

commit 286d02995ff593cad9414e6755a94221171d9854
Merge: 76e9de7c6 049ba6674
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 13 09:58:05 2018 -0400

    Merge branch 'maint-0.3.3'

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