[tor-commits] [tor-browser-bundle/master] Remove bug8405 backport. It is merged in Tor 0.2.6.3.

[mikeperry@xxxxxxxxxxxxxx]

commit 438a412b0e834cf8455973255c0d3c243723e860
Author: Mike Perry <mikeperry-git@xxxxxxxxxxxxxx>
Date:   Thu Feb 19 17:58:29 2015 -0800

    Remove bug8405 backport. It is merged in Tor 0.2.6.3.
---
 gitian/descriptors/linux/gitian-tor.yml   |    3 ---
 gitian/descriptors/mac/gitian-tor.yml     |    3 ---
 gitian/descriptors/windows/gitian-tor.yml |    3 ---
 3 files changed, 9 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index 87f3f10..7338f2d 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -80,9 +80,6 @@ script: |
   then
       git am ~/build/bug8405.patch
       git am ~/build/bug8402-master.patch
-  elif [ ${TOR_TAG::9} == "tor-0.2.6" ];
-  then
-      git am ~/build/bug8405.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 a772a74..08408f8 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -58,9 +58,6 @@ script: |
   then
       git am ~/build/bug8405.patch
       git am ~/build/bug8402-master.patch
-  elif [ ${TOR_TAG::9} == "tor-0.2.6" ];
-  then
-      git am ~/build/bug8405.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 9cbbb86..7db511b 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -58,9 +58,6 @@ script: |
   then
       git am ~/build/bug8405.patch
       git am ~/build/bug8402-master.patch
-  elif [ ${TOR_TAG::9} == "tor-0.2.6" ];
-  then
-      git am ~/build/bug8405.patch
   fi
   mkdir -p $OUTDIR/src
   #git archive HEAD | tar -x -C $OUTDIR/src

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits