[tor-commits] [stem/master] Replace SocksPort with SocksListenAddress in base torrc

[atagar at torproject.org]

commit 667cafa0c5fbdcc74dfb781ef8f55ac84d727112
Author: Sean Robinson <seankrobinson at gmail.com>
Date:   Sat Dec 22 06:14:37 2012 -0700

    Replace SocksPort with SocksListenAddress in base torrc
    
    This is the most widely accepted format for specifying a SOCKS port,
    it works with tor 0.2.1.x - 0.2.4.x.  SocksPort is preferred for tor
    0.2.4.x and later, but this also acceptable.
    
    Signed-off-by: Sean Robinson <seankrobinson at gmail.com>
---
 test/runner.py |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/runner.py b/test/runner.py
index 9cdf509..f3e44f3 100644
--- a/test/runner.py
+++ b/test/runner.py
@@ -68,11 +68,14 @@ STATUS_ATTR = (term.Color.BLUE, term.Attr.BOLD)
 SUBSTATUS_ATTR = (term.Color.BLUE, )
 ERROR_ATTR = (term.Color.RED, term.Attr.BOLD)
 
+SOCKS_HOST = "127.0.0.1"
+SOCKS_PORT = 1112
+
 BASE_TORRC = """# configuration for stem integration tests
-DataDirectory %s
-SocksPort 1112
+DataDirectory %%s
+SocksListenAddress %s:%i
 DownloadExtraInfo 1
-"""
+""" % (SOCKS_HOST, SOCKS_PORT)
 
 # We make some paths relative to stem's base directory (the one above us)
 # rather than the process' cwd. This doesn't end with a slash.