[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket20921'

[nickm at torproject.org]

commit 111c66b2f0f58206026ca6a72852c3afcb56b9e7
Merge: 9e5512b 7844c5d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 16 12:59:39 2017 -0500

    Merge remote-tracking branch 'public/ticket20921'

 changes/bug21118     |  6 +++++
 changes/ticket20921  |  4 ++++
 src/or/circuitlist.c | 63 +++++++++++++++++++++++++++++++---------------------
 3 files changed, 48 insertions(+), 25 deletions(-)