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

r25716: {website} point at the correct win32 expert bundle name. (website/trunk/include)
by Andrew Lewman 16 Jul '12

16 Jul '12

Author: phobos Date: 2012-07-17 03:07:07 +0000 (Tue, 17 Jul 2012) New Revision: 25716 Modified: website/trunk/include/versions.wmi Log: point at the correct win32 expert bundle name. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2012-07-16 17:00:32 UTC (rev 25715) +++ website/trunk/include/versions.wmi 2012-07-17 03:07:07 UTC (rev 25716) @@ -62,7 +62,7 @@ <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag> <define-tag package-win32-stable whitespace=delete>../dist/win32/tor-<version-win32-stable>-win32.exe</define-tag> -<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32.exe</define-tag> +<define-tag package-win32-alpha whitespace=delete>../dist/win32/tor-<version-win32-alpha>-win32-1.exe</define-tag> <define-tag file-win32-bundle-stable whitespace=delete>vidalia-bundle-<version-win32-bundle-stable>-0.2.19.exe</define-tag> <define-tag package-win32-bundle-stable whitespace=delete>../dist/vidalia-bundles/<file-win32-bundle-stable></define-tag>

1 0

[flashproxy/master] Add LICENSE.
by dcf＠torproject.org 16 Jul '12

16 Jul '12

commit ecf1bd0a046039c1976fb193216d5e35f976c5c5 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 16 13:57:04 2012 -0700 Add LICENSE. This is the Expat a.k.a. MIT license. https://www.gnu.org/licenses/license-list.html#Expat https://lists.torproject.org/pipermail/tor-dev/2012-July/003744.html --- LICENSE | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..6a36b2d --- /dev/null +++ b/LICENSE @@ -0,0 +1,20 @@ +Copyright 2012 David Fifield + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

1 0

[flashproxy/master] Add LICENSE to dist.
by dcf＠torproject.org 16 Jul '12

16 Jul '12

commit 407e8ad454df12a27ca82130065c0fd18ecd3528 Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jul 16 14:00:20 2012 -0700 Add LICENSE to dist. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index a4fcd18..fc65672 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ BINDIR = $(PREFIX)/bin VERSION = 0.2 -CLIENT_DIST_FILES = flashproxy-client.py flashproxy-reg-http.py README torrc +CLIENT_DIST_FILES = flashproxy-client.py flashproxy-reg-http.py README LICENSE torrc all: :

1 0

r25715: {website} fix the crazyhaze.de mirror, update the mirror status. (in website/trunk: . include)
by Andrew Lewman 16 Jul '12

16 Jul '12

Author: phobos Date: 2012-07-16 17:00:32 +0000 (Mon, 16 Jul 2012) New Revision: 25715 Modified: website/trunk/include/mirrors-table.wmi website/trunk/update-mirrors.pl Log: fix the crazyhaze.de mirror, update the mirror status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2012-07-16 11:06:16 UTC (rev 25714) +++ website/trunk/include/mirrors-table.wmi 2012-07-16 17:00:32 UTC (rev 25715) @@ -1,32 +1,32 @@ <tr> - <td>TN</td> + <td>PT</td> - <td></td> + <td>5ª Coluna</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.antagonism.org/dist/">http</a></td> - <td><a href="http://torproject.antagonism.org/">http</a></td> - <td><a href="https://torproject.antagonism.org/dist/">https</a></td> - <td><a href="https://torproject.antagonism.org/">https</a></td> + <td><a href="http://torproject.pt/dist/">http</a></td> + <td><a href="http://torproject.pt/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>NL</td> + <td>EE</td> - <td>Amorphis</td> + <td>CyberSIDE</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://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -35,15 +35,15 @@ <tr> - <td>PT</td> + <td>IT</td> - <td>5ª Coluna</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.pt/dist/">http</a></td> - <td><a href="http://torproject.pt/">http</a></td> + <td><a href="http://torproject.jcsh.it/dist/">http</a></td> + <td><a href="http://torproject.jcsh.it/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -52,15 +52,15 @@ <tr> - <td>US</td> + <td>AT</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://ec2-50-112-70-145.us-west-2.compute.amazonaws.com/mirrors/torproject…">http</a></td> - <td><a href="http://ec2-50-112-70-145.us-west-2.compute.amazonaws.com/mirrors/torproject…">http</a></td> + <td><a href="http://torproject.ph3x.at/dist/">http</a></td> + <td><a href="http://torproject.ph3x.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -69,32 +69,32 @@ <tr> - <td>NL</td> + <td>US</td> - <td>CCC</td> + <td>BarkerJr</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://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>DK</td> + <td>AT</td> - <td>Zentrum der Gesundheit</td> + <td></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.dont-know-me.at/dist/">http</a></td> + <td><a href="http://tor.dont-know-me.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -103,15 +103,15 @@ <tr> - <td>EE</td> + <td>US</td> - <td>CyberSIDE</td> + <td>hessmo</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://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -120,83 +120,83 @@ <tr> - <td>IS</td> + <td>DE</td> - <td>torproject.is</td> + <td>crazyhaze.de</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><a href="http://tor.crazyhaze.de/dist/">http</a></td> + <td><a href="http://tor.crazyhaze.de/">http</a></td> + <td><a href="https://tor.crazyhaze.de/dist/">https</a></td> + <td><a href="https://tor.crazyhaze.de/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>IT</td> + <td>DE</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.jcsh.it/dist/">http</a></td> - <td><a href="http://torproject.jcsh.it/">http</a></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> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://torproject.cryptowars.info/">rsync</a></td> </tr> <tr> - <td>AT</td> + <td>DE</td> <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.ph3x.at/dist/">http</a></td> - <td><a href="http://torproject.ph3x.at/">http</a></td> + <td><a href="http://tor.dev-random.de/dist/">http</a></td> + <td><a href="http://tor.dev-random.de/">http</a></td> + <td><a href="https://tor.dev-random.de/dist/">https</a></td> + <td><a href="https://tor.dev-random.de/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> + <td>FR</td> <td>BarkerJr</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://www.oignon.net/dist/">http</a></td> + <td><a href="http://www.oignon.net/">http</a></td> + <td><a href="https://www.oignon.net/dist/">https</a></td> + <td><a href="https://www.oignon.net/">https</a></td> <td> - </td> - <td><a href="rsync://rsync.torproject.us/tor">rsync</a></td> + <td> - </td> </tr> <tr> - <td>AT</td> + <td>US</td> - <td></td> + <td>searchprivate</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.dont-know-me.at/dist/">http</a></td> - <td><a href="http://tor.dont-know-me.at/">http</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> - </td> <td> - </td> @@ -207,47 +207,47 @@ <td>DE</td> - <td>torservers</td> + <td>factor.cc</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.factor.cc/dist/">http</a></td> + <td><a href="http://tor.factor.cc/">http</a></td> + <td><a href="https://factor.cc/tor/dist/">https</a></td> + <td><a href="https://factor.cc/tor/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>IS</td> + <td>DE</td> - <td>myRL.net</td> + <td>chaos darmstadt</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.myrl.net/dist/">http</a></td> - <td><a href="http://tor.myrl.net/">http</a></td> - <td><a href="https://tor.myrl.net/dist/">https</a></td> - <td><a href="https://tor.myrl.net/">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> - </td> + <td> - </td> + <td> - </td> </tr> <tr> <td>US</td> - <td>hessmo</td> + <td></td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> - <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td><a href="http://mirror.grwebhost.com/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.grwebhost.com/torproject.org/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -256,15 +256,15 @@ <tr> - <td>IN</td> + <td>HU</td> - <td>India Tor Fans</td> + <td>Unknown</td> <td>Up to 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://mirror.tor.hu/dist/">http</a></td> + <td><a href="http://mirror.tor.hu/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -273,134 +273,134 @@ <tr> - <td>LT</td> + <td>DE</td> - <td></td> + <td>beme it</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><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> - <td>DE</td> + <td>US</td> - <td></td> + <td>Xpdm</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><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><a href="rsync://torproject.cryptowars.info/">rsync</a></td> + <td> - </td> </tr> <tr> - <td>DE</td> + <td>IL</td> - <td></td> + <td>Host4site</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.dev-random.de/dist/">http</a></td> - <td><a href="http://tor.dev-random.de/">http</a></td> - <td><a href="https://tor.dev-random.de/dist/">https</a></td> - <td><a href="https://tor.dev-random.de/">https</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> + <td> - </td> </tr> <tr> - <td>FR</td> + <td>DE</td> - <td>BarkerJr</td> + <td>borgmann.tv</td> <td>Up to date</td> <td> - </td> - <td><a href="http://www.oignon.net/dist/">http</a></td> - <td><a href="http://www.oignon.net/">http</a></td> - <td><a href="https://www.oignon.net/dist/">https</a></td> - <td><a href="https://www.oignon.net/">https</a></td> + <td><a href="http://tor.borgmann.tv/dist/">http</a></td> + <td><a href="http://tor.borgmann.tv/">http</a></td> <td> - </td> <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>AT</td> + <td>FR</td> - <td>cyberarmy</td> + <td>LazyTiger</td> <td>Up to date</td> <td> - </td> + <td><a href="http://tor.taiga-san.net/dist/">http</a></td> + <td><a href="http://tor.taiga-san.net/">http</a></td> <td> - </td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td> - </td> </tr> <tr> - <td>US</td> + <td>DE</td> - <td>searchprivate</td> + <td>spline</td> <td>Up to date</td> + <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> + <td><a href="http://tor.spline.de/dist/">http</a></td> + <td><a href="http://tor.spline.de/">http</a></td> + <td><a href="https://tor.spline.inf.fu-berlin.de/dist/">https</a></td> + <td><a href="https://tor.spline.inf.fu-berlin.de/">https</a></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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> + <td><a href="rsync://ftp.spline.de/tor">rsync</a></td> </tr> <tr> - <td>DE</td> + <td>GB</td> - <td>factor.cc</td> + <td>torland</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.factor.cc/dist/">http</a></td> - <td><a href="http://tor.factor.cc/">http</a></td> - <td><a href="https://factor.cc/tor/dist/">https</a></td> - <td><a href="https://factor.cc/tor/">https</a></td> + <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> + <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> + <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> + <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>DE</td> + <td>IS</td> - <td>chaos darmstadt</td> + <td>TheOnionRouter</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://theonionrouter.com/dist/">http</a></td> + <td><a href="http://theonionrouter.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -416,8 +416,8 @@ <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.grwebhost.com/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.grwebhost.com/torproject.org/">http</a></td> + <td><a href="http://torproject.umbrellacorporation.org.uk/dist/">http</a></td> + <td><a href="http://torproject.umbrellacorporation.org.uk/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -426,15 +426,15 @@ <tr> - <td>US</td> + <td>INT</td> - <td></td> + <td>CoralCDN</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.onthegetgo.com/dist/">http</a></td> - <td><a href="http://tor.onthegetgo.com/">http</a></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> @@ -443,83 +443,83 @@ <tr> - <td>HU</td> + <td>TN</td> - <td>Unknown</td> + <td></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><a href="http://torproject.antagonism.org/dist/">http</a></td> + <td><a href="http://torproject.antagonism.org/">http</a></td> + <td><a href="https://torproject.antagonism.org/dist/">https</a></td> + <td><a href="https://torproject.antagonism.org/">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> <tr> - <td>DE</td> + <td>US</td> - <td>beme it</td> + <td></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://ec2-50-112-70-145.us-west-2.compute.amazonaws.com/mirrors/torproject…">http</a></td> + <td><a href="http://ec2-50-112-70-145.us-west-2.compute.amazonaws.com/mirrors/torproject…">http</a></td> <td> - </td> - <td><a href="rsync://tor.beme-it.de/tor">rsync</a></td> + <td> - </td> + <td> - </td> + <td> - </td> </tr> <tr> - <td>US</td> + <td>NL</td> - <td>NW Linux</td> + <td>CCC</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> - <td><a href="http://torproject.nwlinux.us/">http</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><a href="rsync://nwlinux.us/tor-web">rsync</a></td> + <td> - </td> </tr> <tr> - <td>US</td> + <td>IS</td> - <td>Xpdm</td> + <td>myRL.net</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><a href="http://tor.myrl.net/dist/">http</a></td> + <td><a href="http://tor.myrl.net/">http</a></td> + <td><a href="https://tor.myrl.net/dist/">https</a></td> + <td><a href="https://tor.myrl.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>IL</td> + <td>LT</td> - <td>Host4site</td> + <td></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><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> @@ -528,32 +528,32 @@ <tr> - <td>DE</td> + <td>AT</td> - <td>borgmann.tv</td> + <td>cyberarmy</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.borgmann.tv/dist/">http</a></td> - <td><a href="http://tor.borgmann.tv/">http</a></td> <td> - </td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> <td> - </td> <td> - </td> <td> - </td> + <td> - </td> </tr> <tr> <td>US</td> - <td>AskApache</td> + <td></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://tor.onthegetgo.com/dist/">http</a></td> + <td><a href="http://tor.onthegetgo.com/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -562,66 +562,66 @@ <tr> - <td>FR</td> + <td>US</td> - <td>LazyTiger</td> + <td>NW Linux</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.taiga-san.net/dist/">http</a></td> - <td><a href="http://tor.taiga-san.net/">http</a></td> + <td><a href="http://torproject.nwlinux.us/dist/">http</a></td> + <td><a href="http://torproject.nwlinux.us/">http</a></td> <td> - </td> <td> - </td> <td> - </td> - <td> - </td> + <td><a href="rsync://nwlinux.us/tor-web">rsync</a></td> </tr> <tr> - <td>DE</td> + <td>US</td> - <td>spline</td> + <td>AskApache</td> <td>Up to date</td> - <td><a href="ftp://ftp.spline.de/pub/tor">ftp</a></td> - <td><a href="http://tor.spline.de/dist/">http</a></td> - <td><a href="http://tor.spline.de/">http</a></td> - <td><a href="https://tor.spline.inf.fu-berlin.de/dist/">https</a></td> - <td><a href="https://tor.spline.inf.fu-berlin.de/">https</a></td> <td> - </td> - <td><a href="rsync://ftp.spline.de/tor">rsync</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> + <td> - </td> </tr> <tr> - <td>GB</td> + <td>DE</td> - <td>torland</td> + <td>[[:bbs:]]</td> <td>Up to date</td> <td> - </td> - <td><a href="http://mirror.torland.me/torproject.org/dist/">http</a></td> - <td><a href="http://mirror.torland.me/torproject.org/">http</a></td> - <td><a href="https://mirror.torland.me/torproject.org/dist/">https</a></td> - <td><a href="https://mirror.torland.me/torproject.org/">https</a></td> + <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> + <td><a href="http://tor.blingblingsquad.net/">http</a></td> + <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> + <td><a href="https://tor.blingblingsquad.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>IS</td> + <td>NL</td> - <td>TheOnionRouter</td> + <td>Amorphis</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><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> @@ -647,15 +647,15 @@ <tr> - <td>US</td> + <td>DK</td> - <td></td> + <td>Zentrum der Gesundheit</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://torproject.umbrellacorporation.org.uk/dist/">http</a></td> - <td><a href="http://torproject.umbrellacorporation.org.uk/">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> @@ -664,53 +664,53 @@ <tr> - <td>DE</td> + <td>IS</td> - <td>[[:bbs:]]</td> + <td>torproject.is</td> - <td>Up to date</td> + <td>Out of date</td> <td> - </td> - <td><a href="http://tor.blingblingsquad.net/dist/">http</a></td> - <td><a href="http://tor.blingblingsquad.net/">http</a></td> - <td><a href="https://tor.blingblingsquad.net/dist/">https</a></td> - <td><a href="https://tor.blingblingsquad.net/">https</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> + <td> - </td> </tr> <tr> - <td>INT</td> + <td>DE</td> - <td>CoralCDN</td> + <td>torservers</td> - <td>Up to date</td> + <td>Out of 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.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>DE</td> + <td>IN</td> - <td></td> + <td>India Tor Fans</td> <td>Out of date</td> <td> - </td> - <td><a href="http://tor.dev-random.de/dist/">http</a></td> - <td><a href="http://tor.crazyhaze.de/">http</a></td> - <td><a href="https://tor.dev-random.de/dist/">https</a></td> - <td><a href="https://tor.crazyhaze.de/">https</a></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> + <td> - </td> </tr> <tr> Modified: website/trunk/update-mirrors.pl =================================================================== --- website/trunk/update-mirrors.pl 2012-07-16 11:06:16 UTC (rev 25714) +++ website/trunk/update-mirrors.pl 2012-07-16 17:00:32 UTC (rev 25715) @@ -911,7 +911,7 @@ }, mirror063 => { adminContact => "", - orgName => "", + orgName => "crazyhaze.de", isoCC => "DE", subRegion => "", region => "DE", @@ -922,8 +922,8 @@ httpsWebsiteMirror => "https://tor.crazyhaze.de/", rsyncWebsiteMirror => "", ftpWebsiteMirror => "", - httpDistMirror => "http://tor.dev-random.de/dist/", - httpsDistMirror => "https://tor.dev-random.de/dist/", + httpDistMirror => "http://tor.crazyhaze.de/dist/", + httpsDistMirror => "https://tor.crazyhaze.de/dist/", rsyncDistMirror => "", hiddenServiceMirror => "", },

1 0

[tor/master] Coverity 709056: Check return value on fputs in tor-gencert
by nickm＠torproject.org 16 Jul '12

16 Jul '12

commit d32f5081e1c41324a3464c30c487c6ef57a333d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 16 11:38:39 2012 -0400 Coverity 709056: Check return value on fputs in tor-gencert --- changes/cov709056 | 4 ++++ src/tools/tor-gencert.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/cov709056 b/changes/cov709056 new file mode 100644 index 0000000..64a75ad --- /dev/null +++ b/changes/cov709056 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Check return value of fputs() when writing authority certificate + file. Fixes Coverity issue 709056; bugfix on 0.2.0.1-alpha. + diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index a8ffc07..38b2101 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -497,7 +497,12 @@ generate_certificate(void) return 1; } - fputs(buf, f); + if (fputs(buf, f) < 0) { + log_err(LD_GENERAL, "Couldn't write to %s: %s", + certificate_file, strerror(errno)); + fclose(f); + return 1; + } fclose(f); return 0; }

1 0

[tor/master] Refer to the correct variable in a loop when parsing entry guard state
by nickm＠torproject.org 16 Jul '12

16 Jul '12

commit 93b730175566de2dcf783b1ce4b3fd87a6f7375e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 16 11:49:45 2012 -0400 Refer to the correct variable in a loop when parsing entry guard state Fixes bug 6397 and coverity issue 709599. Bugfix on 0.2.3.17-beta. --- changes/bug6397 | 4 ++++ src/or/circuitbuild.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/bug6397 b/changes/bug6397 new file mode 100644 index 0000000..23d8359 --- /dev/null +++ b/changes/bug6397 @@ -0,0 +1,4 @@ + o Major bugfixes: + - When disabling guards for having too high a proportion of failed + circuits, make sure to look at each guard. Fix for bug 6397; bugfix + on 0.2.3.17-beta. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6d1e4e7..714bbca 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4728,8 +4728,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) } } - SMARTLIST_FOREACH(new_entry_guards, entry_guard_t *, e, - { + SMARTLIST_FOREACH_BEGIN(new_entry_guards, entry_guard_t *, e) { char *sp; char *val = digestmap_get(added_by, e->identity); if (val && (sp = strchr(val, ' '))) { @@ -4747,9 +4746,10 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) e->chosen_on_date = time(NULL) - crypto_rand_int(3600*24*30); } } - if (node->path_bias_disabled && !node->bad_since) - node->bad_since = time(NULL); - }); + if (e->path_bias_disabled && !e->bad_since) + e->bad_since = time(NULL); + } + SMARTLIST_FOREACH_END(e); if (*msg || !set) { SMARTLIST_FOREACH(new_entry_guards, entry_guard_t *, e,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
by nickm＠torproject.org 16 Jul '12

16 Jul '12

commit 7ac8a4a037581ab7c47079cc98c9d3496932a8bd Merge: deaf30a 93b7301 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 16 11:50:53 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug6397 | 4 ++++ changes/cov709056 | 4 ++++ src/or/circuitbuild.c | 10 +++++----- src/tools/tor-gencert.c | 7 ++++++- 4 files changed, 19 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.2.3] Coverity 709056: Check return value on fputs in tor-gencert
by nickm＠torproject.org 16 Jul '12

16 Jul '12

commit d32f5081e1c41324a3464c30c487c6ef57a333d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 16 11:38:39 2012 -0400 Coverity 709056: Check return value on fputs in tor-gencert --- changes/cov709056 | 4 ++++ src/tools/tor-gencert.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/cov709056 b/changes/cov709056 new file mode 100644 index 0000000..64a75ad --- /dev/null +++ b/changes/cov709056 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Check return value of fputs() when writing authority certificate + file. Fixes Coverity issue 709056; bugfix on 0.2.0.1-alpha. + diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index a8ffc07..38b2101 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -497,7 +497,12 @@ generate_certificate(void) return 1; } - fputs(buf, f); + if (fputs(buf, f) < 0) { + log_err(LD_GENERAL, "Couldn't write to %s: %s", + certificate_file, strerror(errno)); + fclose(f); + return 1; + } fclose(f); return 0; }

1 0

[tor/maint-0.2.3] Refer to the correct variable in a loop when parsing entry guard state
by nickm＠torproject.org 16 Jul '12

16 Jul '12

commit 93b730175566de2dcf783b1ce4b3fd87a6f7375e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 16 11:49:45 2012 -0400 Refer to the correct variable in a loop when parsing entry guard state Fixes bug 6397 and coverity issue 709599. Bugfix on 0.2.3.17-beta. --- changes/bug6397 | 4 ++++ src/or/circuitbuild.c | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/changes/bug6397 b/changes/bug6397 new file mode 100644 index 0000000..23d8359 --- /dev/null +++ b/changes/bug6397 @@ -0,0 +1,4 @@ + o Major bugfixes: + - When disabling guards for having too high a proportion of failed + circuits, make sure to look at each guard. Fix for bug 6397; bugfix + on 0.2.3.17-beta. diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 6d1e4e7..714bbca 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4728,8 +4728,7 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) } } - SMARTLIST_FOREACH(new_entry_guards, entry_guard_t *, e, - { + SMARTLIST_FOREACH_BEGIN(new_entry_guards, entry_guard_t *, e) { char *sp; char *val = digestmap_get(added_by, e->identity); if (val && (sp = strchr(val, ' '))) { @@ -4747,9 +4746,10 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) e->chosen_on_date = time(NULL) - crypto_rand_int(3600*24*30); } } - if (node->path_bias_disabled && !node->bad_since) - node->bad_since = time(NULL); - }); + if (e->path_bias_disabled && !e->bad_since) + e->bad_since = time(NULL); + } + SMARTLIST_FOREACH_END(e); if (*msg || !set) { SMARTLIST_FOREACH(new_entry_guards, entry_guard_t *, e,

1 0

[tor/master] Improve Alternate*Authority docs. Bug 6387.
by nickm＠torproject.org 16 Jul '12

16 Jul '12

commit 9ad5b2593004c55d4223d59a150898b48d04737a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jul 16 11:21:20 2012 -0400 Improve Alternate*Authority docs. Bug 6387. --- changes/bug6387 | 3 +++ doc/tor.1.txt | 11 +++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changes/bug6387 b/changes/bug6387 new file mode 100644 index 0000000..73fc4f7 --- /dev/null +++ b/changes/bug6387 @@ -0,0 +1,3 @@ + o Documentation: + - Clarify the documentation for the Alternate*Authority options. + Fixes bug 6387. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a4a0ed7..78c3487 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -319,11 +319,14 @@ GENERAL OPTIONS **AlternateHSAuthority** [__nickname__] [**flags**] __address__:__port__ __fingerprint__ + **AlternateBridgeAuthority** [__nickname__] [**flags**] __address__:__port__ __ fingerprint__:: - As DirServer, but replaces less of the default directory authorities. Using + These options behave as DirServer, but they replace fewer of the + default directory authorities. Using AlternateDirAuthority replaces the default Tor directory authorities, but - leaves the hidden service authorities and bridge authorities in place. - Similarly, Using AlternateHSAuthority replaces the default hidden service - authorities, but not the directory or bridge authorities. + leaves the default hidden service authorities and bridge authorities in + place. Similarly, AlternateHSAuthority replaces the default hidden + service authorities, but not the directory or bridge authorities; and + AlternateBridgeAuthority replaces the default bridge authority, + but leaves the directory and hidden service authorities alone. **DisableAllSwap** **0**|**1**:: If set to 1, Tor will attempt to lock all current and future memory pages,

1 0