- tor-commits - lists.torproject.org

[metrics-web/master] Add new dirreq-stats.csv to help diagnose #3338.
by karsten＠torproject.org 07 Sep '11

07 Sep '11

commit 7de39e7d138ac25851bdf1e74b4e83ffb7f85f39 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Sep 7 08:27:57 2011 +0200 Add new dirreq-stats.csv to help diagnose #3338. --- rserve/csv.R | 21 +++++++++++++++++++++ src/org/torproject/ernie/web/CsvServlet.java | 1 + 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/rserve/csv.R b/rserve/csv.R index 17a59c2..5693413 100644 --- a/rserve/csv.R +++ b/rserve/csv.R @@ -305,3 +305,24 @@ export_relays_monthly_snapshots <- function(path) { quote = FALSE, row.names = FALSE) } +export_dirreq_stats <- function(path) { + drv <- dbDriver("PostgreSQL") + con <- dbConnect(drv, user = dbuser, password = dbpassword, dbname = db) + q <- paste("SELECT date, r, bwp, brp, bwn, brn, bwr, brr ", + "FROM user_stats ", + "WHERE date < (SELECT MAX(date) FROM user_stats) - 1 ", + "AND country = 'zy' ORDER BY date", sep = "") + rs <- dbSendQuery(con, q) + u <- fetch(rs, n = -1) + dbDisconnect(con) + dbUnloadDriver(drv) + u <- data.frame(date = u$date, + requests = u$r, + fraction = (u$bwr * u$brn / u$bwn - u$brr) / + (u$bwp * u$brn / u$bwn - u$brp), + users = u$r * (u$bwp * u$brn / u$bwn - u$brp) / + (u$bwr * u$brn / u$bwn - u$brr) / 10) + write.csv(format(u, trim = TRUE, scientific = FALSE), path, + quote = FALSE, row.names = FALSE) +} + diff --git a/src/org/torproject/ernie/web/CsvServlet.java b/src/org/torproject/ernie/web/CsvServlet.java index 0140fa9..99dc63c 100644 --- a/src/org/torproject/ernie/web/CsvServlet.java +++ b/src/org/torproject/ernie/web/CsvServlet.java @@ -35,6 +35,7 @@ public class CsvServlet extends HttpServlet { this.availableCsvFiles.add("connbidirect"); this.availableCsvFiles.add("current-platform-strings"); this.availableCsvFiles.add("direct-users"); + this.availableCsvFiles.add("dirreq-stats"); this.availableCsvFiles.add("dirbytes"); this.availableCsvFiles.add("gettor"); this.availableCsvFiles.add("monthly-users-average");

1 0

[torbutton/master] Bug #3933: Don't touch app.update.auto in TBB
by mikeperry＠torproject.org 07 Sep '11

07 Sep '11

commit e495cc8de58c18f3d17b83d068689d40c65bd807 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 6 20:56:50 2011 -0700 Bug #3933: Don't touch app.update.auto in TBB TBB must not autoupdate via Mozilla. Regression was caused by the initial toggle fix in #2338. --- src/chrome/content/torbutton.js | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 5378467..b6f7f3b 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1655,10 +1655,13 @@ function torbutton_update_status(mode, force_update) { } else { torbutton_setBoolPref("extensions.update.enabled", "extension_update", true, mode, changed); - torbutton_setBoolPref("app.update.enabled", "app_update", + // In TBB, do not touch these two. They must remain off. + if (!m_tb_tbb) { + torbutton_setBoolPref("app.update.enabled", "app_update", true, mode, changed); - torbutton_setBoolPref("app.update.auto", "auto_update", + torbutton_setBoolPref("app.update.auto", "auto_update", true, mode, changed); + } torbutton_setBoolPref("browser.search.update", "search_update", true, mode, changed); }

1 0

r25035: {website} dump the dead mirrors, fix two others. (in website/trunk: . include)
by Andrew Lewman 07 Sep '11

07 Sep '11

Author: phobos Date: 2011-09-07 03:34:18 +0000 (Wed, 07 Sep 2011) New Revision: 25035 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: dump the dead mirrors, fix two others. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-09-07 03:17:53 UTC (rev 25034) +++ website/trunk/include/mirrors-table.wmi 2011-09-07 03:34:18 UTC (rev 25035) @@ -1,6 +1,23 @@ <tr> + <td>INT</td> + + <td>CoralCDN</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td>BarkerJr</td> @@ -103,6 +120,23 @@ <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>DE</td> <td>chaos darmstadt</td> @@ -273,6 +307,23 @@ <tr> + <td>IS</td> + + <td>TheOnionRouter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>SE</td> <td>homosu</td> @@ -377,57 +428,6 @@ <td>NL</td> - <td>Kamagurka</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://tor.kamagurka.org/dist/">http</a></td> - <td><a href="http://tor.kamagurka.org/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://mirror.hs-fulda.org/tor/dist/">http</a></td> - <td><a href="http://mirror.hs-fulda.org/tor/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>IS</td> - - <td>tor</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://torproject.is/dist">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>NL</td> - <td>BIT BV</td> <td>Unknown</td> @@ -462,45 +462,11 @@ <td>IS</td> - <td>TheOnionRouter</td> + <td>crypto.is</td> <td>Unknown</td> <td> - </td> - <td><a href="http://theonionrouter.com/dist/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>INT</td> - - <td>CoralCDN</td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>IS</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> <td><a href="https://torproject.crypto.is/dist">http</a></td> <td><a href="https://torproject.crypto.is">http</a></td> <td> - </td> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-07 03:17:53 UTC (rev 25034) +++ website/trunk/update-mirrors.pl 2011-09-07 03:34:18 UTC (rev 25035) @@ -231,23 +231,6 @@ updateDate => "Unknown", }, - mirror011 => { - adminContact => "root AT kamagurka DOT org", - orgName => "Kamagurka", - isoCC => "NL", - subRegion => "Haarlem", - region => "Europe", - ipv4 => "True", - ipv6 => "False", - loadBalanced => "Unknown", - httpWebsiteMirror => "http://tor.kamagurka.org/", - rsyncWebsiteMirror => "", - ftpWebsiteMirror => "", - httpDistMirror => "http://tor.kamagurka.org/dist/", - rsyncDistMirror => "", - updateDate => "Unknown", - }, - mirror013 => { adminContact => "hostmaster AT zombiewerks DOT com", orgName => "TheOnionRouter", @@ -257,7 +240,7 @@ ipv4 => "True", ipv6 => "False", loadBalanced => "Unknown", - httpWebsiteMirror => "", + httpWebsiteMirror => "http://theonionrouter.com/", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", httpDistMirror => "http://theonionrouter.com/dist/", @@ -536,14 +519,14 @@ }, mirror032 => { adminContact => "", - orgName => "tor", + orgName => "torproject.is", isoCC => "IS", subRegion => "", region => "IS", ipv4 => "True", ipv6 => "False", loadBalanced => "No", - httpWebsiteMirror => "", + httpWebsiteMirror => "http://torproject.is/", httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", @@ -588,24 +571,6 @@ rsyncDistMirror => "", hiddenServiceMirror => "", }, - mirror035 => { - adminContact => "", - orgName => "", - isoCC => "DE", - subRegion => "", - region => "DE", - ipv4 => "True", - ipv6 => "False", - loadBalanced => "No", - httpWebsiteMirror => "http://mirror.hs-fulda.org/tor/", - httpsWebsiteMirror => "", - rsyncWebsiteMirror => "", - ftpWebsiteMirror => "", - httpDistMirror => "http://mirror.hs-fulda.org/tor/dist/", - httpsDistMirror => "", - rsyncDistMirror => "", - hiddenServiceMirror => "", - }, mirror036 => { adminContact => "", orgName => "", @@ -626,10 +591,10 @@ }, mirror037 => { adminContact => "", - orgName => "", + orgName => "crypto.is", isoCC => "IS", subRegion => "", - region => "IS", + region => "Iceland", ipv4 => "True", ipv6 => "False", loadBalanced => "No",

1 0

r25034: {website} update the mirrors. (website/trunk/include)
by Andrew Lewman 07 Sep '11

07 Sep '11

Author: phobos Date: 2011-09-07 03:17:53 +0000 (Wed, 07 Sep 2011) New Revision: 25034 Modified: website/trunk/include/mirrors-table.wmi Log: update the mirrors. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2011-09-07 03:16:51 UTC (rev 25033) +++ website/trunk/include/mirrors-table.wmi 2011-09-07 03:17:53 UTC (rev 25034) @@ -18,15 +18,15 @@ <tr> - <td>US</td> + <td>NL</td> - <td>searchprivate</td> + <td>Amorphis</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.searchprivate.com/dist">http</a></td> - <td><a href="http://tor.searchprivate.com">http</a></td> + <td><a href="http://tor.amorphis.eu/dist/">http</a></td> + <td><a href="http://tor.amorphis.eu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -35,15 +35,15 @@ <tr> - <td>DE</td> + <td>AT</td> - <td>chaos darmstadt</td> + <td>cyberarmy</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> - <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> + <td><a href="http://tor.cyberarmy.at/dist">http</a></td> + <td><a href="http://tor.cyberarmy.at">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -54,64 +54,47 @@ <td>US</td> - <td>BarkerJr</td> + <td>searchprivate</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.us/dist/">http</a></td> - <td><a href="http://www.torproject.us/">http</a></td> - <td><a href="https://www.torproject.us/dist/">https</a></td> - <td><a href="https://www.torproject.us/">https</a></td> + <td><a href="http://tor.searchprivate.com/dist">http</a></td> + <td><a href="http://tor.searchprivate.com">http</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> -</tr> - -<tr> - - <td>HU</td> - - <td>Unknown</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://mirror.tor.hu/dist">http</a></td> - <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>NL</td> - <td>torservers</td> + <td>CCC</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><a href="http://tor.ccc.de/dist/">http</a></td> + <td><a href="http://tor.ccc.de/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>IR</td> + <td>EE</td> - <td>Ninjas</td> + <td>CyberSIDE</td> <td>Up to date</td> <td> - </td> - <td><a href="http://onion.anonymo.us.org/dist/">http</a></td> - <td><a href="http://onion.anonymo.us.org/">http</a></td> + <td><a href="http://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -122,64 +105,47 @@ <td>DE</td> - <td>beme it</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.beme-it.de/dist/">http</a></td> - <td><a href="http://tor.beme-it.de/">http</a></td> - <td><a href="https://tor.beme-it.de/dist/">https</a></td> - <td><a href="https://tor.beme-it.de/">https</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/dist/">http</a></td> + <td><a href="http://mirrors.chaos-darmstadt.de/tor-mirror/">http</a></td> <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> -</tr> - -<tr> - - <td>US</td> - - <td>Xpdm</td> - - <td>Up to date</td> - <td> - </td> - <td><a href="http://torproj.xpdm.us/dist/">http</a></td> - <td><a href="http://torproj.xpdm.us/">http</a></td> - <td><a href="https://torproj.xpdm.us/dist/">https</a></td> - <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>INT</td> + <td>US</td> - <td>CoralCDN</td> + <td>BarkerJr</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> - <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td><a href="http://www.torproject.us/dist/">http</a></td> + <td><a href="http://www.torproject.us/">http</a></td> + <td><a href="https://www.torproject.us/dist/">https</a></td> + <td><a href="https://www.torproject.us/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> </tr> <tr> - <td>NL</td> + <td>HU</td> - <td>Amorphis</td> + <td>Unknown</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.amorphis.eu/dist/">http</a></td> - <td><a href="http://tor.amorphis.eu/">http</a></td> + <td><a href="http://mirror.tor.hu/dist">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -188,32 +154,32 @@ <tr> - <td>AT</td> + <td>DE</td> - <td>cyberarmy</td> + <td>torservers</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/dist">http</a></td> - <td><a href="http://tor.cyberarmy.at">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>NL</td> + <td>IR</td> - <td>CCC</td> + <td>Ninjas</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.ccc.de/dist/">http</a></td> - <td><a href="http://tor.ccc.de/">http</a></td> + <td><a href="http://onion.anonymo.us.org/dist/">http</a></td> + <td><a href="http://onion.anonymo.us.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -222,19 +188,19 @@ <tr> - <td>DK</td> + <td>DE</td> - <td>Zentrum der Gesundheit</td> + <td>beme it</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> + <td><a href="http://tor.beme-it.de/dist/">http</a></td> + <td><a href="http://tor.beme-it.de/">http</a></td> + <td><a href="https://tor.beme-it.de/dist/">https</a></td> + <td><a href="https://tor.beme-it.de/">https</a></td> <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> </tr> <tr> @@ -275,17 +241,17 @@ <td>US</td> - <td>AskApache</td> + <td>Xpdm</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> + <td><a href="http://torproj.xpdm.us/dist/">http</a></td> + <td><a href="http://torproj.xpdm.us/">http</a></td> + <td><a href="https://torproj.xpdm.us/dist/">https</a></td> + <td><a href="https://torproj.xpdm.us/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> @@ -341,15 +307,15 @@ <tr> - <td>DE</td> + <td>DK</td> - <td></td> + <td>Zentrum der Gesundheit</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.hs-fulda.org/tor/dist/">http</a></td> - <td><a href="http://mirror.hs-fulda.org/tor/">http</a></td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -358,15 +324,15 @@ <tr> - <td>EE</td> + <td>US</td> - <td>CyberSIDE</td> + <td>AskApache</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> - <td><a href="http://cyberside.net.ee/tor/">http</a></td> - <td><a href="http://cyberside.planet.ee/tor/">http</a></td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -379,7 +345,7 @@ <td>India Tor Fans</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td><a href="http://www.torproject.org.in/dist/">http</a></td> @@ -426,11 +392,28 @@ <tr> + <td>DE</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://mirror.hs-fulda.org/tor/dist/">http</a></td> + <td><a href="http://mirror.hs-fulda.org/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>tor</td> - <td>Out of date</td> + <td>Up to date</td> <td> - </td> <td><a href="http://torproject.is/dist">http</a></td> @@ -460,6 +443,23 @@ <tr> + <td>NL</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td> - </td> + <td> - </td> + <td><a href="https://www.coevoet.nl/tor/dist">https</a></td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>IS</td> <td>TheOnionRouter</td> @@ -474,3 +474,37 @@ <td> - </td> <td> - </td> </tr> + +<tr> + + <td>INT</td> + + <td>CoralCDN</td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td> + <td><a href="http://www.torproject.org.nyud.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>IS</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="https://torproject.crypto.is/dist">http</a></td> + <td><a href="https://torproject.crypto.is">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr>

1 0

r25033: {website} add commas in the right places. (website/trunk)
by Andrew Lewman 07 Sep '11

07 Sep '11

Author: phobos Date: 2011-09-07 03:16:51 +0000 (Wed, 07 Sep 2011) New Revision: 25033 Modified: website/trunk/update-mirrors.pl Log: add commas in the right places. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-07 03:00:38 UTC (rev 25032) +++ website/trunk/update-mirrors.pl 2011-09-07 03:16:51 UTC (rev 25033) @@ -605,7 +605,7 @@ httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "", - } + }, mirror036 => { adminContact => "", orgName => "", @@ -623,7 +623,7 @@ httpsDistMirror => "https://www.coevoet.nl/tor/dist", rsyncDistMirror => "", hiddenServiceMirror => "", - } + }, mirror037 => { adminContact => "", orgName => "",

1 0

r25032: {website} add the crypto.is mirror. (website/trunk)
by Andrew Lewman 07 Sep '11

07 Sep '11

Author: phobos Date: 2011-09-07 03:00:38 +0000 (Wed, 07 Sep 2011) New Revision: 25032 Modified: website/trunk/update-mirrors.pl Log: add the crypto.is mirror. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-07 02:57:42 UTC (rev 25031) +++ website/trunk/update-mirrors.pl 2011-09-07 03:00:38 UTC (rev 25032) @@ -623,6 +623,25 @@ httpsDistMirror => "https://www.coevoet.nl/tor/dist", rsyncDistMirror => "", hiddenServiceMirror => "", + } + mirror037 => { + adminContact => "", + orgName => "", + isoCC => "IS", + subRegion => "", + region => "IS", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "https://torproject.crypto.is", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "https://torproject.crypto.is/dist", + httpsDistMirror => "", + rsyncDistMirror => "", + hiddenServiceMirror => "", + } ); my $count = values %m;

1 0

r25031: {website} add https://www.coevoet.nl/tor/dist mirror. (website/trunk)
by Andrew Lewman 07 Sep '11

07 Sep '11

Author: phobos Date: 2011-09-07 02:57:42 +0000 (Wed, 07 Sep 2011) New Revision: 25031 Modified: website/trunk/update-mirrors.pl Log: add https://www.coevoet.nl/tor/dist mirror. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2011-09-06 18:49:32 UTC (rev 25030) +++ website/trunk/update-mirrors.pl 2011-09-07 02:57:42 UTC (rev 25031) @@ -606,6 +606,23 @@ rsyncDistMirror => "", hiddenServiceMirror => "", } + mirror036 => { + adminContact => "", + orgName => "", + isoCC => "NL", + subRegion => "", + region => "NL", + ipv4 => "True", + ipv6 => "False", + loadBalanced => "No", + httpWebsiteMirror => "", + httpsWebsiteMirror => "", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "", + httpsDistMirror => "https://www.coevoet.nl/tor/dist", + rsyncDistMirror => "", + hiddenServiceMirror => "", ); my $count = values %m;

1 0

[torbrowser/maint-2.2] revert automatic port selection for windows tbbs (#3945)
by erinn＠torproject.org 07 Sep '11

07 Sep '11

commit 550edc2fe0267348190f381110163e6b2bae9f93 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Sep 7 03:22:40 2011 +0100 revert automatic port selection for windows tbbs (#3945) --- build-scripts/config/torrc | 2 -- build-scripts/config/vidalia.conf.ff | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc index 143c71a..2d63da9 100644 --- a/build-scripts/config/torrc +++ b/build-scripts/config/torrc @@ -8,6 +8,4 @@ GeoIPFile .\Data\Tor\geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort auto SocksListenAddress 127.0.0.1 -ControlPort auto diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff index d66f53f..d03289e 100644 --- a/build-scripts/config/vidalia.conf.ff +++ b/build-scripts/config/vidalia.conf.ff @@ -7,5 +7,4 @@ LanguageCode=en ControlPort=9051 TorExecutable=.\\App\\tor.exe Torrc=.\\Data\\Tor\\torrc -AutoControl=true DataDirectory=.\\Data\\Tor

1 0

[torflow/master] revert fix for 3798
by mikeperry＠torproject.org 07 Sep '11

07 Sep '11

commit 01e268c7cb272bd5bb53d2f41783c16c1918461f Author: aagbsn <aagbsn(a)extc.org> Date: Tue Sep 6 14:38:01 2011 -0700 revert fix for 3798 The fix for 3798 (https://trac.torproject.org/projects/tor/ticket/3798) introduced a new error: TorCtl.Connection.close() at program exit will occasionally cause BwAuthority to hang indefinitely. This issue was originally reported in ticket 3834 (https://trac.torproject.org/projects/tor/ticket/3834) TorCtl.Connection.close() should not be used at this time. The issue occurs when called in either atexit handlers as well as at the end of the main thread. --- NetworkScanners/BwAuthority/bwauthority_child.py | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/NetworkScanners/BwAuthority/bwauthority_child.py b/NetworkScanners/BwAuthority/bwauthority_child.py index 3aa13b2..f842843 100755 --- a/NetworkScanners/BwAuthority/bwauthority_child.py +++ b/NetworkScanners/BwAuthority/bwauthority_child.py @@ -338,11 +338,7 @@ def ignore_streams(c,hdlr): s.ignored = True hdlr.streams[s.strm_id] = s -def cleanup(c): - if c: - c.close() - c.block_until_close() - +def cleanup(): plog("DEBUG", "Child Process Exiting...") def setup_handler(out_dir, cookie_file): @@ -367,7 +363,7 @@ def setup_handler(out_dir, cookie_file): TorCtl.EVENT_TYPE.CIRC, TorCtl.EVENT_TYPE.STREAM_BW], True) - atexit.register(cleanup, c) + atexit.register(cleanup) return (c,h) def usage(argv):

1 0

[torflow/master] Submodule..
by mikeperry＠torproject.org 07 Sep '11

07 Sep '11

commit 5736529160df12435fb39d11f81a5da92f74d615 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Sep 6 18:16:48 2011 -0700 Submodule.. --- TorCtl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/TorCtl b/TorCtl index a3ed3d0..e99394c 160000 --- a/TorCtl +++ b/TorCtl @@ -1 +1 @@ -Subproject commit a3ed3d01ff93df9d25dc64ffbacfcb6b4ef0befa +Subproject commit e99394c46b30ed73ffbf02d5c6a39bf9b04416a2

1 0