[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug7950' into maint-0.2.4

[nickm at torproject.org]

commit a7b46336eb5f1f7f734ac2d978c7ab17d1c870c0
Merge: 60d1442 1827be0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 15:32:17 2013 -0400

    Merge remote-tracking branch 'public/bug7950' into 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(-)