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

[nickm at torproject.org]

commit 3fc0f9efb8b0030bab2574e5998a964adc93ebaa
Merge: f050cf7 ef3d7f2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 16 14:57:14 2014 -0400

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

 src/or/routerlist.c |    1 -
 1 file changed, 1 deletion(-)