commit 7df4f23d952f892c09f5ef930e9e4f297f784cce Merge: caa16bf d78711c Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 22 15:20:19 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

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