[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 3fa9c9b68891a126604bc4cc1e75d63fd53f07b7
Merge: f48daef eb94200
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 14:24:30 2013 -0400

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

 changes/bug8464      |    5 +++++
 src/or/routerparse.c |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)