[tor-commits] [tor/master] Merge branch 'bug1692-squashed'

[nickm at torproject.org]

commit b76f46c6d8ba5e7b3efa91ae5ef487ba05d3b3c4
Merge: 333df60 02a735d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 10 15:04:36 2011 -0400

    Merge branch 'bug1692-squashed'

 changes/bug1692   |    5 +++++
 src/common/util.c |   24 ++++++++++++++++++++++++
 src/common/util.h |    5 +++++
 src/or/config.c   |   28 +++++++++++++++++++++++++++-
 src/or/control.c  |   36 +++++++++++++++++++++++++++++++++++-
 src/or/control.h  |    1 +
 6 files changed, 97 insertions(+), 2 deletions(-)