November 2011 - tor-commits - lists.torproject.org

[tor-cloud/master] Clarify the AWS free usage tier and the cost of running a bridge
by runa＠torproject.org 22 Nov '11

22 Nov '11

commit 43bbde7f3433e99fb13f2bda6e06d2758fa32fa6 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Nov 22 22:30:40 2011 +0000 Clarify the AWS free usage tier and the cost of running a bridge --- html/index.html | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/html/index.html b/html/index.html index f52eca7..431c957 100644 --- a/html/index.html +++ b/html/index.html @@ -84,20 +84,25 @@ <div class="deco"></div> <h2>How much does it cost?</h2> </hgroup> - <p>To help new customers get started in the cloud, Amazon is - introducing a free usage tier. The Tor Cloud images are all micro - instances, and new customers will be able to run a free micro - instance for a whole year. Please see <a href="http://aws.amazon.com/free/" - target="_blank">http://aws.amazon.com/free/</a> for - details. </p> - <p>Don't qualify for the Free Tier? No problem. The Tor Cloud - images have been <a href="torrc.txt">configured</a> with a - bandwidth limit. We have <a - href="https://trac.torproject.org/projects/tor/ticket/3574#comment:4">estimated</a> - that running a bridge will cost around $30 a month, depending on - the region you put it in. See the <a - href="http://aws.amazon.com/ec2/pricing/">Amazon EC2 - Pricing</a> page for more information.</p> + <p>To help new customers get started in the cloud, Amazon has + introduced a free usage tier. The Tor Cloud images are all + micro instances, and new customers can run a micro instance for + free for a whole year. The AWS free usage tier also includes 15 + GB of bandwidth out per month.</p> + + <p>The Tor Cloud images have been configured to use no more than + 40 GB of bandwidth out per month. We have <a + href="https://trac.torproject.org/projects/tor/ticket/3574#comment:4">estimated</a> + that customers who do not qualify for the free usage tier will + pay up to $30 a month. Customers who qualify for the free usage + tier, but who run bridges that use more than 15 GB of bandwidth + out per month, will pay up to $3 per month. + </p> + + <p> + Please see <a href="http://aws.amazon.com/free/"target="_blank">http://aws.amazon.com/free/</a> + and the <a href="http://aws.amazon.com/ec2/pricing/">AWS pricing + page</a> for more information.</p> </div>

1 0

[stem/master] More selective options for running integ tests
by atagar＠torproject.org 22 Nov '11

22 Nov '11

commit 9fb52210494558a63d494d5ceab7a01282e8f88b Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 22 09:53:30 2011 -0800 More selective options for running integ tests Providing targets for all of the tor connection configurations so the user can opt for any combination of targets. Previously you needed to run the 'CONNECTION' target which exercised them all and took around forty seconds to run (kinda a pita if you just want to test cookie auth). --- run_tests.py | 31 +++++++++++++++++++++++++------ test/runner.py | 6 +++--- test/testrc.sample | 21 +++++++++++++++++---- 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/run_tests.py b/run_tests.py index 93a715a..3f12a44 100755 --- a/run_tests.py +++ b/run_tests.py @@ -47,12 +47,18 @@ INTEG_TESTS = (("stem.types.ControlMessage", test.integ.types.control_message.Te ) # Integration tests above the basic suite. -TARGETS = stem.util.enum.Enum(*[(v, v) for v in ("ONLINE", "RELATIVE", "CONNECTION")]) +TARGETS = stem.util.enum.Enum(*[(v, v) for v in ("ONLINE", "RELATIVE", "CONN_NONE", "CONN_OPEN", "CONN_PASSWORD", "CONN_COOKIE", "CONN_MULTIPLE", "CONN_SOCKET", "CONN_ALL")]) TARGET_ATTR = { TARGETS.ONLINE: ("test.integ.target.online", "Includes tests that require network activity."), TARGETS.RELATIVE: ("test.integ.target.relative_data_dir", "Uses a relative path for tor's data directory."), - TARGETS.CONNECTION: ("test.integ.target.connection", "Runs the suite over multiple connection configurations."), + TARGETS.CONN_NONE: ("test.integ.target.connection.none", "Configuration without a way for controllers to connect."), + TARGETS.CONN_OPEN: ("test.integ.target.connection.open", "Configuration with an open control port (default)."), + TARGETS.CONN_PASSWORD: ("test.integ.target.connection.password", "Configuration with password authentication."), + TARGETS.CONN_COOKIE: ("test.integ.target.connection.cookie", "Configuration with an authentication cookie."), + TARGETS.CONN_MULTIPLE: ("test.integ.target.connection.multiple", "Configuration with both password and cookie authentication."), + TARGETS.CONN_SOCKET: ("test.integ.target.connection.socket", "Configuration with a control socket."), + TARGETS.CONN_ALL: ("test.integ.target.connection.all", "Runs integration tests for all connection configurations."), } HELP_MSG = """Usage runTests.py [OPTION] @@ -191,13 +197,26 @@ if __name__ == '__main__': integ_runner = test.runner.get_runner() stem_logger = logging.getLogger("stem") - # just a single integ run with the default connection method unless we've - # set the 'CONNECTION' target, in which case we run 'em all + # queue up all of the tor configurations we want to run the integration + # tests on - if test_config.get("test.integ.target.connection", False): + connection_types = [] + + if test_config.get("test.integ.target.connection.all", False): connection_types = list(test.runner.TorConnection) else: - connection_types = [test.runner.DEFAULT_TOR_CONNECTION] + conn_type_mappings = { + "none": test.runner.TorConnection.NONE, + "open": test.runner.TorConnection.OPEN, + "password": test.runner.TorConnection.PASSWORD, + "cookie": test.runner.TorConnection.COOKIE, + "multiple": test.runner.TorConnection.MULTIPLE, + "socket": test.runner.TorConnection.SOCKET, + } + + for type_key in conn_type_mappings: + if test_config.get("test.integ.target.connection.%s" % type_key, False): + connection_types.append(conn_type_mappings[type_key]) for connection_type in connection_types: try: diff --git a/test/runner.py b/test/runner.py index b9b77f4..e1c9f0b 100644 --- a/test/runner.py +++ b/test/runner.py @@ -42,8 +42,8 @@ DEFAULT_CONFIG = { # Methods for connecting to tor. General integration tests only run with the # DEFAULT_TOR_CONNECTION, but expanded integ tests will run with all of them. -TorConnection = stem.util.enum.Enum("NONE", "NO_AUTH", "PASSWORD", "COOKIE", "MULTIPLE", "SOCKET") -DEFAULT_TOR_CONNECTION = TorConnection.NO_AUTH +TorConnection = stem.util.enum.Enum("NONE", "OPEN", "PASSWORD", "COOKIE", "MULTIPLE", "SOCKET") +DEFAULT_TOR_CONNECTION = TorConnection.OPEN STATUS_ATTR = (term.Color.BLUE, term.Attr.BOLD) SUBSTATUS_ATTR = (term.Color.BLUE, ) @@ -75,7 +75,7 @@ OPT_SOCKET = "ControlSocket %s" % CONTROL_SOCKET_PATH CONNECTION_OPTS = { TorConnection.NONE: [], - TorConnection.NO_AUTH: [OPT_PORT], + TorConnection.OPEN: [OPT_PORT], TorConnection.PASSWORD: [OPT_PORT, OPT_PASSWORD], TorConnection.COOKIE: [OPT_PORT, OPT_COOKIE], TorConnection.MULTIPLE: [OPT_PORT, OPT_PASSWORD, OPT_COOKIE], diff --git a/test/testrc.sample b/test/testrc.sample index c7ae7d1..28874e9 100644 --- a/test/testrc.sample +++ b/test/testrc.sample @@ -19,13 +19,26 @@ # test.integ.target.relative_data_dir # Uses a relative path for the tor data directory if set. # -# test.integ.target.connection -# Runs integration tests for multiple connection and authentiction methods if -# true. Otherwise they'll only be run for a single connection type. +# test.integ.target.connection.none +# test.integ.target.connection.open +# test.integ.target.connection.password +# test.integ.target.connection.cookie +# test.integ.target.connection.muiltipe +# test.integ.target.connection.socket +# test.integ.target.connection.all +# Runs the integration test suite for all of the given connection and +# authentication configurations. If the 'all' option is set then the other +# flags are ignored. test.integ.test_directory ./test/data test.integ.log ./test/data/log test.integ.target.online false test.integ.target.relative_data_dir false -test.integ.target.connection false +test.integ.target.connection.none false +test.integ.target.connection.open true +test.integ.target.connection.password false +test.integ.target.connection.cookie false +test.integ.target.connection.muiltipe false +test.integ.target.connection.socket false +test.integ.target.connection.all false

1 0

[stem/master] Noting at the end of testing if it passed/failed
by atagar＠torproject.org 22 Nov '11

22 Nov '11

commit 03d2e84894822825fc59507cdc93599f81cd8e36 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 22 10:06:48 2011 -0800 Noting at the end of testing if it passed/failed As testing output has gotten longer its become less clear at the end if all tests passed or not. Adding a note at the end saying if they all passed and, if there were failures, what they were. --- run_tests.py | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) diff --git a/run_tests.py b/run_tests.py index 3f12a44..3ef21c0 100755 --- a/run_tests.py +++ b/run_tests.py @@ -87,6 +87,9 @@ TEST_OUTPUT_ATTR = { "... skipped": (term.Color.BLUE,), } +# lines that print_test_results have processed which contained a test failure +PRINTED_ERRORS = [] + def print_divider(msg, is_header = False): attr = HEADER_ATTR if is_header else CATEGORY_ATTR print term.format("%s\n%s\n%s\n" % (DIVIDER, msg.center(70), DIVIDER), *attr) @@ -99,6 +102,10 @@ def print_test_results(test_results): for result in TEST_OUTPUT_ATTR: if result in line: line_attr = TEST_OUTPUT_ATTR[result] + + if result in ("... FAIL", "... ERROR"): + PRINTED_ERRORS.append(line) + break if line_attr: line = term.format(line, *line_attr) @@ -240,6 +247,14 @@ if __name__ == '__main__': # TODO: note unused config options afterward? - print term.format("Testing Completed (%i seconds)" % (time.time() - start_time), term.Color.GREEN, term.Attr.BOLD) - print + runtime_label = "(%i seconds)" % (time.time() - start_time) + + if PRINTED_ERRORS: + print term.format("TESTING FAILED %s" % runtime_label, term.Color.RED, term.Attr.BOLD) + + for line in PRINTED_ERRORS: + print term.format(" %s" % line, term.Color.RED, term.Attr.BOLD) + else: + print term.format("TESTING PASSED %s" % runtime_label, term.Color.GREEN, term.Attr.BOLD) + print

1 0

[stem/master] Better exercising cookie expansion in integ tests
by atagar＠torproject.org 22 Nov '11

22 Nov '11

commit b3afd554bad16bcde8b5ed5a70ed2a34c7e84762 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 22 10:13:39 2011 -0800 Better exercising cookie expansion in integ tests The get_protocolinfo_by_* functions weren't exercising cookie path expansion by port or socket file because lookups by process name would succeed and bypass this logic. Added a filter to the integ tests so we exercise both. When running with both the 'RELATIVE' and 'CONN_COOKIE' targets this reveals a bug with the stem.util.system.get_pid_by_port function that I'll address next. The test using the socket file passes. --- test/integ/connection/protocolinfo.py | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/test/integ/connection/protocolinfo.py b/test/integ/connection/protocolinfo.py index 037f6dd..1035fe6 100644 --- a/test/integ/connection/protocolinfo.py +++ b/test/integ/connection/protocolinfo.py @@ -8,10 +8,11 @@ import unittest import test.runner import stem.types import stem.connection +import stem.util.system class TestProtocolInfo(unittest.TestCase): """ - Queries and parses PROTOCOLINFO. This should be run with the 'CONNECTION' + Queries and parses PROTOCOLINFO. This should be run with the 'CONN_ALL' integ target to exercise the widest range of use cases. """ @@ -51,6 +52,23 @@ class TestProtocolInfo(unittest.TestCase): Exercises the stem.connection.get_protocolinfo_by_port function. """ + # If we have both the 'RELATIVE' target and a cookie then test_parsing + # should exercise cookie expansion using a pid lookup by process name. + # Disabling those lookups so we exercise the lookup by port/socket file + # too. + + port_lookup_prefixes = ( + stem.util.system.GET_PID_BY_PORT_NETSTAT, + stem.util.system.GET_PID_BY_PORT_SOCKSTAT % "", + stem.util.system.GET_PID_BY_PORT_LSOF) + + def port_lookup_filter(command): + for prefix in port_lookup_prefixes: + if command.startswith(prefix): return True + + return False + + stem.util.system.CALL_MOCKING = port_lookup_filter connection_type = test.runner.get_runner().get_connection_type() if test.runner.OPT_PORT in test.runner.CONNECTION_OPTS[connection_type]: @@ -60,12 +78,16 @@ class TestProtocolInfo(unittest.TestCase): else: # we don't have a control port self.assertRaises(stem.types.SocketError, stem.connection.get_protocolinfo_by_port, "127.0.0.1", test.runner.CONTROL_PORT) + + stem.util.system.CALL_MOCKING = None def test_get_protocolinfo_by_socket(self): """ Exercises the stem.connection.get_protocolinfo_by_socket function. """ + socket_file_prefix = stem.util.system.GET_PID_BY_FILE_LSOF % "" + stem.util.system.CALL_MOCKING = lambda cmd: cmd.startswith(socket_file_prefix) connection_type = test.runner.get_runner().get_connection_type() if test.runner.OPT_SOCKET in test.runner.CONNECTION_OPTS[connection_type]: @@ -75,6 +97,8 @@ class TestProtocolInfo(unittest.TestCase): else: # we don't have a control socket self.assertRaises(stem.types.SocketError, stem.connection.get_protocolinfo_by_socket, test.runner.CONTROL_SOCKET_PATH) + + stem.util.system.CALL_MOCKING = None def assert_protocolinfo_attr(self, protocolinfo_response, connection_type): """ @@ -85,7 +109,7 @@ class TestProtocolInfo(unittest.TestCase): # This should never have test.runner.TorConnection.NONE. If we somehow got # a protocolinfo_response from that config then we have an issue. :) - if connection_type == test.runner.TorConnection.NO_AUTH: + if connection_type == test.runner.TorConnection.OPEN: auth_methods = (stem.connection.AuthMethod.NONE,) elif connection_type == test.runner.TorConnection.PASSWORD: auth_methods = (stem.connection.AuthMethod.PASSWORD,)

1 0

[tor-cloud/master] Applied patch from Jeremy
by runa＠torproject.org 22 Nov '11

22 Nov '11

commit 0194512fdf68e9636713f28d565269dc503d5cd8 Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Tue Nov 22 09:58:47 2011 +0000 Applied patch from Jeremy --- html/css/custom.css | 33 ++++++++++++++++++- html/index.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 117 insertions(+), 7 deletions(-) diff --git a/html/css/custom.css b/html/css/custom.css index eec6edd..d415893 100644 --- a/html/css/custom.css +++ b/html/css/custom.css @@ -243,6 +243,37 @@ a.signup { margin-top: 20px; } +/* non-javascript 'Step-By-Step Guide' */ +.setupguide { + position: relative; + width:500px; + margin: 0px auto; + } + +.step { + text-align: center; + } + +.step h2 { + color: #885ca4; + font-size: 20px; + } + +.step img { + border: 1px solid #000; + margin: 15px auto 0px auto; + } + +.caption { + width: 438px; + padding: 20px 20px; + margin: -4px auto 0px auto; + text-align: left; + color: #fff; + font-size: 14px; + background: #222222; + } + /* 'SUPPORT' SECTION */ p.support { text-align: center; @@ -250,4 +281,4 @@ p.support { .support a { font-size:16px; - } \ No newline at end of file + } diff --git a/html/index.html b/html/index.html index b0ab719..f52eca7 100644 --- a/html/index.html +++ b/html/index.html @@ -26,6 +26,16 @@ <script src="js/jquery.tools.min.js"></script> <script src="js/jquery.nivo.slider.pack.js"></script> <script src="js/libs/modernizr-2.0.6.min.js"></script> + + <script type="text/javascript"> + $(function(){ + $('.setupguide').css('display', 'none'); + $('.slider-wrapper').css('display', 'block'); + $('#what_is_it').attr('id', 'null'); + $('#get_started').attr('id', 'null'); + $('#faq').attr('id', 'null'); + }); + </script> </head> <body> @@ -46,7 +56,7 @@ <div class="panes wrap">  - <div class="main" role="main"> + <div id="what_is_it" class="main" role="main"> <hgroup> <div class="deco first"></div> <h2>Tor bridges in the Amazon cloud</h2> @@ -91,7 +101,7 @@ </div>  - <div class="main" role="main"> + <div id="get_started" class="main" role="main"> <hgroup> <div class="deco first"></div> <h2>Sign up</h2> @@ -135,7 +145,9 @@ management console. Simply follow the steps as illustrated below, and your bridge will up and running in just a couple of minutes:</p> - <div class='slider-wrapper theme-orman'> + + + <div class='slider-wrapper theme-orman' style="display:none;"> <div id='slider' class='nivoSlider'> <img src="img/tor-1.png" alt="" title="Click "Continue". (No changes needed here.)"/> @@ -164,10 +176,77 @@ done! Congratulations!"/> </div> </div> + + + <div class="setupguide"> + <div class="step"> + <div class="deco"></div> + <h2>Step 1</h2> + <img src="img/tor-1.png"/> + <div class="caption"> + Click "Continue". (No changes needed here.) + </div> + </div> + + <div class="step"> + <div class="deco"></div> + <h2>Step 2</h2> + <img src="img/tor-2.png"/> + <div class="caption"> + Click "Continue". (No changes needed here.) + </div> + </div> + + <div class="step"> + <div class="deco"></div> + <h2>Step 3</h2> + <img src="img/step-3.png"/> + <div class="caption"> + Click "Continue". (No changes needed here.) + </div> + </div> + + <div class="step"> + <div class="deco"></div> + <h2>Step 4</h2> + <img src="img/step-4.png"/> + <div class="caption"> + Select "Create a new Key Pair", type "tor-cloud-servers" for key pair name, and click "Create & Download your Key Pair". You will need the key pair if you want to connect to your instance using SSH. + </div> + </div> + + <div class="step"> + <div class="deco"></div> + <h2>Step 5</h2> + <img src="img/step-5.png"/> + <div class="caption"> + Select "Create a new Security Group", type "tor-cloud-servers" for Group Name and Group Description. You need to create two rules; HTTPS and SSH. Select "HTTPS" from the "Create a new rule" dropdown and click on "Add Rule". Do the same for SSH. Then click "Continue". + </div> + </div> + + <div class="step"> + <div class="deco"></div> + <h2>Step 6</h2> + <img src="img/step-6.png"/> + <div class="caption"> + Click "Launch." + </div> + </div> + + <div class="step"> + <div class="deco"></div> + <h2>Step 7</h2> + <img src="img/step-7.png"/> + <div class="caption"> + You're done! Congratulations! + </div> + </div> + </div> + </div>  -<div class="main" role="main"> +<div id="faq" class="main" role="main"> <hgroup> <div class="deco first"></div> <h2>Frequently Asked Questions (FAQ)</h2> @@ -230,9 +309,9 @@ <footer> <div id="hbody"> <p>The Tor Cloud project is developed and maintained by - partnership between <a + partnership between <a style="color:#885CA4" href="http://expressiontech.org">ExpressionTech</a> - and <a href="https://www.torproject.org">The Tor Project</a>.<br /> + and <a style="color:#885CA4" href="https://www.torproject.org">The Tor Project</a>.<br /> "Tor" and the "Onion Logo" are registered trademarks of The Tor Project, Inc.<br /> Ubuntu is a registered trademark of Canonical Ltd.</p>

1 0

[tor/master] and rm the old ones
by arma＠torproject.org 22 Nov '11

22 Nov '11

commit b7b2041dbf45c6a141a3fe408d729abc5448a0d0 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Nov 21 19:34:30 2011 -0500 and rm the old ones --- changes/bug4489 | 8 -------- changes/bug4518 | 4 ---- changes/feature4484 | 8 -------- 3 files changed, 0 insertions(+), 20 deletions(-) diff --git a/changes/bug4489 b/changes/bug4489 deleted file mode 100644 index 0f976c8..0000000 --- a/changes/bug4489 +++ /dev/null @@ -1,8 +0,0 @@ - o Major bugfixes (performance): - - Remove the artificially low cutoff of 20KB to guarantee the Fast - flag. In the past few years the average relay speed has picked - up, and while the "top 7/8 of the network get the Fast flag" and - "all relays with 20KB or more of capacity get the Fast flag" rules - used to have the same result, now the top 7/8 of the network has - a capacity more like 32KB. Bugfix on 0.2.1.14-rc. Fixes bug 4489. - diff --git a/changes/bug4518 b/changes/bug4518 deleted file mode 100644 index 8dcb93b..0000000 --- a/changes/bug4518 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (performance): - - Avoid frequent calls to the fairly expensive cull_wedged_cpuworkers - function. This was eating up hideously large amounts of time on some - busy servers. Fixes bug 4518. diff --git a/changes/feature4484 b/changes/feature4484 deleted file mode 100644 index 78154e9..0000000 --- a/changes/feature4484 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor features: - - Add two new config options for directory authorities: - AuthDirFastGuarantee sets a bandwidth threshold for guaranteeing the - Fast flag, and AuthDirGuardBWGuarantee sets a bandwidth threshold - that is always sufficient to satisfy the bandwidth requirement for - the Guard flag. Now it will be easier for researchers to simulate - Tor networks with different values. Resolves ticket 4484. -

1 0

[tor/master] fold in more changes files
by arma＠torproject.org 22 Nov '11

22 Nov '11

commit 03c416a3d7867c221a4ef6a783ea21779e5dc1a5 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Nov 21 19:34:12 2011 -0500 fold in more changes files --- ChangeLog | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8efc379..9c2854f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,12 @@ Changes in version 0.2.3.8-alpha - 2011-11-21 Bugfix on 0.2.3.1-alpha; diagnosed by frosty_un. - Make bridge authorities not crash when they are asked for their own descriptor. Bugfix on 0.2.3.7-alpha, reported by Lucky Green. + - Remove the artificially low cutoff of 20KB to guarantee the Fast + flag. In the past few years the average relay speed has picked + up, and while the "top 7/8 of the network get the Fast flag" and + "all relays with 20KB or more of capacity get the Fast flag" rules + used to have the same result, now the top 7/8 of the network has + a capacity more like 32KB. Bugfix on 0.2.1.14-rc. Fixes bug 4489. o Major features: - Allow Tor controllers like Vidalia to obtain the microdescriptor @@ -33,6 +39,9 @@ Changes in version 0.2.3.8-alpha - 2011-11-21 o Minor bugfixes (on 0.2.2.x and earlier): - Detect failure to initialize Libevent. This fix provides better detection for future instances of bug 4457. + - Avoid frequent calls to the fairly expensive cull_wedged_cpuworkers + function. This was eating up hideously large amounts of time on some + busy servers. Fixes bug 4518; bugfix on 0.0.9.8. - Don't warn about unused log_mutex in log.c when building with --disable-threads using a recent GCC. Fixes bug 4437; bugfix on 0.1.0.6-rc which introduced --disable-threads. @@ -89,6 +98,12 @@ Changes in version 0.2.3.8-alpha - 2011-11-21 on 0.2.3.4-alpha and 0.2.3.6-alpha. o Minor features: + - Add two new config options for directory authorities: + AuthDirFastGuarantee sets a bandwidth threshold for guaranteeing the + Fast flag, and AuthDirGuardBWGuarantee sets a bandwidth threshold + that is always sufficient to satisfy the bandwidth requirement for + the Guard flag. Now it will be easier for researchers to simulate + Tor networks with different values. Resolves ticket 4484. - When Tor ignores a hidden service specified in its configuration, include the hidden service's directory in the warning message. Previously, we would only tell the user that some hidden service

1 0

[tor/release-0.2.2] fold in more changes files
by arma＠torproject.org 22 Nov '11

22 Nov '11

commit 842a7a8123b43ea0f4c525dedecf2673a89bb61e Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Nov 21 19:30:29 2011 -0500 fold in more changes files --- ChangeLog | 17 +++++++++++++++++ changes/bug3963 | 5 ----- changes/bug4518 | 4 ---- changes/bug4521 | 3 --- changes/feature4484 | 8 -------- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3782aef..2096215 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ Changes in version 0.2.2.35 - 2011-11-?? + + Formalize end-of-life for 0.2.0. + o Major bugfixes: - Initialize Libevent with the EVENT_BASE_FLAG_NOLOCK flag enabled, so that it doesn't attempt to allocate a socketpair. This could cause @@ -30,9 +33,15 @@ Changes in version 0.2.2.35 - 2011-11-?? o Minor bugfixes: - Detect failure to initialize Libevent. This fix provides better detection for future instances of bug 4457. + - Avoid frequent calls to the fairly expensive cull_wedged_cpuworkers + function. This was eating up hideously large amounts of time on some + busy servers. Fixes bug 4518; bugfix on 0.0.9.8. - Don't warn about unused log_mutex in log.c when building with --disable-threads using a recent GCC. Fixes bug 4437; bugfix on 0.1.0.6-rc which introduced --disable-threads. + - When configuring, starting, or stopping an NT service, stop + immediately after the service configuration attempt has succeeded + or failed. Fixes bug3963; bugfix on 0.2.0.7-alpha. - When sending a NETINFO cell, include the original address received for the other side, not its canonical address. Found by "troll_un"; fixes bug 4349; bugfix on 0.2.0.10-alpha. @@ -41,8 +50,16 @@ Changes in version 0.2.2.35 - 2011-11-?? - Fix a memory leak in launch_direct_bridge_descriptor_fetch() that occurred when a client tried to fetch a descriptor for a bridge in ExcludeNodes. Fixes bug 4383; bugfix on 0.2.2.25-alpha. + - Backport fixes for a pair of compilation warnings on Windows. + Fixes bug 4521; bugfix on 0.2.2.28-beta and on 0.2.2.29-beta. o Minor features: + - Add two new config options for directory authorities: + AuthDirFastGuarantee sets a bandwidth threshold for guaranteeing the + Fast flag, and AuthDirGuardBWGuarantee sets a bandwidth threshold + that is always sufficient to satisfy the bandwidth requirement for + the Guard flag. Now it will be easier for researchers to simulate + Tor networks with different values. Resolves ticket 4484. - When Tor ignores a hidden service specified in its configuration, include the hidden service's directory in the warning message. Previously, we would only tell the user that some hidden service diff --git a/changes/bug3963 b/changes/bug3963 deleted file mode 100644 index 2fc44a0..0000000 --- a/changes/bug3963 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - When configuring, starting, or stopping an NT service, stop - immediately after the service configuration attempt has succeeded - or failed. Fixes bug3963; bugfix on 0.2.0.7-alpha. - diff --git a/changes/bug4518 b/changes/bug4518 deleted file mode 100644 index 8dcb93b..0000000 --- a/changes/bug4518 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfixes (performance): - - Avoid frequent calls to the fairly expensive cull_wedged_cpuworkers - function. This was eating up hideously large amounts of time on some - busy servers. Fixes bug 4518. diff --git a/changes/bug4521 b/changes/bug4521 deleted file mode 100644 index 9b0bae9..0000000 --- a/changes/bug4521 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes: - - Backport fixes for a pair of compilation warnings on Windows. - Fixes bug 4521; bugfix on 0.2.2.28-beta and on 0.2.2.29-beta. diff --git a/changes/feature4484 b/changes/feature4484 deleted file mode 100644 index 78154e9..0000000 --- a/changes/feature4484 +++ /dev/null @@ -1,8 +0,0 @@ - o Minor features: - - Add two new config options for directory authorities: - AuthDirFastGuarantee sets a bandwidth threshold for guaranteeing the - Fast flag, and AuthDirGuardBWGuarantee sets a bandwidth threshold - that is always sufficient to satisfy the bandwidth requirement for - the Guard flag. Now it will be easier for researchers to simulate - Tor networks with different values. Resolves ticket 4484. -

1 0

[tor/release-0.2.2] All NT service configuration commands should make the process exit.
by arma＠torproject.org 22 Nov '11

22 Nov '11

commit 45eadf39551bc1d3d00e677c8b7fd977a17aad01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 21:54:12 2011 -0400 All NT service configuration commands should make the process exit. Fixes bug 3963; fix on 0.2.0.7-alpha. --- changes/bug3963 | 5 +++++ src/or/ntmain.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug3963 b/changes/bug3963 new file mode 100644 index 0000000..2fc44a0 --- /dev/null +++ b/changes/bug3963 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - When configuring, starting, or stopping an NT service, stop + immediately after the service configuration attempt has succeeded + or failed. Fixes bug3963; bugfix on 0.2.0.7-alpha. + diff --git a/src/or/ntmain.c b/src/or/ntmain.c index b2fee64..985fab7 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -728,6 +728,7 @@ nt_service_parse_options(int argc, char **argv, int *should_exit) if ((argc >= 3) && (!strcmp(argv[1], "-service") || !strcmp(argv[1], "--service"))) { nt_service_loadlibrary(); + *should_exit = 1; if (!strcmp(argv[2], "install")) return nt_service_install(argc, argv); if (!strcmp(argv[2], "remove")) @@ -737,7 +738,6 @@ nt_service_parse_options(int argc, char **argv, int *should_exit) if (!strcmp(argv[2], "stop")) return nt_service_cmd_stop(); printf("Unrecognized service command '%s'\n", argv[2]); - *should_exit = 1; return 1; } if (argc >= 2) {

1 0

[tor/release-0.2.2] Only call cull_wedged_cpuworkers once every 60 seconds.
by arma＠torproject.org 22 Nov '11

22 Nov '11

commit 8e388bc39ceb9b1a642359005b320cdc994f8a4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Nov 19 18:29:42 2011 -0500 Only call cull_wedged_cpuworkers once every 60 seconds. The function is over 10 or 20% on some of Moritz's profiles, depending on how you could. Since it's checking for a multi-hour timeout, this is safe to do. Fixes bug 4518. --- changes/bug4518 | 4 ++++ src/or/cpuworker.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/changes/bug4518 b/changes/bug4518 new file mode 100644 index 0000000..8dcb93b --- /dev/null +++ b/changes/bug4518 @@ -0,0 +1,4 @@ + o Minor bugfixes (performance): + - Avoid frequent calls to the fairly expensive cull_wedged_cpuworkers + function. This was eating up hideously large amounts of time on some + busy servers. Fixes bug 4518. diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index c5e4863..9d196d3 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -446,9 +446,19 @@ assign_onionskin_to_cpuworker(connection_t *cpuworker, { char qbuf[1]; char tag[TAG_LEN]; + time_t now = approx_time(); + static time_t last_culled_cpuworkers = 0; - cull_wedged_cpuworkers(); - spawn_enough_cpuworkers(); + /* Checking for wedged cpuworkers requires a linear search over all + * connections, so let's do it only once a minute. + */ +#define CULL_CPUWORKERS_INTERVAL 60 + + if (last_culled_cpuworkers + CULL_CPUWORKERS_INTERVAL <= now) { + cull_wedged_cpuworkers(); + spawn_enough_cpuworkers(); + last_culled_cpuworkers = now; + } if (1) { if (num_cpuworkers_busy == num_cpuworkers) {

1 0