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

[nickm at torproject.org]

commit eec86939d13681b3b6560caf6c49ec1b55c2489b
Merge: 1728801 e9172e5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 12:39:31 2012 -0400

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

 changes/bug6244_part_c |    6 ++++
 src/or/config.c        |   61 ++++++++++++++++++++++++++++++-----------------
 src/or/config.h        |    6 ++++
 src/or/control.c       |   15 +++++++++--
 4 files changed, 63 insertions(+), 25 deletions(-)