[tor-commits] [tor/master] Merge remote-tracking branch 'rransom-tor/bug4018'

[nickm at torproject.org]

commit b49fcc6cf2b893fca04eaec8d30bbfe25c04d360
Merge: e8ed465 c1ac069
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 7 16:32:04 2011 -0400

    Merge remote-tracking branch 'rransom-tor/bug4018'

 changes/dont-warn-about-rfc1918-socksport-addrs |    7 +++++++
 src/or/config.c                                 |    5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)