commit e4c5001bad3729ab187ad1ba0e2bfd6912786756 Merge: 4235425 8b4195f Author: Nick Mathewson nickm@torproject.org Date: Sun Mar 10 23:00:13 2013 -0400

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

src/or/routerset.c | 2 +- src/or/transports.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)