[tor-commits] [tor/master] Merge remote branch 'rransom/bug2572' into maint-0.2.2

[nickm at torproject.org]

commit 19e5b4c2f269c8842646213c8d78562553a7bfc8
Merge: d673479 444a955
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 22 01:02:35 2011 -0500

    Merge remote branch 'rransom/bug2572' into maint-0.2.2

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