[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug5647_cleanup'

[nickm at torproject.org]

commit 5630b61f5c902704f4a4438c321503da2981cdac
Merge: 774c308 f2384d5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 20 11:28:57 2012 -0400

    Merge remote-tracking branch 'public/bug5647_cleanup'

 src/or/routerparse.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)