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

[nickm at torproject.org]

commit 077f6a4888e88a4895e7b2234ff2fd81412307d0
Merge: 0baa276 d78711c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 22 15:20:31 2016 -0400

    Merge branch 'maint-0.2.8'

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