commit 51f53b590ee15c972adcff9e7d94c904a9267ac2 Merge: 350fe95 4d8306e Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 7 10:44:02 2011 -0500

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

changes/bug4410 | 5 +++++ src/or/routerparse.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-)