commit f797ac465fa474bc530d76dd92e499584be18ca3 Merge: 4824f3a c36bdbd Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 16 14:49:41 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug9254 | 4 ++++ src/or/circuitlist.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)