[tbb-commits] [tor-browser-bundle/master] Revert "The poodle hotfix."

[mikeperry at torproject.org]

commit 77e6fb571a69e4b146909dfda8f7552b34ab34d8
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Oct 24 16:29:43 2014 -0700

    Revert "The poodle hotfix."
    
    This reverts commit fd7e8eef09b813c445e31239bcb674de7a03d191.
    
    We set this pref in our browser preferences now.
---
 gitian/descriptors/linux/gitian-bundle.yml   |    4 ----
 gitian/descriptors/mac/gitian-bundle.yml     |    4 ----
 gitian/descriptors/windows/gitian-bundle.yml |    4 ----
 3 files changed, 12 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml
index 3de0d49..19233b6 100644
--- a/gitian/descriptors/linux/gitian-bundle.yml
+++ b/gitian/descriptors/linux/gitian-bundle.yml
@@ -146,8 +146,6 @@ script: |
   cp defaults/preferences/000-tor-browser.js ~/build/
   # Set the locale of the bundle.
   echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js
-  # The poodle hotfix
-  echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
   zip -Xm omni.ja defaults/preferences/000-tor-browser.js
   rm -rf defaults
   popd
@@ -178,8 +176,6 @@ script: |
     cp ~/build/000-tor-browser.js defaults/preferences/
     # Set the locale of the bundle.
     echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js
-    # The poodle hotfix
-    echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
     zip -Xm omni.ja defaults/preferences/000-tor-browser.js
     rm -rf defaults
     popd
diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml
index 9e78429..82b6595 100644
--- a/gitian/descriptors/mac/gitian-bundle.yml
+++ b/gitian/descriptors/mac/gitian-bundle.yml
@@ -166,8 +166,6 @@ script: |
   cp defaults/preferences/000-tor-browser.js ~/build/
   # Set the locale of the bundle.
   echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js
-  # The poodle hotfix
-  echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
   zip -Xm omni.ja defaults/preferences/000-tor-browser.js
   rm -rf defaults
   popd
@@ -223,8 +221,6 @@ script: |
     cp ~/build/000-tor-browser.js defaults/preferences/
     # Set the locale of the bundle.
     echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js
-    # The poodle hotfix
-    echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
     zip -Xm omni.ja defaults/preferences/000-tor-browser.js
     rm -rf defaults
     popd
diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml
index a3c4b8a..76f5c67 100644
--- a/gitian/descriptors/windows/gitian-bundle.yml
+++ b/gitian/descriptors/windows/gitian-bundle.yml
@@ -126,8 +126,6 @@ script: |
   cp defaults/preferences/000-tor-browser.js ~/build/
   # Set the locale bundle.
   echo "pref(\"general.useragent.locale\", \"en-US\");" >> defaults/preferences/000-tor-browser.js
-  # The poodle hotfix
-  echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
   zip -Xm omni.ja defaults/preferences/000-tor-browser.js
   rm -rf defaults
   popd
@@ -158,8 +156,6 @@ script: |
     mkdir -p defaults/preferences
     cp ~/build/000-tor-browser.js defaults/preferences/
     echo "pref(\"general.useragent.locale\", \"$LANG\");" >> defaults/preferences/000-tor-browser.js
-    # The poodle hotfix
-    echo "pref(\"security.tls.version.min\", 1);" >> defaults/preferences/000-tor-browser.js
     zip -Xm omni.ja defaults/preferences/000-tor-browser.js
     rm -rf defaults
     popd