commit f780d196a91b8c9c5c2581d37326599b4e97b945 Merge: 79e5348 addd181 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 28 16:13:39 2016 -0400

Merge branch 'bug18673_028_v2' into maint-0.2.8

changes/bug18673 | 4 ++++ src/or/circuitlist.c | 14 ++++++++++++++ src/or/circuitlist.h | 2 ++ src/or/control.c | 6 ++---- 4 files changed, 22 insertions(+), 4 deletions(-)