[tor-commits] [tor-browser-bundle/master] Bug 9229 was merged in Tor 0.2.4.22. Remove our backport patch.

[mikeperry at torproject.org]

commit cc1cff02f7c8b930bdcf03abc1a3a1cd5800d427
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu May 22 09:13:24 2014 -0700

    Bug 9229 was merged in Tor 0.2.4.22. Remove our backport patch.
---
 gitian/descriptors/linux/gitian-tor.yml   |    2 --
 gitian/descriptors/mac/gitian-tor.yml     |    2 --
 gitian/descriptors/windows/gitian-tor.yml |    2 --
 gitian/patches/bug9229.patch              |   46 -----------------------------
 4 files changed, 52 deletions(-)

diff --git a/gitian/descriptors/linux/gitian-tor.yml b/gitian/descriptors/linux/gitian-tor.yml
index 4a8f08e..2b0b9ab 100644
--- a/gitian/descriptors/linux/gitian-tor.yml
+++ b/gitian/descriptors/linux/gitian-tor.yml
@@ -24,7 +24,6 @@ files:
 - "versions"
 - "bug10297.patch"
 - "bug5018.patch"
-- "bug9229.patch"
 - "bug11156.patch"
 - "bug11200.patch"
 - "bug11069.patch"
@@ -75,7 +74,6 @@ script: |
   if [ $BUILD_PT_BUNDLES ]; then
     if [ ${TOR_TAG::9} == "tor-0.2.4" ];
     then
-      git am ~/build/bug9229.patch
       git am ~/build/bug5018.patch
       git am ~/build/bug11069.patch
       git am ~/build/bug11156.patch
diff --git a/gitian/descriptors/mac/gitian-tor.yml b/gitian/descriptors/mac/gitian-tor.yml
index 90f56e0..be4edd2 100644
--- a/gitian/descriptors/mac/gitian-tor.yml
+++ b/gitian/descriptors/mac/gitian-tor.yml
@@ -21,7 +21,6 @@ files:
 - "versions"
 - "bug10297.patch"
 - "bug5018.patch"
-- "bug9229.patch"
 - "bug11156.patch"
 - "bug11200.patch"
 - "bug11069.patch"
@@ -70,7 +69,6 @@ script: |
   if [ $BUILD_PT_BUNDLES ]; then
     if [ ${TOR_TAG::9} == "tor-0.2.4" ];
     then
-      git am ~/build/bug9229.patch
       git am ~/build/bug5018.patch
       git am ~/build/bug11069.patch
       git am ~/build/bug11156.patch
diff --git a/gitian/descriptors/windows/gitian-tor.yml b/gitian/descriptors/windows/gitian-tor.yml
index 19c4acd..d3f1d4e 100644
--- a/gitian/descriptors/windows/gitian-tor.yml
+++ b/gitian/descriptors/windows/gitian-tor.yml
@@ -22,7 +22,6 @@ files:
 - "versions"
 - "bug10297.patch"
 - "bug5018.patch"
-- "bug9229.patch"
 - "bug11156.patch"
 - "bug11200.patch"
 - "bug11069.patch"
@@ -72,7 +71,6 @@ script: |
   if [ $BUILD_PT_BUNDLES ]; then
     if [ ${TOR_TAG::9} == "tor-0.2.4" ];
     then
-      git am ~/build/bug9229.patch
       git am ~/build/bug5018.patch
       git am ~/build/bug11069.patch
       git am ~/build/bug11156.patch
diff --git a/gitian/patches/bug9229.patch b/gitian/patches/bug9229.patch
deleted file mode 100644
index 6b1115c..0000000
--- a/gitian/patches/bug9229.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 Mon Sep 17 00:00:00 2001
-From: Nick Mathewson <nickm at torproject.org>
-Date: Mon, 10 Mar 2014 15:01:27 -0400
-Subject: [PATCH] Update ns downloads when we receive a bridge descriptor
-
-This prevents long stalls when we're starting with a state file but
-with no bridge descriptors.  Fixes bug 9229.  I believe this bug has
-been present since 0.2.0.3-alpha.
----
- changes/bug9229     | 5 +++++
- src/or/entrynodes.c | 6 +++++-
- 2 files changed, 10 insertions(+), 1 deletion(-)
- create mode 100644 changes/bug9229
-
-diff --git a/changes/bug9229 b/changes/bug9229
-new file mode 100644
-index 0000000..ad7fd22
---- /dev/null
-+++ b/changes/bug9229
-@@ -0,0 +1,5 @@
-+  o Minor bugfixes:
-+    - Avoid 60-second delays in the bootstrapping process when Tor
-+      is launching for a second time while using bridges. Fixes bug 9229;
-+      bugfix on 0.2.0.3-alpha.
-+
-diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
-index 2aa063c..59770fa 100644
---- a/src/or/entrynodes.c
-+++ b/src/or/entrynodes.c
-@@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache)
-        * our entry node list */
-       entry_guard_register_connect_status(ri->cache_info.identity_digest,
-                                           1, 0, now);
--      if (first)
-+      if (first) {
-+        /* XXXX apparently, this is never called. See bug #9229. */
-         routerlist_retry_directory_downloads(now);
-+      }
-+
-+      update_networkstatus_downloads(now);
-     }
-   }
- }
--- 
-1.8.1.2
-