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

[arma at torproject.org]

commit 0eb141c4164df0b4fc5cbbaa5b86e70f294e2cb2
Merge: b4d81f1 b00a621
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Apr 17 11:19:51 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug7143      |    4 ++++
 changes/bug8037      |    8 ++++++++
 src/common/util.c    |   14 ++++++++++++++
 src/common/util.h    |    3 +++
 src/or/include.am    |    2 +-
 src/or/routerparse.c |   13 ++++++++++---
 6 files changed, 40 insertions(+), 4 deletions(-)