[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit acbfc9c8cc2c24adb610d391cb2b83d7cbc11719
Merge: 60fd08f a7b4633
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 15:32:44 2013 -0400

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

 changes/bug7950    |    4 ++++
 src/common/util.c  |   19 ++++++++++++++-----
 src/common/util.h  |    7 +++++--
 src/or/confparse.c |    5 ++++-
 4 files changed, 27 insertions(+), 8 deletions(-)