[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug20613' into maint-0.2.9

[nickm at torproject.org]

commit e8e7a8f3db9dfbc71e455eef3c7991c715231260
Merge: e4ef9f7 0ec9458
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 10 09:10:55 2016 -0500

    Merge remote-tracking branch 'teor/bug20613' into maint-0.2.9

 changes/bug20613    |  6 ++++++
 src/or/circuituse.c | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)