[tor-commits] [tor-browser-bundle/maint-5.0] Bug 17124: No patch for tor alpha > 0.2.7.2 anymore

[gk at torproject.org]

commit a1e91e917dab27d229c49484d89400193d2b340b
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Dec 10 08:51:29 2015 +0000

    Bug 17124: No patch for tor alpha > 0.2.7.2 anymore
---
 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 +-
 gitian/descriptors/linux/gitian-tor.yml            |    2 --
 gitian/descriptors/mac/gitian-tor.yml              |    2 --
 gitian/descriptors/windows/gitian-tor.yml          |    2 --
 6 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults
index e4c8920..4b91aae 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 IPv6Traffic PreferIPv6
+SocksPort 9150 IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth
 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 e4c8920..4b91aae 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 IPv6Traffic PreferIPv6
+SocksPort 9150 IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth
 ControlPort 9151
 CookieAuthentication 1
diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults
index e4c8920..4b91aae 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 IPv6Traffic PreferIPv6
+SocksPort 9150 IPv6Traffic PreferIPv6 KeepAliveIsolateSOCKSAuth
 ControlPort 9151
 CookieAuthentication 1
diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index 906077b..d8e3557 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -84,8 +84,6 @@ script: |
       git am ~/build/bug15482.patch
       git am ~/build/bug16430.patch
       git am ~/build/bug16674.patch
-  else
-      git am ~/build/bug15482.patch
   fi
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index 8e64922..1c07538 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -62,8 +62,6 @@ script: |
       git am ~/build/bug15482.patch
       git am ~/build/bug16430.patch
       git am ~/build/bug16674.patch
-  else
-      git am ~/build/bug15482.patch
   fi
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index 7320a65..9d6838c 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -62,8 +62,6 @@ script: |
       git am ~/build/bug15482.patch
       git am ~/build/bug16430.patch
       git am ~/build/bug16674.patch
-  else
-      git am ~/build/bug15482.patch
   fi
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src