commit 0e554f93d677fefc649d103ed08ba298c27b3fed Merge: bc532bb dfc9c6a Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 19 12:31:42 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

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