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

[nickm at torproject.org]

commit 56ae6d8766583c5d9c860ee569207c0d75f17aa8
Merge: a08e18545 fd36bd897
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 20 07:50:46 2018 -0400

    Merge branch 'maint-0.3.3'

 changes/bug25372     | 3 +++
 src/or/circuitlist.c | 8 ++++++++
 2 files changed, 11 insertions(+)