[tor-commits] [tor/master] Merge branch 'bug8037_squashed' into maint-0.2.4

[nickm at torproject.org]

commit 42731f69efc1f7b0614a33cd6ea7a70903bfc98b
Merge: a6545d6 0cf2c01
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 17 10:45:45 2013 -0400

    Merge branch 'bug8037_squashed' into maint-0.2.4

 changes/bug8037      |    8 ++++++++
 src/common/util.c    |   14 ++++++++++++++
 src/common/util.h    |    3 +++
 src/or/routerparse.c |   13 ++++++++++---
 4 files changed, 35 insertions(+), 3 deletions(-)