commit babf8e2a859f56befa9a9f8da6697a954ce53f7c Merge: b50eb14 1040afb Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 3 11:23:06 2012 -0400

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

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