[tor-commits] [tor/maint-0.2.8] Merge branch 'bug20203_027_squashed' into maint-0.2.8

[nickm at torproject.org]

commit 6e96eababe8f05ac03b2e83911e6fae5654884b4
Merge: 1edea87 e4aaf76
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 22 15:17:00 2016 -0400

    Merge branch 'bug20203_027_squashed' into maint-0.2.8

 changes/bug20203     |  6 ++++++
 src/or/circuitlist.c | 10 ++++++++--
 src/or/relay.c       |  9 +++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)