[tor-commits] [tor-browser-bundle/master] Remove LearnCircuitBuildTimeout and CircuitBuildTimeout from flash proxy config.

[mikeperry at torproject.org]

commit 9622ab19df576e7a1441689d0e7fbd5ea246ec39
Author: David Fifield <david at bamsoftware.com>
Date:   Sun Jan 12 17:32:42 2014 +0000

    Remove LearnCircuitBuildTimeout and CircuitBuildTimeout from flash proxy config.
    
    Mike tells me that these are no longer necessary since #3443 ("Client
    with low CBT can't establish any circuits") was fixed. I removed the
    config from my hourly tests and it doesn't seem to increase the number
    of failures.
---
 Bundle-Data/beta/linux/torrc-defaults-appendix   |    3 ---
 Bundle-Data/beta/mac/torrc-defaults-appendix     |    3 ---
 Bundle-Data/beta/windows/torrc-defaults-appendix |    3 ---
 3 files changed, 9 deletions(-)

diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix
index 2274863..3b4c04e 100644
--- a/Bundle-Data/beta/linux/torrc-defaults-appendix
+++ b/Bundle-Data/beta/linux/torrc-defaults-appendix
@@ -21,9 +21,6 @@ ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin m
 
 ## flash proxy configuration
 #
-# LearnCircuitBuildTimeout 0
-# CircuitBuildTimeout 60
-#
 # # The flashproxy bridge address and port are ignored.
 # Bridge flashproxy 0.0.1.0:1
 
diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix
index b711e60..404c659 100644
--- a/Bundle-Data/beta/mac/torrc-defaults-appendix
+++ b/Bundle-Data/beta/mac/torrc-defaults-appendix
@@ -21,9 +21,6 @@ ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed
 
 ## flash proxy configuration
 #
-# LearnCircuitBuildTimeout 0
-# CircuitBuildTimeout 60
-#
 # # The flashproxy bridge address and port are ignored.
 # Bridge flashproxy 0.0.1.0:1
 
diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix
index 0fad86d..edaa575 100644
--- a/Bundle-Data/beta/windows/torrc-defaults-appendix
+++ b/Bundle-Data/beta/windows/torrc-defaults-appendix
@@ -21,9 +21,6 @@ ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed
 
 ## flash proxy configuration
 #
-# LearnCircuitBuildTimeout 0
-# CircuitBuildTimeout 60
-#
 # # The flashproxy bridge address and port are ignored.
 # Bridge flashproxy 0.0.1.0:1