commit e62b8051ee37f12c48205b8266745f02b0d5389f Merge: 80e9ca4 72c651e Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 26 22:20:33 2013 -0400

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

changes/bug7065 | 5 +++++ src/or/circuitbuild.c | 28 ++++++++++++++-------------- src/or/routerparse.c | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-)