[tor-commits] [tor/master] Merge remote-tracking branch 'asn-mytor/bug4725_take2'

[nickm at torproject.org]

commit 26053bd7c90b2bd8e72bc836c48434c8d6de633f
Merge: ba1766b 539cb62
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Dec 20 14:28:31 2011 -0500

    Merge remote-tracking branch 'asn-mytor/bug4725_take2'

 src/or/config.c     |   30 +++++++++++++++++++-----------
 src/or/config.h     |    2 +-
 src/or/transports.c |    7 ++++++-
 3 files changed, 26 insertions(+), 13 deletions(-)