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

[nickm at torproject.org]

commit 87c7e96eaafb7acb13b38928e2c0f80554303cae
Merge: 19421ffcf fd36bd897
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 20 07:50:46 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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