[tor-commits] [tor-browser-bundle/master] Bug 16884: Prefer IPv6 if available in Tor Browser

[gk at torproject.org]

commit 1f39acfbe083e3fac156345253b76ba785147ea9
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jul 28 22:45:03 2015 +0000

    Bug 16884: Prefer IPv6 if available in Tor Browser
---
 Bundle-Data/linux/Data/Tor/torrc-defaults          |    2 +-
 Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults |    2 +-
 Bundle-Data/windows/Data/Tor/torrc-defaults        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults
index 819b9e8..e4c8920 100644
--- a/Bundle-Data/linux/Data/Tor/torrc-defaults
+++ b/Bundle-Data/linux/Data/Tor/torrc-defaults
@@ -5,6 +5,6 @@ AvoidDiskWrites 1
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort 9150
+SocksPort 9150 IPv6Traffic PreferIPv6
 ControlPort 9151
 CookieAuthentication 1
diff --git a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
index 819b9e8..e4c8920 100644
--- a/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
+++ b/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
@@ -5,6 +5,6 @@ AvoidDiskWrites 1
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort 9150
+SocksPort 9150 IPv6Traffic PreferIPv6
 ControlPort 9151
 CookieAuthentication 1
diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults
index 819b9e8..e4c8920 100644
--- a/Bundle-Data/windows/Data/Tor/torrc-defaults
+++ b/Bundle-Data/windows/Data/Tor/torrc-defaults
@@ -5,6 +5,6 @@ AvoidDiskWrites 1
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort 9150
+SocksPort 9150 IPv6Traffic PreferIPv6
 ControlPort 9151
 CookieAuthentication 1