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

r26228: {website} update mirror status. (website/trunk/include)
by Andrew Lewman 20 Jun '13

20 Jun '13

Author: phobos Date: 2013-06-20 14:39:10 +0000 (Thu, 20 Jun 2013) New Revision: 26228 Modified: website/trunk/include/mirrors-table.wmi Log: update mirror status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-06-20 14:07:57 UTC (rev 26227) +++ website/trunk/include/mirrors-table.wmi 2013-06-20 14:39:10 UTC (rev 26228) @@ -37,23 +37,6 @@ <td>NL</td> - <td>Amorphis</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>NL</td> - <td>CCC</td> <td>Up to date</td> @@ -69,23 +52,6 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>EE</td> <td>CyberSIDE</td> @@ -239,23 +205,6 @@ <tr> - <td>MX</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> - <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>RO</td> <td>me0w.cc</td> @@ -392,6 +341,23 @@ <tr> + <td>NO</td> + + <td>MultiNet AS</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.multinet.no/dist/">http</a></td> + <td><a href="http://tor.multinet.no/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td></td> @@ -698,23 +664,6 @@ <tr> - <td>SE</td> - - <td>homosu</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>DE</td> <td>[[:bbs:]]</td> @@ -783,6 +732,57 @@ <tr> + <td>NL</td> + + <td>Amorphis</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DK</td> + + <td>Zentrum der Gesundheit</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>SE</td> + + <td>homosu</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td>hessmo</td> @@ -885,6 +885,23 @@ <tr> + <td>MX</td> + + <td></td> + + <td>Unknown</td> + + <td> - </td> + <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> + <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>UA</td> <td></td>

1 0

r26227: {website} add norwegian mirror. (website/trunk)
by Andrew Lewman 20 Jun '13

20 Jun '13

Author: phobos Date: 2013-06-20 14:07:57 +0000 (Thu, 20 Jun 2013) New Revision: 26227 Modified: website/trunk/update-mirrors.pl Log: add norwegian mirror. Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2013-06-20 01:35:14 UTC (rev 26226) +++ website/trunk/update-mirrors.pl 2013-06-20 14:07:57 UTC (rev 26227) @@ -1129,20 +1129,38 @@ hiddenServiceMirror => "" }, mirror093 => { - adminContact => "http://sebastian.pfeifer.or.at/", - orgName => "TechAsk.IT", - isoCC => "AT", - subRegion => "Favoriten", - region => "Wien", + adminContact => "http://sebastian.pfeifer.or.at/", + orgName => "TechAsk.IT", + isoCC => "AT", + subRegion => "Favoriten", + region => "Wien", + ipv4 => "True", + ipv6 => "True", + loadBalanced => "No", + httpWebsiteMirror => "http://www.unicorncloud.org/public/torproject.org/", + httpsWebsiteMirror => "https://www.unicorncloud.org/public/torproject.org/", + rsyncWebsiteMirror => "", + ftpWebsiteMirror => "", + httpDistMirror => "http://www.unicorncloud.org/public/torproject.org/dist", + httpsDistMirror => "https://www.unicorncloud.org/public/torproject.org/dist", + rsyncDistMirror => "", + hiddenServiceMirror => "" + }, + mirror094 => { + adminContact =>"http://www.multinet.no", + orgName => "MultiNet AS", + isoCC => "NO", + subRegion => "Trondheim", + region => "Trondheim", ipv4 => "True", ipv6 => "True", loadBalanced => "No", - httpWebsiteMirror => "http://www.unicorncloud.org/public/torproject.org/", - httpsWebsiteMirror => "https://www.unicorncloud.org/public/torproject.org/", + httpWebsiteMirror =>"http://tor.multinet.no/", + httpsWebsiteMirror => "", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://www.unicorncloud.org/public/torproject.org/dist", - httpsDistMirror => "https://www.unicorncloud.org/public/torproject.org/dist", + httpDistMirror =>"http://tor.multinet.no/dist/", + httpsDistMirror => "", rsyncDistMirror => "", hiddenServiceMirror => "" }

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 20 Jun '13

20 Jun '13

commit 8a83d149bbc02e26f69d7c73d670c7a528020a15 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 20 10:46:13 2013 +0000 Update translations for https_everywhere_completed --- sv/https-everywhere.dtd | 2 +- sv/https-everywhere.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index d53648d..a8a697e 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -24,7 +24,7 @@ <!ENTITY https-everywhere.prefs.notes "Anmärkningar"> <!ENTITY https-everywhere.prefs.list_caption "Vilka HTTPS vidarebefodringsregler ska gälla?"> <!ENTITY https-everywhere.prefs.enabled "Aktiverad"> -<!ENTITY https-everywhere.prefs.ruleset_howto "Du kan lära dig hur du skriver dina egna regler (för att ge support för andra webbsidor)"> +<!ENTITY https-everywhere.prefs.ruleset_howto "Du kan lära dig hur du skriver dina egna regler (för att lägga till stöd för andra webbplatser)"> <!ENTITY https-everywhere.prefs.here_link "här"> <!ENTITY https-everywhere.prefs.toggle "Växla"> <!ENTITY https-everywhere.prefs.reset_default "Återställ till standard"> diff --git a/sv/https-everywhere.properties b/sv/https-everywhere.properties index 147335d..a3d67a2 100644 --- a/sv/https-everywhere.properties +++ b/sv/https-everywhere.properties @@ -3,4 +3,4 @@ https-everywhere.menu.globalDisable = Inaktivera HTTPS Everywhere https-everywhere.menu.enableDisable = Aktivera / inaktivera regler https-everywhere.menu.noRules = (Inga regler för denna sida) https-everywhere.menu.unknownRules = (Regler för denna sida okänt) -https-everywhere.toolbar.hint = HTTPS Everywhere är nu aktiv. Du kan reglera den sida-för-sida genom att klicka på ikonen i adress fältet. +https-everywhere.toolbar.hint = HTTPS Everywhere är nu aktiv. Du kan inaktivera den för enstaka sidor genom att klicka på ikonen i adressfältet.

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 20 Jun '13

20 Jun '13

commit 57db9dbbf4457111a71aa3da10f688b05d135494 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 20 10:46:06 2013 +0000 Update translations for https_everywhere --- sv/https-everywhere.dtd | 2 +- sv/https-everywhere.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sv/https-everywhere.dtd b/sv/https-everywhere.dtd index d53648d..a8a697e 100644 --- a/sv/https-everywhere.dtd +++ b/sv/https-everywhere.dtd @@ -24,7 +24,7 @@ <!ENTITY https-everywhere.prefs.notes "Anmärkningar"> <!ENTITY https-everywhere.prefs.list_caption "Vilka HTTPS vidarebefodringsregler ska gälla?"> <!ENTITY https-everywhere.prefs.enabled "Aktiverad"> -<!ENTITY https-everywhere.prefs.ruleset_howto "Du kan lära dig hur du skriver dina egna regler (för att ge support för andra webbsidor)"> +<!ENTITY https-everywhere.prefs.ruleset_howto "Du kan lära dig hur du skriver dina egna regler (för att lägga till stöd för andra webbplatser)"> <!ENTITY https-everywhere.prefs.here_link "här"> <!ENTITY https-everywhere.prefs.toggle "Växla"> <!ENTITY https-everywhere.prefs.reset_default "Återställ till standard"> diff --git a/sv/https-everywhere.properties b/sv/https-everywhere.properties index 147335d..a3d67a2 100644 --- a/sv/https-everywhere.properties +++ b/sv/https-everywhere.properties @@ -3,4 +3,4 @@ https-everywhere.menu.globalDisable = Inaktivera HTTPS Everywhere https-everywhere.menu.enableDisable = Aktivera / inaktivera regler https-everywhere.menu.noRules = (Inga regler för denna sida) https-everywhere.menu.unknownRules = (Regler för denna sida okänt) -https-everywhere.toolbar.hint = HTTPS Everywhere är nu aktiv. Du kan reglera den sida-för-sida genom att klicka på ikonen i adress fältet. +https-everywhere.toolbar.hint = HTTPS Everywhere är nu aktiv. Du kan inaktivera den för enstaka sidor genom att klicka på ikonen i adressfältet.

1 0

[flashproxy/master] Bypass facilitator when given "client" and "relay"
by dcf＠torproject.org 20 Jun '13

20 Jun '13

commit 2adb6d5745534b7d274b7297e21f15d538b31456 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri May 31 12:25:21 2013 -0700 Bypass facilitator when given "client" and "relay" Proxy should not contact facilitator if given "relay" and "client" parameters. Fixes #9006 --- ChangeLog | 4 ++++ proxy/flashproxy.js | 1 + 2 files changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 791224c..edd92a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,10 @@ meant to reduce the number of connections to the relay when clients haven't set up port forwarding. Introduced bug 9009, later fixed. + o A proxy no longer contacts the facilitator when it is given the + "client" and "relay" parameters. It serves the one given client and + then stops. Patch by Arlo Breault. Fixes bug 9006. + Changes in version 1.1 o Programs that use certificate pins now take a --disable-pin option that causes pins to be ignored. diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index cb54f23..8a70c60 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -522,6 +522,7 @@ function FlashProxy() { } if (client_addr !== undefined && relay_addr !== undefined) { this.begin_proxy(client_addr, relay_addr); + return; } else if (client_addr !== undefined) { puts("Error: the \"client\" parameter requires \"relay\" also.") this.die();

1 0

r26226: {website} update mirrors table. (website/trunk/include)
by Andrew Lewman 20 Jun '13

20 Jun '13

Author: phobos Date: 2013-06-20 01:35:14 +0000 (Thu, 20 Jun 2013) New Revision: 26226 Modified: website/trunk/include/mirrors-table.wmi Log: update mirrors table. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-06-19 21:55:38 UTC (rev 26225) +++ website/trunk/include/mirrors-table.wmi 2013-06-20 01:35:14 UTC (rev 26226) @@ -69,6 +69,23 @@ <tr> + <td>DK</td> + + <td>Zentrum der Gesundheit</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>EE</td> <td>CyberSIDE</td> @@ -222,6 +239,40 @@ <tr> + <td>MX</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> + <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> + <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>RO</td> + + <td>me0w.cc</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.me0w.cc/dist/">http</a></td> + <td><a href="http://tor.me0w.cc/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>CH</td> <td></td> @@ -239,6 +290,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> @@ -384,7 +452,7 @@ <td> - </td> <td><a href="http://mirror.hackthissite.org/tor">http</a></td> <td><a href="http://tor.hackthissite.org/">http</a></td> - <td> - </td> + <td><a href="https://mirror.hackthissite.org/tor">https</a></td> <td><a href="https://tor.hackthissite.org/">https</a></td> <td> - </td> <td> - </td> @@ -513,6 +581,40 @@ <td>US</td> + <td>AskApache</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>RU</td> + + <td>Soviet Anonymous</td> + + <td>Up to date</td> + + <td><a href="ftp://creep.im/mirrors/tor">ftp</a></td> + <td><a href="http://creep.im/tor/dist/">http</a></td> + <td><a href="http://creep.im/tor">http</a></td> + <td><a href="https://creep.im/tor/dist/">https</a></td> + <td><a href="https://creep.im/tor">https</a></td> + <td><a href="rsync://creep.im/tor-dist">rsync</a></td> + <td><a href="rsync://creep.im/tor">rsync</a></td> +</tr> + +<tr> + + <td>US</td> + <td></td> <td>Up to date</td> @@ -596,6 +698,23 @@ <tr> + <td>SE</td> + + <td>homosu</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.homosu.net/dist/">http</a></td> + <td><a href="http://tor.homosu.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td>[[:bbs:]]</td> @@ -664,110 +783,8 @@ <tr> - <td>DK</td> - - <td>Zentrum der Gesundheit</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>RO</td> - - <td>me0w.cc</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.me0w.cc/dist/">http</a></td> - <td><a href="http://tor.me0w.cc/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>LT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> - <td>AskApache</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>RU</td> - - <td>Soviet Anonymous</td> - - <td>Up to date</td> - - <td><a href="ftp://creep.im/mirrors/tor">ftp</a></td> - <td><a href="http://creep.im/tor/dist/">http</a></td> - <td><a href="http://creep.im/tor">http</a></td> - <td><a href="https://creep.im/tor/dist/">https</a></td> - <td><a href="https://creep.im/tor">https</a></td> - <td><a href="rsync://creep.im/tor-dist">rsync</a></td> - <td><a href="rsync://creep.im/tor">rsync</a></td> -</tr> - -<tr> - - <td>SE</td> - - <td>homosu</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.homosu.net/dist/">http</a></td> - <td><a href="http://tor.homosu.net/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - <td>hessmo</td> <td>DO NOT USE. Out of date.</td> @@ -868,23 +885,6 @@ <tr> - <td>MX</td> - - <td></td> - - <td>Unknown</td> - - <td> - </td> - <td><a href="http://fbnaia.homelinux.net/torproject/dist/">http</a></td> - <td><a href="http://fbnaia.homelinux.net/torproject/">http</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject//dist/">https</a></td> - <td><a href="https://fbnaia.homelinux.net/torproject/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>UA</td> <td></td>

1 0

[torbrowser/master] update alpha bundles to 2.4.14-alpha-1
by erinn＠torproject.org 20 Jun '13

20 Jun '13

commit 5c4983d17b682ce84865c489c91de1c1c2523964 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 19 21:05:09 2013 -0300 update alpha bundles to 2.4.14-alpha-1 --- README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 12 ++++++------ build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.4 | 10 ++++++++++ changelog.windows-2.4 | 10 ++++++++++ 10 files changed, 48 insertions(+), 18 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 0aab8e1..a59b600 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.12-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) +Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.6esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.1 - |_ HTTPS-Everywhere 4.0development.6 + |_ NoScript 2.6.6.2 + |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 942df88..923cb72 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.12-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) +Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.6esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.1 - |_ HTTPS-Everywhere 4.0development.6 + |_ NoScript 2.6.6.2 + |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 Usage diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 9fd6561..f73eb59 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.12-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) +Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.6esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.1 - |_ HTTPS-Everywhere 4.0development.6 + |_ NoScript 2.6.6.2 + |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 Usage diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 3a15d53..7121474 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1429c5b..7ad744d 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 53c146d..256f562 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,20 +1,20 @@ #!/usr/bin/make -RELEASE_VER=2.4.12-alpha +RELEASE_VER=2.4.14-alpha -ZLIB_VER=1.2.7 +ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.5.15 +LIBPNG_VER=1.5.16 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable -TOR_VER=0.2.4.12-alpha +TOR_VER=0.2.4.14-alpha PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.6esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.6.1 -HTTPSEVERYWHERE_VER=4.0development.6 +NOSCRIPT_VER=2.6.6.2 +HTTPSEVERYWHERE_VER=4.0development.8 PDFJS_VER=0.8.1 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 76bd01e..56233c4 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index ee2032b..5e5441a 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.14-alpha-1); suite=linux + + * Update Tor to 0.2.4.14-alpha + * Update zlib to 1.2.8 + * Update libpng to 1.5.16 + * Update HTTPS Everywhere to 4.0development.8 + * Update NoScript to 2.6.6.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Jun 19 21:00:13 BRT 2013 + Tor Browser Bundle (2.4.12-alpha-2); suite=linux * Update Firefox to 17.0.6esr diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index c2210dd..462f044 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.14-alpha-1); suite=osx + + * Update Tor to 0.2.4.14-alpha + * Update zlib to 1.2.8 + * Update libpng to 1.5.16 + * Update HTTPS Everywhere to 4.0development.8 + * Update NoScript to 2.6.6.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Jun 19 21:00:11 BRT 2013 + Tor Browser Bundle (2.4.12-alpha-2); suite=osx * Update Firefox to 17.0.6esr diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 288c47d..bcfaff2 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.14-alpha-1); suite=windows + + * Update Tor to 0.2.4.14-alpha + * Update zlib to 1.2.8 + * Update libpng to 1.5.16 + * Update HTTPS Everywhere to 4.0development.8 + * Update NoScript to 2.6.6.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Jun 19 21:00:16 BRT 2013 + Tor Browser Bundle (2.4.12-alpha-2); suite=windows * Update Firefox to 17.0.6esr

1 0

[torbrowser/maint-2.4] update alpha bundles to 2.4.14-alpha-1
by erinn＠torproject.org 20 Jun '13

20 Jun '13

commit 5c4983d17b682ce84865c489c91de1c1c2523964 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 19 21:05:09 2013 -0300 update alpha bundles to 2.4.14-alpha-1 --- README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 12 ++++++------ build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.4 | 10 ++++++++++ changelog.windows-2.4 | 10 ++++++++++ 10 files changed, 48 insertions(+), 18 deletions(-) diff --git a/README.LINUX-2.4 b/README.LINUX-2.4 index 0aab8e1..a59b600 100644 --- a/README.LINUX-2.4 +++ b/README.LINUX-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.12-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) +Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.6esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.1 - |_ HTTPS-Everywhere 4.0development.6 + |_ NoScript 2.6.6.2 + |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 Usage diff --git a/README.OSX-2.4 b/README.OSX-2.4 index 942df88..923cb72 100644 --- a/README.OSX-2.4 +++ b/README.OSX-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.12-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) +Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.6esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.1 - |_ HTTPS-Everywhere 4.0development.6 + |_ NoScript 2.6.6.2 + |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 Usage diff --git a/README.WIN-2.4 b/README.WIN-2.4 index 9fd6561..f73eb59 100644 --- a/README.WIN-2.4 +++ b/README.WIN-2.4 @@ -5,11 +5,11 @@ Included applications --------------------- Vidalia 0.2.21 (with Qt 4.8.1) -Tor 0.2.4.12-alpha (with libevent-2.0.21-stable, zlib-1.2.7 and openssl-1.0.0k) +Tor 0.2.4.14-alpha (with libevent-2.0.21-stable, zlib-1.2.8 and openssl-1.0.0k) Firefox 17.0.6esr \_ Torbutton 1.5.2 - |_ NoScript 2.6.6.1 - |_ HTTPS-Everywhere 4.0development.6 + |_ NoScript 2.6.6.2 + |_ HTTPS-Everywhere 4.0development.8 |_ PDF Viewer 0.8.1 Usage diff --git a/build-scripts/linux-alpha.mk b/build-scripts/linux-alpha.mk index 3a15d53..7121474 100644 --- a/build-scripts/linux-alpha.mk +++ b/build-scripts/linux-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=$(shell uname -m) -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Linux ## Build machine specific settings diff --git a/build-scripts/osx-alpha.mk b/build-scripts/osx-alpha.mk index 1429c5b..7ad744d 100644 --- a/build-scripts/osx-alpha.mk +++ b/build-scripts/osx-alpha.mk @@ -15,7 +15,7 @@ ## Architecture ARCH_TYPE=i386 -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=MacOS ## Set OSX-specific backwards compatibility options diff --git a/build-scripts/versions-alpha.mk b/build-scripts/versions-alpha.mk index 53c146d..256f562 100644 --- a/build-scripts/versions-alpha.mk +++ b/build-scripts/versions-alpha.mk @@ -1,20 +1,20 @@ #!/usr/bin/make -RELEASE_VER=2.4.12-alpha +RELEASE_VER=2.4.14-alpha -ZLIB_VER=1.2.7 +ZLIB_VER=1.2.8 OPENSSL_VER=1.0.0k -LIBPNG_VER=1.5.15 +LIBPNG_VER=1.5.16 QT_VER=4.8.1 VIDALIA_VER=0.2.21 LIBEVENT_VER=2.0.21-stable -TOR_VER=0.2.4.12-alpha +TOR_VER=0.2.4.14-alpha PIDGIN_VER=2.6.4 FIREFOX_VER=17.0.6esr MOZBUILD_VER=1.5.1 TORBUTTON_VER=1.5.2 -NOSCRIPT_VER=2.6.6.1 -HTTPSEVERYWHERE_VER=4.0development.6 +NOSCRIPT_VER=2.6.6.2 +HTTPSEVERYWHERE_VER=4.0development.8 PDFJS_VER=0.8.1 OBFSPROXY_VER=0.1.4 OTR_VER=3.2.0 diff --git a/build-scripts/windows-alpha.mk b/build-scripts/windows-alpha.mk index 76bd01e..56233c4 100644 --- a/build-scripts/windows-alpha.mk +++ b/build-scripts/windows-alpha.mk @@ -13,7 +13,7 @@ ### Configuration ### ##################### -BUILD_NUM=2 +BUILD_NUM=1 PLATFORM=Windows ## Location of required libraries diff --git a/changelog.linux-2.4 b/changelog.linux-2.4 index ee2032b..5e5441a 100644 --- a/changelog.linux-2.4 +++ b/changelog.linux-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.14-alpha-1); suite=linux + + * Update Tor to 0.2.4.14-alpha + * Update zlib to 1.2.8 + * Update libpng to 1.5.16 + * Update HTTPS Everywhere to 4.0development.8 + * Update NoScript to 2.6.6.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Jun 19 21:00:13 BRT 2013 + Tor Browser Bundle (2.4.12-alpha-2); suite=linux * Update Firefox to 17.0.6esr diff --git a/changelog.osx-2.4 b/changelog.osx-2.4 index c2210dd..462f044 100644 --- a/changelog.osx-2.4 +++ b/changelog.osx-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.14-alpha-1); suite=osx + + * Update Tor to 0.2.4.14-alpha + * Update zlib to 1.2.8 + * Update libpng to 1.5.16 + * Update HTTPS Everywhere to 4.0development.8 + * Update NoScript to 2.6.6.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Jun 19 21:00:11 BRT 2013 + Tor Browser Bundle (2.4.12-alpha-2); suite=osx * Update Firefox to 17.0.6esr diff --git a/changelog.windows-2.4 b/changelog.windows-2.4 index 288c47d..bcfaff2 100644 --- a/changelog.windows-2.4 +++ b/changelog.windows-2.4 @@ -1,3 +1,13 @@ +Tor Browser Bundle (2.4.14-alpha-1); suite=windows + + * Update Tor to 0.2.4.14-alpha + * Update zlib to 1.2.8 + * Update libpng to 1.5.16 + * Update HTTPS Everywhere to 4.0development.8 + * Update NoScript to 2.6.6.2 + + -- Erinn Clark <erinn(a)torproject.org> Wed Jun 19 21:00:16 BRT 2013 + Tor Browser Bundle (2.4.12-alpha-2); suite=windows * Update Firefox to 17.0.6esr

1 0

[torbrowser/master] Merge branch 'maint-2.4'
by erinn＠torproject.org 20 Jun '13

20 Jun '13

commit 7d76df2a1d0cd09f3ee2d842d87df3b71b138e6b Merge: 3993b0d 5c4983d Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jun 19 21:06:39 2013 -0300 Merge branch 'maint-2.4' README.LINUX-2.4 | 6 +++--- README.OSX-2.4 | 6 +++--- README.WIN-2.4 | 6 +++--- build-scripts/linux-alpha.mk | 2 +- build-scripts/osx-alpha.mk | 2 +- build-scripts/versions-alpha.mk | 12 ++++++------ build-scripts/windows-alpha.mk | 2 +- changelog.linux-2.4 | 10 ++++++++++ changelog.osx-2.4 | 10 ++++++++++ changelog.windows-2.4 | 10 ++++++++++ 10 files changed, 48 insertions(+), 18 deletions(-)

1 0

[ooni-probe/master] Update setup.py, requirements and Vagrant file
by art＠torproject.org 19 Jun '13

19 Jun '13

commit 3f233bfc9284bfada1ea60fb83072ccdf8eb7e29 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Jun 19 23:58:07 2013 +0100 Update setup.py, requirements and Vagrant file --- Vagrantfile | 5 ++--- requirements.txt | 1 + setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 90002aa..897838f 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -142,9 +142,8 @@ pip install -r requirements.txt echo "Installing ooniprobe" python setup.py install -echo "Fetching all inputs" -cd /data/ooniprobe/inputs -make lists +cd /usr/share/ooni/ +make geoip SCRIPT diff --git a/requirements.txt b/requirements.txt index 2dcab52..b335716 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,6 +10,7 @@ txtorcon>=0.7 txsocksx>=0.0.2 Pyrex>=0.9.8.6 parsley>=1.1 +cyclone # Taken from the versions required by twisted 13.0.0 (latest) transaction>=1.1.1 diff --git a/setup.py b/setup.py index 5f221d0..3c42218 100644 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ for root, dirs, file_names in os.walk('data/'): for file_name in file_names: if not file_name.endswith('.pyc'): files.append(pj(root, file_name)) - data_files.append([pj(usr_share_path, root), files]) + data_files.append([pj(usr_share_path, root.replace('data/', '')), files]) with open('requirements.txt') as f: for line in f:

1 0