May 2012 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'asn/bug5646'
by nickm＠torproject.org 18 May '12

18 May '12

commit c1da29e22d138bb30b6ade452aa0e0321330efe3 Merge: a8a862c 153b989 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 18 12:10:40 2012 -0400 Merge remote-tracking branch 'asn/bug5646' src/or/command.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

1 0

[tor/master] Extract data from DESTROY cell _after_ protocol violation checks.
by nickm＠torproject.org 18 May '12

18 May '12

commit 153b9892f056f2ffa4b1f4a5846ca329d6982805 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri May 18 15:22:03 2012 +0300 Extract data from DESTROY cell _after_ protocol violation checks. --- src/or/command.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/command.c b/src/or/command.c index fb281a7..ca3c341 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -591,7 +591,6 @@ command_process_destroy_cell(cell_t *cell, or_connection_t *conn) int reason; circ = circuit_get_by_circid_orconn(cell->circ_id, conn); - reason = (uint8_t)cell->payload[0]; if (!circ) { log_info(LD_OR,"unknown circuit %d on connection from %s:%d. Dropping.", cell->circ_id, conn->_base.address, conn->_base.port); @@ -599,6 +598,8 @@ command_process_destroy_cell(cell_t *cell, or_connection_t *conn) } log_debug(LD_OR,"Received for circID %d.",cell->circ_id); + reason = (uint8_t)cell->payload[0]; + if (!CIRCUIT_IS_ORIGIN(circ) && cell->circ_id == TO_OR_CIRCUIT(circ)->p_circ_id) { /* the destroy came from behind */

1 0

[tor/master] Ignore unknown lines from managed proxies.
by nickm＠torproject.org 18 May '12

18 May '12

commit a8a862c90989e8d81bcebab5bbe63d4984d00b96 Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri May 18 15:04:48 2012 +0300 Ignore unknown lines from managed proxies. --- changes/bug5910 | 4 ++++ src/or/transports.c | 13 ++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/changes/bug5910 b/changes/bug5910 new file mode 100644 index 0000000..712ed55 --- /dev/null +++ b/changes/bug5910 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Don't abort the managed proxy protocol if the managed proxy + sends us an unrecognized line; ignore it instead. Fixes bug + 5910; bugfix on 0.2.3.9-alpha. diff --git a/src/or/transports.c b/src/or/transports.c index 5f650d1..a20decf 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -119,10 +119,6 @@ static INLINE void free_execve_args(char **arg); #define PROTO_CMETHODS_DONE "CMETHODS DONE" #define PROTO_SMETHODS_DONE "SMETHODS DONE" -/* The smallest valid managed proxy protocol line that can - appear. It's the size of "VERSION 1" */ -#define SMALLEST_MANAGED_LINE_SIZE 9 - /** Number of environment variables for managed proxy clients/servers. */ #define ENVIRON_SIZE_CLIENT 3 #define ENVIRON_SIZE_SERVER 7 /* XXX known to be too high, but that's ok */ @@ -633,12 +629,6 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) log_info(LD_GENERAL, "Got a line from managed proxy '%s': (%s)", mp->argv[0], line); - if (strlen(line) < SMALLEST_MANAGED_LINE_SIZE) { - log_warn(LD_GENERAL, "Managed proxy configuration line is too small. " - "Discarding"); - goto err; - } - if (!strcmpstart(line, PROTO_ENV_ERROR)) { if (mp->conf_state != PT_PROTO_LAUNCHED) goto err; @@ -712,7 +702,8 @@ handle_proxy_line(const char *line, managed_proxy_t *mp) return; } - log_warn(LD_CONFIG, "Unknown line received by managed proxy. (%s)", line); + log_notice(LD_GENERAL, "Unknown line received by managed proxy (%s).", line); + return; err: mp->conf_state = PT_PROTO_BROKEN;

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 18 May '12

18 May '12

commit cb13a9706b1ba36d69c3ce12ac506226c3927e2e Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 18 15:45:27 2012 +0000 Update translations for https_everywhere --- zh_TW/ssl-observatory.dtd | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zh_TW/ssl-observatory.dtd b/zh_TW/ssl-observatory.dtd index 30fa5d4..5bf9d4a 100644 --- a/zh_TW/ssl-observatory.dtd +++ b/zh_TW/ssl-observatory.dtd @@ -3,7 +3,7 @@ <!ENTITY ssl-observatory.popup.later "稍後再詢問"> <!ENTITY ssl-observatory.popup.no "取消"> -<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere 能將您收到的憑證送到觀測站，以偵測出對您瀏覽器的攻擊。要啟用這個功能嗎？"> +<!ENTITY ssl-observatory.popup.text "HTTPS Everywhere 能將您收到的憑證送到觀測站，以偵測出對您瀏覽器的攻擊。要啟用本功能嗎？">  <!ENTITY ssl-observatory.popup.title -"要讓 HTTPS Everywhere 利用 SSL 觀測站嗎？"> +"要讓 HTTPS Everywhere 使用 SSL 觀測站嗎？"> <!ENTITY ssl-observatory.popup.yes "確定">  <!ENTITY ssl-observatory.prefs.adv_priv_opts1 -""> +"啟用這個選項是安全的，除非您使用高侵入性的企業網路（corporate network）:"> <!ENTITY ssl-observatory.prefs.adv_priv_opts2 -""> +"啟用這個選項是安全的，除非您使用含有隱密內部網路伺服器名稱的企業網路（corporate network）:"> <!ENTITY ssl-observatory.prefs.alt_roots -""> +"送出並檢查由非正規的根憑證所簽署的憑證"> <!ENTITY ssl-observatory.prefs.alt_roots_tooltip ""> @@ -33,10 +33,10 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.anonymous_unavailable "以 Tor 匿名檢測憑證（需安裝 Torbutton）"> <!ENTITY ssl-observatory.prefs.anonymous_tooltip -"這個選項需要安裝 Tor 及 Torbutton"> +"這個選項必須安裝 Tor 及 Torbutton"> <!ENTITY ssl-observatory.prefs.asn -""> +"看到新的憑證時，告訴觀測站您連線的 ISP"> <!ENTITY ssl-observatory.prefs.asn_tooltip ""> @@ -64,7 +64,7 @@ Mouseover the options for further details:">--> "我們仍會試圖維持資料的匿名性，但這個選項的安全性較低"> <!ENTITY ssl-observatory.prefs.priv_dns -""> +"送出並檢查非公共域名系統（non-public DNS）名稱的憑證"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip ""> @@ -77,7 +77,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.warning.title "EFF 的 SSL 觀測站提出警告"> <!ENTITY ssl-observatory.warning.showcert "顯示憑證鍊（certificate chain）"> <!ENTITY ssl-observatory.warning.okay "我了解"> -<!ENTITY ssl-observatory.warning.text ""> +<!ENTITY ssl-observatory.warning.text "EFF 的 SSL 觀測站對這個網站的 HTTPS 憑證提出警告:"> <!ENTITY ssl-observatory.warning.defense ""> <!ENTITY ssl-observatory.prefs.self_signed

1 0

[stem/master] Included last tor warning or error in launch_tor exceptions
by atagar＠torproject.org 18 May '12

18 May '12

commit 47c9ddd8e460488abad58afb8893a1524e37835c Author: Damian Johnson <atagar(a)torproject.org> Date: Thu May 17 09:59:24 2012 -0700 Included last tor warning or error in launch_tor exceptions Adding the last tor waring or error message that's probably useful for figuring out the reason why tor failed to launch. --- stem/process.py | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/stem/process.py b/stem/process.py index 94c4212..32bf1a7 100644 --- a/stem/process.py +++ b/stem/process.py @@ -81,6 +81,8 @@ def launch_tor(tor_cmd = "tor", options = None, torrc_path = None, completion_pe signal.alarm(timeout) bootstrap_line = re.compile("Bootstrapped ([0-9]+)%: ") + problem_line = re.compile("\[(warn|err)\] (.*)$") + last_problem = "Timed out" while True: init_line = tor_process.stdout.readline().strip() @@ -88,13 +90,14 @@ def launch_tor(tor_cmd = "tor", options = None, torrc_path = None, completion_pe # this will provide empty results if the process is terminated if not init_line: tor_process.kill() # ... but best make sure - raise OSError("process terminated") + raise OSError("Process terminated: %s" % last_problem) # provide the caller with the initialization message if they want it if init_msg_handler: init_msg_handler(init_line) # return the process if we're done with bootstrapping bootstrap_match = bootstrap_line.search(init_line) + problem_match = problem_line.search(init_line) if bootstrap_match and int(bootstrap_match.groups()[0]) >= completion_percent: if temp_file: @@ -102,4 +105,10 @@ def launch_tor(tor_cmd = "tor", options = None, torrc_path = None, completion_pe except: pass return tor_process + elif problem_match: + runlevel, msg = problem_match.groups() + + if not "see warnings above" in msg: + if ": " in msg: msg = msg.split(": ")[-1].strip() + last_problem = msg

1 0

[stem/master] Removing GETINFO version queries from integ tests
by atagar＠torproject.org 18 May '12

18 May '12

commit aed91aa634b9f960e87296b9e631a2c6aa05f2c0 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri May 18 08:33:13 2012 -0700 Removing GETINFO version queries from integ tests Sathyanarayanan spotted a couple points in our integ tests where we make 'GETINFO version' queries, then compare against the parsed tor version. This es no bueno because the parsed version just contains what, according to the version-spec, is the version and the getinfo query includes extra data like the git commit id it came from. This is actually an issue we encountered before and was fixed. However, since then these queries slipped back into new tests since they seem like an easy way of exercising a socket. Oops. :) Tested by checking out the git commit that gsathya is using (ef0bc7f), then running stem's integ tests against that. This fixes ticket 5918 and might address 5917 too (I'm not sure why the later is hanging - that's not happening for me though the test did have an error). --- test/integ/control/base_controller.py | 8 ++------ test/integ/process.py | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/test/integ/control/base_controller.py b/test/integ/control/base_controller.py index 4a8033a..09c68da 100644 --- a/test/integ/control/base_controller.py +++ b/test/integ/control/base_controller.py @@ -75,13 +75,9 @@ class TestBaseController(unittest.TestCase): Tests a basic query with the msg() method. """ - runner = test.runner.get_runner() - with runner.get_tor_socket() as control_socket: + with test.runner.get_runner().get_tor_socket() as control_socket: controller = stem.control.BaseController(control_socket) - response = controller.msg("GETINFO version") - - tor_version = runner.get_tor_version() - self.assertEquals("version=%s\nOK" % tor_version, str(response)) + test.runner.exercise_controller(self, controller) def test_msg_invalid(self): """ diff --git a/test/integ/process.py b/test/integ/process.py index b03fb27..f189f46 100644 --- a/test/integ/process.py +++ b/test/integ/process.py @@ -39,9 +39,9 @@ class TestProcess(unittest.TestCase): stem.connection.authenticate(control_socket, chroot_path = runner.get_chroot()) # exercises the socket - control_socket.send("GETINFO version") - version_response = control_socket.recv() - self.assertEquals("version=%s\nOK" % runner.get_tor_version(), str(version_response)) + control_socket.send("GETCONF ControlPort") + getconf_response = control_socket.recv() + self.assertEquals("ControlPort=2778", str(getconf_response)) finally: if control_socket: control_socket.close() tor_process.kill()

1 0

[metrics-lib/master] Correctly handle @type annotations when parsing descriptors.
by karsten＠torproject.org 18 May '12

18 May '12

commit 01878416dc3bad327279913af37a105edfbfdc02 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 18 17:40:01 2012 +0200 Correctly handle @type annotations when parsing descriptors. --- .../torproject/descriptor/impl/DescriptorImpl.java | 46 +++++++++++--------- .../descriptor/impl/NetworkStatusImpl.java | 3 +- 2 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index 88db60a..7062b58 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -26,30 +26,31 @@ public abstract class DescriptorImpl implements Descriptor { System.arraycopy(rawDescriptorBytes, 0, first100Chars, 0, first100Chars.length); String firstLines = new String(first100Chars); - if (firstLines.startsWith("network-status-version 3\n") || - firstLines.contains("\nnetwork-status-version 3\n")) { - if (firstLines.contains("\nvote-status consensus\n")) { - parsedDescriptors.addAll(RelayNetworkStatusConsensusImpl. - parseConsensuses(rawDescriptorBytes, - failUnrecognizedDescriptorLines)); - } else if (firstLines.contains("\nvote-status vote\n")) { - parsedDescriptors.addAll(RelayNetworkStatusVoteImpl. - parseVotes(rawDescriptorBytes, - failUnrecognizedDescriptorLines)); - } else { - throw new DescriptorParseException("Could not detect relay " - + "network status type in descriptor starting with '" - + firstLines + "'."); - } + if (firstLines.startsWith("@type network-status-consensus-3 1.0\n") || + ((firstLines.startsWith("network-status-version 3\n") || + firstLines.contains("\nnetwork-status-version 3\n")) && + firstLines.contains("\nvote-status consensus\n"))) { + parsedDescriptors.addAll(RelayNetworkStatusConsensusImpl. + parseConsensuses(rawDescriptorBytes, + failUnrecognizedDescriptorLines)); + } else if (firstLines.startsWith("@type network-status-vote-3 1.0\n") + || ((firstLines.startsWith("network-status-version 3\n") || + firstLines.contains("\nnetwork-status-version 3\n")) && + firstLines.contains("\nvote-status vote\n"))) { + parsedDescriptors.addAll(RelayNetworkStatusVoteImpl. + parseVotes(rawDescriptorBytes, + failUnrecognizedDescriptorLines)); } else if (firstLines.startsWith("r ")) { parsedDescriptors.add(new BridgeNetworkStatusImpl( rawDescriptorBytes, fileName, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("router ") || + } else if (firstLines.startsWith("@type server-descriptor 1.0\n") || + firstLines.startsWith("router ") || firstLines.contains("\nrouter ")) { parsedDescriptors.addAll(ServerDescriptorImpl. parseDescriptors(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("extra-info ") || + } else if (firstLines.startsWith("@type extra-info 1.0\n") || + firstLines.startsWith("extra-info ") || firstLines.contains("\nextra-info ")) { parsedDescriptors.addAll(ExtraInfoDescriptorImpl. parseDescriptors(rawDescriptorBytes, @@ -59,14 +60,19 @@ public abstract class DescriptorImpl implements Descriptor { parsedDescriptors.addAll(BridgePoolAssignmentImpl. parseDescriptors(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("dir-key-certificate-version ")) { + } else if (firstLines.startsWith("@type dir-key-certificate-3 1.0") || + firstLines.startsWith("dir-key-certificate-version ") || + firstLines.contains("\ndir-key-certificate-version ")) { parsedDescriptors.addAll(DirectoryKeyCertificateImpl. parseDescriptors(rawDescriptorBytes, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("ExitNode ")) { + } else if (firstLines.startsWith("ExitNode ") || + firstLines.contains("\nExitNode ")) { parsedDescriptors.add(new ExitListImpl(rawDescriptorBytes, fileName, failUnrecognizedDescriptorLines)); - } else if (firstLines.startsWith("network-status-version 2\n")) { + } else if (firstLines.startsWith("@type network-status-2 1.0\n") || + firstLines.startsWith("network-status-version 2\n") || + firstLines.contains("\nnetwork-status-version 2\n")) { parsedDescriptors.add(new RelayNetworkStatusImpl(rawDescriptorBytes, failUnrecognizedDescriptorLines)); } else { diff --git a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java index 5a6af9e..94a76bf 100644 --- a/src/org/torproject/descriptor/impl/NetworkStatusImpl.java +++ b/src/org/torproject/descriptor/impl/NetworkStatusImpl.java @@ -22,7 +22,8 @@ public abstract class NetworkStatusImpl extends DescriptorImpl { throws DescriptorParseException { super(rawDescriptorBytes, failUnrecognizedDescriptorLines, blankLinesAllowed); - this.splitAndParseParts(rawDescriptorBytes, containsDirSourceEntries); + this.splitAndParseParts(this.rawDescriptorBytes, + containsDirSourceEntries); } private void splitAndParseParts(byte[] rawDescriptorBytes,

1 0

r25649: {website} update mirrors table, add a new one. (in website/trunk: . include)
by Andrew Lewman 18 May '12

18 May '12

Author: phobos Date: 2012-05-18 15:37:34 +0000 (Fri, 18 May 2012) New Revision: 25649 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: update mirrors table, add a new one. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-05-13 00:08:43 UTC (rev 25648) +++ website/trunk/include/mirrors-table.wmi 2012-05-18 15:37:34 UTC (rev 25649) @@ -103,23 +103,6 @@ <tr> - <td>IS</td> - - <td>torproject.is</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.is/dist/">http</a></td> - <td><a href="http://torproject.is/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IT</td> <td></td> @@ -188,23 +171,6 @@ <tr> - <td>DE</td> - - <td>torservers</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> - <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>myRL.net</td> @@ -256,6 +222,23 @@ <tr> + <td>DE</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.cryptowars.info/dist/">http</a></td> + <td><a href="http://torproject.cryptowars.info/">http</a></td> + <td><a href="https://torproject.cryptowars.info/dist/">https</a></td> + <td><a href="https://torproject.cryptowars.info/">https</a></td> + <td> - </td> + <td><a href="rsync://torproject.cryptowars.info/">rsync</a></td> +</tr> + +<tr> + <td>EU</td> <td></td> @@ -460,23 +443,6 @@ <tr> - <td>IL</td> - - <td>Host4site</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> <td>AskApache</td> @@ -613,15 +579,15 @@ <tr> - <td>US</td> + <td>IS</td> - <td></td> + <td>torproject.is</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://tor.loritsu.com/dist/">http</a></td> - <td><a href="http://tor.loritsu.com/">http</a></td> + <td><a href="http://torproject.is/dist/">http</a></td> + <td><a href="http://torproject.is/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -630,15 +596,15 @@ <tr> - <td>DE</td> + <td>IL</td> - <td></td> + <td>Host4site</td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.freie-re.de/dist/">http</a></td> - <td><a href="http://tor.freie-re.de/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -647,32 +613,32 @@ <tr> - <td>IN</td> + <td>DE</td> - <td>India Tor Fans</td> + <td>torservers</td> <td>Out of date</td> <td> - </td> - <td><a href="http://www.torproject.org.in/dist/">http</a></td> - <td><a href="http://www.torproject.org.in/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td> + <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>UA</td> + <td>US</td> - <td>Technica-03</td> + <td></td> - <td>Unknown</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://tordistua.reactor-xg.kiev.ua/">http</a></td> - <td><a href="http://torua.reactor-xg.kiev.ua/">http</a></td> + <td><a href="http://tor.loritsu.com/dist/">http</a></td> + <td><a href="http://tor.loritsu.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -681,16 +647,16 @@ <tr> - <td>PT</td> + <td>DE</td> <td></td> <td>Out of date</td> <td> - </td> - <td><a href="http://5coluna.com/downloads/tor/">http</a></td> + <td><a href="http://tor.freie-re.de/dist/">http</a></td> + <td><a href="http://tor.freie-re.de/">http</a></td> <td> - </td> - <td><a href="https://5coluna.com/downloads/tor/">https</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -698,15 +664,15 @@ <tr> - <td>NL</td> + <td>IN</td> - <td>BIT BV</td> + <td>India Tor Fans</td> - <td>Unknown</td> + <td>Out of date</td> - <td><a href="ftp://ftp.bit.nl/mirror/tor/">ftp</a></td> - <td><a href="http://ftp.bit.nl/mirror/tor/">http</a></td> <td> - </td> + <td><a href="http://www.torproject.org.in/dist/">http</a></td> + <td><a href="http://www.torproject.org.in/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -715,16 +681,16 @@ <tr> - <td>US</td> + <td>PT</td> - <td>Dearstar</td> + <td></td> - <td>Unknown</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://tor.dearstar.net/dist/">http</a></td> - <td><a href="http://tor.dearstar.net/">http</a></td> + <td><a href="http://5coluna.com/downloads/tor/">http</a></td> <td> - </td> + <td><a href="https://5coluna.com/downloads/tor/">https</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -732,19 +698,19 @@ <tr> - <td>DE</td> + <td>NL</td> - <td></td> + <td>BIT BV</td> <td>Unknown</td> + <td><a href="ftp://ftp.bit.nl/mirror/tor/">ftp</a></td> + <td><a href="http://ftp.bit.nl/mirror/tor/">http</a></td> <td> - </td> - <td><a href="http://mirror.open-networx.org/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.open-networx.org/torproject.org/">http</a></td> - <td><a href="https://mirror.open-networx.org/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.open-networx.org/torproject.org/">https</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-05-13 00:08:43 UTC (rev 25648) +++ website/trunk/update-mirrors.pl 2012-05-18 15:37:34 UTC (rev 25649) @@ -890,6 +890,24 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", + }, + mirror060 => { + adminContact => "", + orgName => "", + isoCC => "DE", + subRegion => "", + region => "DE", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "http://torproject.cryptowars.info/", + httpsWebsiteMirror => "https://torproject.cryptowars.info/", + rsyncWebsiteMirror => "rsync://torproject.cryptowars.info/", + ftpWebsiteMirror => "", + httpDistMirror => "http://torproject.cryptowars.info/dist/", + httpsDistMirror => "https://torproject.cryptowars.info/dist/", + rsyncDistMirror => "", + hiddenServiceMirror => "", } );

1 0

[metrics-web/master] V1 and V2 directories now have @type annotations, too.
by karsten＠torproject.org 18 May '12

18 May '12

commit f3386fc96507cd7a73aed49db3beee92884ec4dc Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 18 16:36:55 2012 +0200 V1 and V2 directories now have @type annotations, too. --- web/WEB-INF/formats.jsp | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp index 1dab18f..24647e0 100644 --- a/web/WEB-INF/formats.jsp +++ b/web/WEB-INF/formats.jsp @@ -76,8 +76,8 @@ are recent: <ul> <li><tt>@type server-descriptor 1.0</tt></li> <li><tt>@type extra-info 1.0</tt></li> -<li><tt><font color="gray">@type directory 1.0</font></tt></li> -<li><tt><font color="gray">@type network-status-2 1.0</font></tt></li> +<li><tt>@type directory 1.0</tt></li> +<li><tt>@type network-status-2 1.0</tt></li> <li><tt>@type dir-key-certificate-3 1.0</tt></li> <li><tt>@type network-status-consensus-3 1.0</tt></li> <li><tt>@type network-status-vote-3 1.0</tt></li>

1 0

[stem/master] Removing platform dependency note from process module
by atagar＠torproject.org 17 May '12

17 May '12

commit dd597ba4855197653c1d9cd543c3bd6c611432a5 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 15 08:36:56 2012 -0700 Removing platform dependency note from process module Removing comment that sets the wrong expectations of the process module's capabilities. It needs to be platform independent since it's used to run our integ tests, and when it isn't that's a bug. That said, Windows is unfortunately having trouble with it at present... https://trac.torproject.org/5493 https://trac.torproject.org/5783 --- stem/process.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/stem/process.py b/stem/process.py index 8d65072..94c4212 100644 --- a/stem/process.py +++ b/stem/process.py @@ -1,6 +1,5 @@ """ -Helper functions for working with tor as a process. These are mostly os -dependent, only working on linux, osx, and bsd. +Helper functions for working with tor as a process. launch_tor - starts up a tor process """

1 0