March 2013 - tor-commits - lists.torproject.org

[stem/master] Test still used old arg name for socket connections
by atagar＠torproject.org 20 Mar '13

20 Mar '13

commit 617661308bbc70c08b2d45767965969c690ac9f9 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 20 09:50:12 2013 -0700 Test still used old arg name for socket connections Oops. When running other targets we were sometimes hitting an instance that still used 'socket_path' rather than 'path'. Caught by gsathya. --- test/integ/control/controller.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py index 6b5c407..804565a 100644 --- a/test/integ/control/controller.py +++ b/test/integ/control/controller.py @@ -57,7 +57,7 @@ class TestController(unittest.TestCase): return if test.runner.Torrc.SOCKET in test.runner.get_runner().get_options(): - with stem.control.Controller.from_socket_file(socket_path = test.runner.CONTROL_SOCKET_PATH) as controller: + with stem.control.Controller.from_socket_file(path = test.runner.CONTROL_SOCKET_PATH) as controller: self.assertTrue(isinstance(controller, stem.control.Controller)) else: self.assertRaises(stem.SocketError, stem.control.Controller.from_socket_file, test.runner.CONTROL_SOCKET_PATH)

1 0

[stem/master] Dropping support for port lists in descriptors
by atagar＠torproject.org 20 Mar '13

20 Mar '13

commit dd220882e6c73863cc574ec4ba3833ee478314cb Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Mar 19 13:40:10 2013 -0700 Dropping support for port lists in descriptors The 'or-address' and 'a' descriptors supported comma separated lists of ports. However, as per spec commit 99a9587 tor has never supported this, and the spec no longer includes this capability. --- stem/descriptor/router_status_entry.py | 12 ++++-------- stem/descriptor/server_descriptor.py | 12 ++++-------- test/unit/descriptor/router_status_entry.py | 6 +----- test/unit/descriptor/server_descriptor.py | 4 +--- 4 files changed, 10 insertions(+), 24 deletions(-) diff --git a/stem/descriptor/router_status_entry.py b/stem/descriptor/router_status_entry.py index 69b8fa2..e2579eb 100644 --- a/stem/descriptor/router_status_entry.py +++ b/stem/descriptor/router_status_entry.py @@ -531,7 +531,7 @@ def _parse_a_line(desc, value, validate): raise ValueError("%s 'a' line must be of the form '[address]:[ports]': a %s" % (desc._name(), value)) - address, ports = value.rsplit(':', 1) + address, port = value.rsplit(':', 1) is_ipv6 = address.startswith("[") and address.endswith("]") if is_ipv6: @@ -544,14 +544,10 @@ def _parse_a_line(desc, value, validate): else: raise ValueError("%s 'a' line must start with an IPv6 address: a %s" % (desc._name(), value)) - for port in ports.split(','): - if not stem.util.connection.is_valid_port(port): - if not validate: - continue - else: - raise ValueError("%s 'a' line had an invalid port (%s): a %s" % (desc._name(), port, value)) - + if stem.util.connection.is_valid_port(port): desc.or_addresses.append((address, int(port), is_ipv6)) + elif validate: + raise ValueError("%s 'a' line had an invalid port (%s): a %s" % (desc._name(), port, value)) def _parse_s_line(desc, value, validate): diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index bb7baa9..362437f 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -517,7 +517,7 @@ class ServerDescriptor(stem.descriptor.Descriptor): else: raise ValueError("or-address line missing a colon: %s" % line) - address, ports = entry.rsplit(':', 1) + address, port = entry.rsplit(':', 1) is_ipv6 = address.startswith("[") and address.endswith("]") if is_ipv6: @@ -530,14 +530,10 @@ class ServerDescriptor(stem.descriptor.Descriptor): else: raise ValueError("or-address line has a malformed address: %s" % line) - for port in ports.split(","): - if not stem.util.connection.is_valid_port(port): - if not validate: - continue - else: - raise ValueError("or-address line has malformed ports: %s" % line) - + if stem.util.connection.is_valid_port(port): self.or_addresses.append((address, int(port), is_ipv6)) + elif validate: + raise ValueError("or-address line has a malformed port: %s" % line) elif keyword in ("read-history", "write-history"): try: timestamp, interval, remainder = \ diff --git a/test/unit/descriptor/router_status_entry.py b/test/unit/descriptor/router_status_entry.py index b61f5e8..a97153a 100644 --- a/test/unit/descriptor/router_status_entry.py +++ b/test/unit/descriptor/router_status_entry.py @@ -315,9 +315,6 @@ class TestRouterStatusEntry(unittest.TestCase): test_values = { "[2607:fcd0:daaa:101::602c:bd62]:443": [ ('2607:fcd0:daaa:101::602c:bd62', 443, True)], - "[2607:fcd0:daaa:101::602c:bd62]:80,443": [ - ('2607:fcd0:daaa:101::602c:bd62', 80, True), - ('2607:fcd0:daaa:101::602c:bd62', 443, True)] } for a_line, expected in test_values.items(): @@ -327,11 +324,10 @@ class TestRouterStatusEntry(unittest.TestCase): # includes multiple 'a' lines content = get_router_status_entry_v3(content = True) - content += "\na [2607:fcd0:daaa:101::602c:bd62]:80,443" + content += "\na [2607:fcd0:daaa:101::602c:bd62]:443" content += "\na [1148:fcd0:daaa:101::602c:bd62]:80" expected = [ - ('2607:fcd0:daaa:101::602c:bd62', 80, True), ('2607:fcd0:daaa:101::602c:bd62', 443, True), ('1148:fcd0:daaa:101::602c:bd62', 80, True), ] diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 3da01b5..ad62444 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -381,13 +381,11 @@ class TestServerDescriptor(unittest.TestCase): """ desc_text = "\n".join((get_bridge_server_descriptor(content = True), - "or-address 10.45.227.253:9001,9005,80", + "or-address 10.45.227.253:9001", "or-address [fd9f:2e19:3bcf::02:9970]:443")) expected_or_addresses = [ ("10.45.227.253", 9001, False), - ("10.45.227.253", 9005, False), - ("10.45.227.253", 80, False), ("fd9f:2e19:3bcf::02:9970", 443, True), ]

1 0

[flashproxy/master] Remove windows-deployment-howto.
by dcf＠torproject.org 20 Mar '13

20 Mar '13

commit 31b5b8ac5739ed63c806b5d50f305fe4bd6b763a Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Mar 20 12:15:24 2013 -0400 Remove windows-deployment-howto. It's been merged into bundle-windows. --- doc/windows-deployment-howto.txt | 117 -------------------------------------- 1 files changed, 0 insertions(+), 117 deletions(-) diff --git a/doc/windows-deployment-howto.txt b/doc/windows-deployment-howto.txt deleted file mode 100644 index 5c3c393..0000000 --- a/doc/windows-deployment-howto.txt +++ /dev/null @@ -1,117 +0,0 @@ -This document describes how to build standalone Windows executables of -the flash proxy client programs. The client programs are written in -Python, so we use a program called PyInstaller that compiles them into -executables. - -These instructions were last tested in December 2012. Tarball version -numbers were up to date then; check for newer versions. - -== Summary - -Install the below dependencies, run - $ make dist-exe -and a zip containing the executables will end up in the dist directory. - -== Dependencies - -=== Cygwin - -Cygwin is used to provide a shell environment and other commands. We -don't actually use the Cygwin compatibility layer. - -http://cygwin.com/install.html -http://cygwin.com/setup.exe -http://cygwin.com/setup.exe.sig - -Verify the signature (do it on another machine if you don't already have -GnuPG installed locally). - $ gpg --verify setup.exe.sig -You need to install at least the following packages: - bash - coreutils - gnupg - grep - make - mingw-gcc-core - perl - zip -Don't install the Cygwin python package. Use Python's own Windows -installer as described in the next section. - -=== Python - -Get the latest 32-bit installer in the 2.x series. - -http://python.org/download/ -http://python.org/ftp/python/2.7.3/python-2.7.3.msi -http://python.org/ftp/python/2.7.3/python-2.7.3.msi.asc - -Verify the signature (instructions are on the download page). - $ gpg --verify python-2.7.3.msi.asc -Run the installer. "Install for all users". Disable "Tcl/Tk", -"Documentation", "Utility Scripts", and "Test suite". - -Set the PATH environment variable as described at -http://docs.python.org/2/using/windows.html#configuring-python: - PATH=<existing path>;C:\Python27 -You will have to restart your Cygwin shells to pick up the new PATH. - -=== py2exe - -http://sourceforge.net/projects/py2exe/files/py2exe/ -http://sourceforge.net/projects/py2exe/files/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe/download - -The sha256sum of the package I used was - -610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c py2exe-0.6.9.win32-py2.7.exe - -=== OpenSSL - -https://openssl.org/source/ -https://openssl.org/source/openssl-1.0.1c.tar.gz -https://openssl.org/source/openssl-1.0.1c.tar.gz.asc - -Verify the signature. - $ gpg --verify openssl-1.0.1c.tar.gz.asc -Build OpenSSL from source using Cygwin and MinGW. Install the Cygwin -package mingw-gcc-core if it's not already installed. Run these commands -in the OpenSSL source directory: - CROSS_COMPILE=i686-pc-mingw32- ./Configure shared mingw - make - make install -Then, add C:\cygwin\usr\local\ssl\bin to PATH as you did with Python -above. - -=== SWIG - -This is a prerequisite for building M2Crypto. - -http://www.swig.org/download.html -http://downloads.sourceforge.net/project/swig/swigwin/swigwin-2.0.8/swigwin-2.0.8.zip - -The sha256sum of the package I used was - -35bc3013d43e0034677c08bab30bfc94ed6d44fbfffa4c5158f5788d29f4636d swigwin-2.0.8.zip - -Just extract the zip in the same directory in which you will extract -M2Crypto. - -=== M2Crypto - -http://chandlerproject.org/Projects/MeTooCrypto#Downloads -http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz -http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz.asc - -There are binary installers on the M2Crypto page, but it says they are -"provided by volunteers, untested by M2Crypto author." Instead build -from source. - -The distutils build_ext command hardcodes the compiler name "gcc" when -using the "mingw32" compiler. Make a copy of the MinGW compiler with -that name. - $ cp /usr/bin/i686-pc-mingw32-gcc /usr/bin/gcc -Build the package. - $ PATH=$PATH:../swigwin-2.0.8 python setup.py build_ext -c mingw32 --openssl C:\\cygwin\\usr\\local\\ssl -L C:\\cygwin\\usr\\local\\ssl\\bin - $ python setup.py bdist_wininst -This will leave an MSI installer in the dist directory. Double-click it -to install M2Crypto amid the other Python files.

1 0

[flashproxy/master] Merge windows-deployment-howto into bundle-windows.
by dcf＠torproject.org 20 Mar '13

20 Mar '13

commit c1bfda3a385f37b14b7c050084125e8d597005c9 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Wed Mar 20 12:14:43 2013 -0400 Merge windows-deployment-howto into bundle-windows. --- doc/bundle-windows.txt | 102 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/doc/bundle-windows.txt b/doc/bundle-windows.txt index 330e6f3..dd7477d 100644 --- a/doc/bundle-windows.txt +++ b/doc/bundle-windows.txt @@ -1,5 +1,107 @@ == Dependencies +=== Cygwin + +Cygwin is used to provide a shell environment and other commands. We +don't actually use the Cygwin compatibility layer. + +http://cygwin.com/install.html +http://cygwin.com/setup.exe +http://cygwin.com/setup.exe.sig + +Verify the signature (do it on another machine if you don't already have +GnuPG installed locally). + $ gpg --verify setup.exe.sig +You need to install at least the following packages: + bash + coreutils + gnupg + grep + make + mingw-gcc-core + perl + zip +Don't install the Cygwin python package. Use Python's own Windows +installer as described in the next section. + +=== Python + +Get the latest 32-bit installer in the 2.x series. + +http://python.org/download/ +http://python.org/ftp/python/2.7.3/python-2.7.3.msi +http://python.org/ftp/python/2.7.3/python-2.7.3.msi.asc + +Verify the signature (instructions are on the download page). + $ gpg --verify python-2.7.3.msi.asc +Run the installer. "Install for all users". Disable "Tcl/Tk", +"Documentation", "Utility Scripts", and "Test suite". + +Set the PATH environment variable as described at +http://docs.python.org/2/using/windows.html#configuring-python: + PATH=<existing path>;C:\Python27 +You will have to restart your Cygwin shells to pick up the new PATH. + +=== py2exe + +http://sourceforge.net/projects/py2exe/files/py2exe/ +http://sourceforge.net/projects/py2exe/files/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe/download + +The sha256sum of the package I used was + +610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c py2exe-0.6.9.win32-py2.7.exe + +=== OpenSSL + +https://openssl.org/source/ +https://openssl.org/source/openssl-1.0.1c.tar.gz +https://openssl.org/source/openssl-1.0.1c.tar.gz.asc + +Verify the signature. + $ gpg --verify openssl-1.0.1c.tar.gz.asc +Build OpenSSL from source using Cygwin and MinGW. Install the Cygwin +package mingw-gcc-core if it's not already installed. Run these commands +in the OpenSSL source directory: + CROSS_COMPILE=i686-pc-mingw32- ./Configure shared mingw + make + make install +Then, add C:\cygwin\usr\local\ssl\bin to PATH as you did with Python +above. + +=== SWIG + +This is a prerequisite for building M2Crypto. + +http://www.swig.org/download.html +http://downloads.sourceforge.net/project/swig/swigwin/swigwin-2.0.8/swigwin-2.0.8.zip + +The sha256sum of the package I used was + +35bc3013d43e0034677c08bab30bfc94ed6d44fbfffa4c5158f5788d29f4636d swigwin-2.0.8.zip + +Just extract the zip in the same directory in which you will extract +M2Crypto. + +=== M2Crypto + +http://chandlerproject.org/Projects/MeTooCrypto#Downloads +http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz +http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-0.21.1.tar.gz.asc + +There are binary installers on the M2Crypto page, but it says they are +"provided by volunteers, untested by M2Crypto author." Instead build +from source. + +The distutils build_ext command hardcodes the compiler name "gcc" when +using the "mingw32" compiler. Make a copy of the MinGW compiler with +that name. + $ cp /usr/bin/i686-pc-mingw32-gcc /usr/bin/gcc +Build the package. + $ PATH=$PATH:../swigwin-2.0.8 python setup.py build_ext -c mingw32 --openssl C:\\cygwin\\usr\\local\\ssl -L C:\\cygwin\\usr\\local\\ssl\\bin + $ python setup.py bdist_wininst +This will leave an MSI installer in the dist directory. Double-click it +to install M2Crypto amid the other Python files. + === 7-Zip This is used to build a self-extracting bundle executable. The p7zip

1 0

[flashproxy/master] Increase version to 1.0.
by dcf＠torproject.org 20 Mar '13

20 Mar '13

commit 56cf1fe020087afe8bf4d93234898569e490915b Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 20 09:34:46 2013 -0700 Increase version to 1.0. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 8d76772..4d57a46 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = 0.12 +VERSION = 1.0 PREFIX = /usr/local BINDIR = $(PREFIX)/bin

1 0

[flashproxy/master] ChangeLog for #8300.
by dcf＠torproject.org 20 Mar '13

20 Mar '13

commit 0aa0ca0f7bcc84abd48fbfcf798782faea50e344 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 20 09:36:30 2013 -0700 ChangeLog for #8300. --- ChangeLog | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index fdbf5da..3c24a31 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Changes in version 1.0 + o Fixed badge rendering for a certain combination of Chrome and + AdBlock Plus. Patch by Arlo Breault. Fixes bug 8300. + Changes in version 0.12 o The new flashproxy-reg-url program prints a URL which, when requested, causes an address to be registered with the facilitator.

1 0

[flashproxy/master] Insert badge at the end of document.body, not document.
by dcf＠torproject.org 20 Mar '13

20 Mar '13

commit c836e4ff1a7143983bf9649564134526ac1b59b4 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Mar 20 08:47:56 2013 -0700 Insert badge at the end of document.body, not document. According to #8300, the badge wasn't visible in the document (but still ran) with a combination of Chrome and AdBlock. --- proxy/flashproxy.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 2fa6c99..25cf9bd 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -1014,7 +1014,7 @@ function flashproxy_badge_insert() { /* http://intertwingly.net/blog/2006/11/10/Thats-Not-Write for this trick to insert right after the <script> element in the DOM. */ - e = document; + e = document.body; while (e.lastChild && e.lastChild.nodeType === 1) { e = e.lastChild; }

1 0

[torspec/master] Update description of HidServAuth option based on manpage
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit 3dd69d2eab4356fd9f0990ba24bb229be6eb087e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 20 11:24:24 2013 -0400 Update description of HidServAuth option based on manpage This isn't perfect, but it's better than before. Fix for bug 4609 --- rend-spec.txt | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/rend-spec.txt b/rend-spec.txt index 9d207d7..ca40fb5 100644 --- a/rend-spec.txt +++ b/rend-spec.txt @@ -928,13 +928,17 @@ 2.4. Client configuration - Clients need to make their authorization data known to Tor using another - configuration option that contains a service name (mainly for the sake of - convenience), the service address, and the descriptor cookie that is - required to access a hidden service (the authorization protocol number is - encoded in the descriptor cookie): + To specify the cookie to use to access a given hidden service, + clients use the following syntax: + + HidServAuth onion-address auth-cookie [service-name]: + + Valid onion addresses contain 16 characters in a-z2-7 plus + ".onion", and valid auth cookies contain 22 characters in + A-Za-z0-9+/. The service name is only used for internal purposes, + e.g., for Tor controllers; nothing in Tor itself requires or uses + it. - HidServAuth service-name service-address descriptor-cookie 3. Hidden service directory operation

1 0

[flashproxy/master] visual indicator that fp is active when opting in
by dcf＠torproject.org 20 Mar '13

20 Mar '13

commit b09b0d58460076ecb61cfded3464a71fd648c6f1 Author: Alexandre Allaire <alexandre.allaire(a)mail.mcgill.ca> Date: Fri Mar 1 21:33:58 2013 -0800 visual indicator that fp is active when opting in implements part A of #8211. If cookie is unset state that the proxy is enabled. Remove dynamic text showing cookie setting. --- proxy/options.html | 69 ++++++++++++++++++++++++++------------------------- 1 files changed, 35 insertions(+), 34 deletions(-) diff --git a/proxy/options.html b/proxy/options.html index 9caa9e3..6ab39e1 100644 --- a/proxy/options.html +++ b/proxy/options.html @@ -32,6 +32,14 @@ p { button { margin: 0px 7px 7px; } +#badge-state { + font-size: 36px; + text-align: center; + padding: 10px 0; + margin: 0; + color: white; +} +#badge-state p { display: none; } </style> </head> <body> @@ -47,6 +55,7 @@ the flash proxy badge. <p> <a href="http://crypto.stanford.edu/flashproxy/">For more information on this system click here</a>. </p> +<p>Do you want your browser to act as a proxy?</p> </div> <noscript> <p> @@ -54,11 +63,11 @@ While JavaScript is disabled, your computer will not be a proxy. Enable JavaScript to change your options. </p> </noscript> -<div id="setting"> -</div> -<div onclick="update_setting_text()" id="buttons" style="display: none;"> -<button onclick="set_cookie_allowed()">Yes</button> -<button onclick="set_cookie_disallowed()">No</button> +<button onclick="set_allowed()">Yes</button> +<button onclick="set_disallowed()">No</button> +<div id="badge-state"> +<p id="inactive">Proxy disabled</p> +<p id="active">Proxy enabled</p> </div> <div id="cookies_disabled" style="display: none;"> <p> @@ -81,6 +90,16 @@ function set_cookie_disallowed() { document.cookie = COOKIE_NAME + "=0 ;path=/ ;expires=" + COOKIE_LIFETIME; } +function set_allowed() { + set_cookie_allowed(); + refresh(); +} + +function set_disallowed() { + set_cookie_disallowed(); + refresh(); +} + function parse_cookie_string(cookies) { var strings; var result; @@ -116,41 +135,23 @@ function read_cookie() { } /* Updates the text telling the user what his current setting is.*/ -function update_setting_text() { - var setting = document.getElementById("setting"); - var prefix = "<p>Your current setting is: "; +function refresh() { var value = read_cookie(); - if (value === undefined) { - setting.innerHTML = prefix + "unspecified. Your browser may or may not " + - "run as a proxy, depending on how the website " + - "administrator has configured the badge. (See <a href=\"https://lists.torproject.org/pipermail/tor-dev/2012-December/004318.html\">this mailing list post</a> for more information about opt-in versus opt-out.) Click " + - "the buttons below to change your setting."; - } else if (value === "1") { - setting.innerHTML = prefix + "use my browser as a proxy. " + - "Click no below to change your setting.</p>"; + if (value === undefined || value === "1") { + document.getElementById("active").style.display = "block"; + document.getElementById("inactive").style.display = "none"; + document.getElementById("badge-state").style.backgroundColor = "darkgreen"; } else { - setting.innerHTML = prefix + "do not use my browser as a proxy. " + - "Click yes below to change your setting.</p>"; + document.getElementById("inactive").style.display = "block"; + document.getElementById("active").style.display = "none"; + document.getElementById("badge-state").style.backgroundColor = "red"; } - setting.innerHTML += "<p>Do you want your browser to act as a proxy?</p>"; } -window.onload = function () { - if (navigator.cookieEnabled) { - var buttons = document.getElementById("buttons"); - buttons.style.display = "block"; - update_setting_text(); - } else { - document.getElementById("cookies_disabled").style.display = "block"; - /* Manually set the text here as otherwise it will refer to - the buttons, which don't show if cookies are disabled. */ - document.getElementById("setting").innerHTML = "<p>Your current setting is: " + - "unspecified. Your browser may or may not " + - "run as a proxy, depending on how the website " + - "administrator has configured the badge.</p>"; - } -}; +window.onload = function() { + refresh(); +} </script> </body> </html>

1 0

[tor/master] Fix to test for bug8444 / 6034
by nickm＠torproject.org 20 Mar '13

20 Mar '13

commit d13b996d83cb346cf81f5d9b46486556d98073d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Mar 9 19:45:17 2013 -0500 Fix to test for bug8444 / 6034 --- src/or/circuitbuild.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index f8521c5..2436246 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -540,6 +540,7 @@ circuit_build_times_get_initial_timeout(void) * Check if we have LearnCircuitBuildTimeout, and if we don't, * always use CircuitBuildTimeout, no questions asked. */ + /*XXXX025 this logic could be cleaned up a lot. */ if (get_options()->LearnCircuitBuildTimeout) { if (!unit_tests && get_options()->CircuitBuildTimeout) { timeout = get_options()->CircuitBuildTimeout*1000; @@ -552,7 +553,10 @@ circuit_build_times_get_initial_timeout(void) timeout = circuit_build_times_initial_timeout(); } } else { - timeout = get_options()->CircuitBuildTimeout*1000; + if (get_options()->CircuitBuildTimeout > 0) + timeout = get_options()->CircuitBuildTimeout*1000; + else + timeout = circuit_build_times_initial_timeout(); } return timeout;

1 0