commit f52cfbfc0091dd759b51e6d236a4e4fbea22ba26 Merge: bba47a8 0e554f9 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 19 12:31:55 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug2750 | 6 ++++++ src/or/routerparse.c | 4 +++- 2 files changed, 9 insertions(+), 1 deletions(-)