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

[webwml/master] Preliminary update of GetTor project
by sebastian＠torproject.org 26 Nov '14

26 Nov '14

commit 32fd97cd29a8f977fe1c29416673cb42407ecd6b Author: ileiva <leiva.israel(a)gmail.com> Date: Tue Nov 25 23:26:56 2014 -0300 Preliminary update of GetTor project --- projects/en/gettor.wml | 141 ++++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 69 deletions(-) diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml index a3db527..4e2a258 100644 --- a/projects/en/gettor.wml +++ b/projects/en/gettor.wml @@ -2,7 +2,7 @@ # Revision: $Revision$ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: GetTor email autoresponder" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor Project: GetTor autoresponder" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> @@ -11,98 +11,101 @@ </div> <div id="maincol"> - <h1>GetTor e-mail autoresponder</h1> -<p>GetTor is a program for serving Tor and related files over SMTP. Users -interact with GetTor by sending it email.</p> + <h1>GetTor autoresponder</h1> +<p>GetTor is a program that presents alternative methods to download Tor +Browser, specially when access to Tor Project's official website and mirrors +is blocked. For now, the only available method is SMTP (email).</p> -<h2>Finding GetTor</h2> +<h2>Download Tor Browser via email</h2> -<p>It is assumed that a user has a method of finding a valid GetTor -email robot. Currently the best known GetTor email is gettor @ -gettor.torproject.org. This should be the most current stable GetTor robot as -it is operated by the Tor Project.</p> +<p>Users can communicate with GetTor robot by sending messages via email. +Currently, the best known GetTor email address is gettor @ torproject.org. +This should be the most current stable GetTor robot as it is operated by +Tor Project.</p> +<p>To ask for Tor Browser a user should send an email to GetTor robot with +one of the following options in the message body:</p> -<h2>Requirements for using GetTor</h2> +<ul> + <li><strong>windows</strong>: If the user needs Tor Browser for Windows. + </li> + <li><strong>linux</strong>: If the user needs Tor Browser for Linux. + </li> + <li><strong>osx</strong>: If the user needs Tor Browser for Mac OSX. + </li> +</ul> -<p>Users communicate with the GetTor robot by sending messages via email. -The messages are currently English keywords.</p> - -<h2>Using GetTor</h2> - -<p>Currently, users have a limited set of options. It is best to send an -email with a message body (the subject line can be blank) that consists -of only the word 'help' to receive instructions. This will send the most -current set of choices. An example reply to a request for help -follows:</p> +<p>Options are case insensitive. If a user select two or more options, only +the first one will be considered. After the user sends a valid option, GetTor +robot will reply with links to download Tor Browser from popular cloud +services. For now, the only cloud service supported is Dropbox. A sample +reply from GetTor robot should look like this:</p> <pre> - Hello, This is the "gettor" robot. - - I am sorry, but your request was not understood. Please select one - of the following package names: - - windows - macos-i386 - macos-ppc - linux-i386 - linux-x86_64 - source - - Please send me another email. It only needs a single package name - anywhere in the body of your email. -</pre> -<br> + Thank you for your request for windows-en. -<p>For example, it is possible to fetch the most current Windows bundle. A -user may send a request with only the word 'windows-bundle' in the body of the -email. An example reply would look something like the following:</p> + Here are the download links: -<pre> - Hello! This is the "gettor" robot. - - Here's your requested software as a zip file. Please unzip the - package and verify the signature. + === + Tor Browser Bundle: + === - Hint: If your computer has GnuPG installed, use the gpg - commandline tool as follows after unpacking the zip file: + Dropbox - gpg --verify <packagename>.asc <packagename> + Package (32/64-bit): https://www.dropbox.com/s/0p4oew8w2u7vzv2/torbrowser-install-4.0.1_en-US.ex… + ASC signature (32/64-bit): https://www.dropbox.com/s/y68hhrk378lygn4/torbrowser-install-4.0.1_en-US.ex… + Package SHA256 checksum (32/64-bit): e41078c34785e6834657d008d0c2b0b671b793b5cbc67ebc60e8d55735504a10 - The output should look somewhat like this: + Fingerprint: 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 - gpg: Good signature from "Roger Dingledine <arma(a)mit.edu>" + === + Support: + === - If you're not familiar with commandline tools, try looking for - a graphical user interface for GnuPG on this website: + Still need help? If you have any questions, trouble connecting to Tor + network, or need to talk to a human, please contact our support team at: - http://www.gnupg.org/related_software/frontends.html + help(a)rt.torproject.org - Have fun. + We are ready to answer your queries in English, Farsi, Chinese, Arabic, + French and Spanish. </pre> <br> -<p>The email should also include an attachment with the name -'windows-bundle.z' that can be downloaded by the user. The user must now -unpack the zip file and if they wish, they may verify that the file is -from the Tor Project.</p> +<p>If a user sends something different from the options mentioned before, +GetTor robot will reply with a help message explaining how to interact with +it. A sample help message should look like this:</p> + +<pre> + Hello, this is the 'GetTor' robot. -<h2>Unpacking and verifying the requested files</h2> + Thank you for your request. I am here to help you download the latest + Tor Browser Bundle. -<p>A user should have software for decompressing .zip files. It will -contain at least two files, the requested bundle and its digital -signature. Before a user installs the bundle, they should verify the -signature.</p> + Please reply to this message with one of the options below: -<p>Users should follow the most current instructions for <a href="<page -docs/verifying-signatures>">signature verification</a>.</p> + windows + linux + osx -<h2>Installing the requested files</h2> + And I will send you the download instructions quickly. + + Tip: Just send a blank reply to this message if you are not sure. +</pre> +<br> -<p>After verifying that the file is valid, a user should simply run -the program. If a user requested the source code to Tor, we assume -that they're able to follow the build instructions contained within the -source itself.</p> +<p>Once the files have been downloaded users should <strong>verify the +integrity</strong> of Tor Browser by following the instructions listed in +the <a href="https://www.torproject.org/docs/verifying-signatures.html.en"> +signature verification</a> guide. After verifying that the downloaded file +is valid, users should follow the +<a href="https://www.torproject.org/projects/torbrowser.html.en#macosx"> +install instructions</a> to start using Tor Browser. A user that can't +reach the Tor network after the install process should consider using +<a href="https://bridges.torproject.org">bridges</a> or +<a href="https://www.torproject.org/docs/pluggable-transports.html.en"> +pluggable transports</a>. This guides will be provided by GetTor robot in +the future.</p> </div>

1 0

[webwml/staging] Preliminary update of GetTor project
by sebastian＠torproject.org 26 Nov '14

26 Nov '14

commit 32fd97cd29a8f977fe1c29416673cb42407ecd6b Author: ileiva <leiva.israel(a)gmail.com> Date: Tue Nov 25 23:26:56 2014 -0300 Preliminary update of GetTor project --- projects/en/gettor.wml | 141 ++++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 69 deletions(-) diff --git a/projects/en/gettor.wml b/projects/en/gettor.wml index a3db527..4e2a258 100644 --- a/projects/en/gettor.wml +++ b/projects/en/gettor.wml @@ -2,7 +2,7 @@ # Revision: $Revision$ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: GetTor email autoresponder" CHARSET="UTF-8" +#include "head.wmi" TITLE="Tor Project: GetTor autoresponder" CHARSET="UTF-8" <div id="content" class="clearfix"> <div id="breadcrumbs"> <a href="<page index>">Home » </a> @@ -11,98 +11,101 @@ </div> <div id="maincol"> - <h1>GetTor e-mail autoresponder</h1> -<p>GetTor is a program for serving Tor and related files over SMTP. Users -interact with GetTor by sending it email.</p> + <h1>GetTor autoresponder</h1> +<p>GetTor is a program that presents alternative methods to download Tor +Browser, specially when access to Tor Project's official website and mirrors +is blocked. For now, the only available method is SMTP (email).</p> -<h2>Finding GetTor</h2> +<h2>Download Tor Browser via email</h2> -<p>It is assumed that a user has a method of finding a valid GetTor -email robot. Currently the best known GetTor email is gettor @ -gettor.torproject.org. This should be the most current stable GetTor robot as -it is operated by the Tor Project.</p> +<p>Users can communicate with GetTor robot by sending messages via email. +Currently, the best known GetTor email address is gettor @ torproject.org. +This should be the most current stable GetTor robot as it is operated by +Tor Project.</p> +<p>To ask for Tor Browser a user should send an email to GetTor robot with +one of the following options in the message body:</p> -<h2>Requirements for using GetTor</h2> +<ul> + <li><strong>windows</strong>: If the user needs Tor Browser for Windows. + </li> + <li><strong>linux</strong>: If the user needs Tor Browser for Linux. + </li> + <li><strong>osx</strong>: If the user needs Tor Browser for Mac OSX. + </li> +</ul> -<p>Users communicate with the GetTor robot by sending messages via email. -The messages are currently English keywords.</p> - -<h2>Using GetTor</h2> - -<p>Currently, users have a limited set of options. It is best to send an -email with a message body (the subject line can be blank) that consists -of only the word 'help' to receive instructions. This will send the most -current set of choices. An example reply to a request for help -follows:</p> +<p>Options are case insensitive. If a user select two or more options, only +the first one will be considered. After the user sends a valid option, GetTor +robot will reply with links to download Tor Browser from popular cloud +services. For now, the only cloud service supported is Dropbox. A sample +reply from GetTor robot should look like this:</p> <pre> - Hello, This is the "gettor" robot. - - I am sorry, but your request was not understood. Please select one - of the following package names: - - windows - macos-i386 - macos-ppc - linux-i386 - linux-x86_64 - source - - Please send me another email. It only needs a single package name - anywhere in the body of your email. -</pre> -<br> + Thank you for your request for windows-en. -<p>For example, it is possible to fetch the most current Windows bundle. A -user may send a request with only the word 'windows-bundle' in the body of the -email. An example reply would look something like the following:</p> + Here are the download links: -<pre> - Hello! This is the "gettor" robot. - - Here's your requested software as a zip file. Please unzip the - package and verify the signature. + === + Tor Browser Bundle: + === - Hint: If your computer has GnuPG installed, use the gpg - commandline tool as follows after unpacking the zip file: + Dropbox - gpg --verify <packagename>.asc <packagename> + Package (32/64-bit): https://www.dropbox.com/s/0p4oew8w2u7vzv2/torbrowser-install-4.0.1_en-US.ex… + ASC signature (32/64-bit): https://www.dropbox.com/s/y68hhrk378lygn4/torbrowser-install-4.0.1_en-US.ex… + Package SHA256 checksum (32/64-bit): e41078c34785e6834657d008d0c2b0b671b793b5cbc67ebc60e8d55735504a10 - The output should look somewhat like this: + Fingerprint: 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659 - gpg: Good signature from "Roger Dingledine <arma(a)mit.edu>" + === + Support: + === - If you're not familiar with commandline tools, try looking for - a graphical user interface for GnuPG on this website: + Still need help? If you have any questions, trouble connecting to Tor + network, or need to talk to a human, please contact our support team at: - http://www.gnupg.org/related_software/frontends.html + help(a)rt.torproject.org - Have fun. + We are ready to answer your queries in English, Farsi, Chinese, Arabic, + French and Spanish. </pre> <br> -<p>The email should also include an attachment with the name -'windows-bundle.z' that can be downloaded by the user. The user must now -unpack the zip file and if they wish, they may verify that the file is -from the Tor Project.</p> +<p>If a user sends something different from the options mentioned before, +GetTor robot will reply with a help message explaining how to interact with +it. A sample help message should look like this:</p> + +<pre> + Hello, this is the 'GetTor' robot. -<h2>Unpacking and verifying the requested files</h2> + Thank you for your request. I am here to help you download the latest + Tor Browser Bundle. -<p>A user should have software for decompressing .zip files. It will -contain at least two files, the requested bundle and its digital -signature. Before a user installs the bundle, they should verify the -signature.</p> + Please reply to this message with one of the options below: -<p>Users should follow the most current instructions for <a href="<page -docs/verifying-signatures>">signature verification</a>.</p> + windows + linux + osx -<h2>Installing the requested files</h2> + And I will send you the download instructions quickly. + + Tip: Just send a blank reply to this message if you are not sure. +</pre> +<br> -<p>After verifying that the file is valid, a user should simply run -the program. If a user requested the source code to Tor, we assume -that they're able to follow the build instructions contained within the -source itself.</p> +<p>Once the files have been downloaded users should <strong>verify the +integrity</strong> of Tor Browser by following the instructions listed in +the <a href="https://www.torproject.org/docs/verifying-signatures.html.en"> +signature verification</a> guide. After verifying that the downloaded file +is valid, users should follow the +<a href="https://www.torproject.org/projects/torbrowser.html.en#macosx"> +install instructions</a> to start using Tor Browser. A user that can't +reach the Tor network after the install process should consider using +<a href="https://bridges.torproject.org">bridges</a> or +<a href="https://www.torproject.org/docs/pluggable-transports.html.en"> +pluggable transports</a>. This guides will be provided by GetTor robot in +the future.</p> </div>

1 0

[webwml/staging] update mirror status as of this morning
by sebastian＠torproject.org 26 Nov '14

26 Nov '14

commit d32bc78658b3e7f46190ed68cd6c0afe725f0376 Author: Andrew Lewman <andrew(a)torproject.is> Date: Mon Nov 24 11:51:35 2014 -0500 update mirror status as of this morning --- include/mirrors-table.wmi | 503 ++++++++++++++++++++++++++++----------------- include/tor-mirrors.csv | 156 +++++++------- 2 files changed, 389 insertions(+), 270 deletions(-) diff --git a/include/mirrors-table.wmi b/include/mirrors-table.wmi index 9e7f122..b04edea 100644 --- a/include/mirrors-table.wmi +++ b/include/mirrors-table.wmi @@ -1,6 +1,244 @@ <tr> + <td>AT</td> + + <td>Tor Supporter</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>PL</td> + + <td>Sebastian M. Bobrecki</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.iv.net.pl/dist/">http</a></td> + <td><a href="http://tor.iv.net.pl">http</a></td> + <td><a href="https://tor.iv.net.pl/dist/">https</a></td> + <td><a href="https://tor.iv.net.pl">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + + <td>Tor Supporter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://torproject.hactar.bz/dist/">http</a></td> + <td><a href="http://torproject.hactar.bz">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>NL</td> + + <td>BBLN</td> + + <td>Up to date</td> + + <td><a href="ftp://mirror-nl1.bbln.org/torproject/">ftp</a></td> + <td><a href="http://mirror-nl1.bbln.org/torproject/dist/">http</a></td> + <td><a href="http://mirror-nl1.bbln.org/torproject/">http</a></td> + <td><a href="https://mirror-nl1.bbln.org/torproject/dist/">https</a></td> + <td><a href="https://mirror-nl1.bbln.org/torproject/">https</a></td> + <td><a href="rsync://mirror-nl1.bbln.org/torproject/dist/">rsync</a></td> + <td><a href="rsync://mirror-nl1.bbln.org/torproject/">rsync</a></td> +</tr> + +<tr> + + <td>IS</td> + + <td>torproject.is</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torproject.is/dist/">http</a></td> + <td><a href="http://www.torproject.is/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>AT</td> + + <td>Tor Supporter</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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>AT</td> + + <td>cyberarmy</td> + + <td>Up to date</td> + + <td> - </td> + <td> - </td> + <td><a href="http://tor.cyberarmy.at/">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>DE</td> + + <td>PW</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.pw.is/dist/">http</a></td> + <td><a href="http://tor.pw.is/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>US</td> + + <td>EFF</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="https://tor.eff.org/dist/">http</a></td> + <td><a href="https://tor.eff.org">http</a></td> + <td><a href="https://tor.eff.org/dist/">https</a></td> + <td><a href="https://tor.eff.org">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>FR</td> + + <td>Tor Supporter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor-mirror.zeropi.net/dist/">http</a></td> + <td><a href="http://tor-mirror.zeropi.net/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>FR</td> + + <td>BBLN</td> + + <td>Up to date</td> + + <td><a href="ftp://mirror-fr2.bbln.org/torproject/">ftp</a></td> + <td><a href="http://mirror-fr2.bbln.org/torproject/dist/">http</a></td> + <td><a href="http://mirror-fr2.bbln.org/torproject/">http</a></td> + <td><a href="https://mirror-fr2.bbln.org/torproject/dist/">https</a></td> + <td><a href="https://mirror-fr2.bbln.org/torproject/">https</a></td> + <td><a href="rsync://mirror-fr2.bbln.org/torproject/dist/">rsync</a></td> + <td><a href="rsync://mirror-fr2.bbln.org/torproject/">rsync</a></td> +</tr> + +<tr> + + <td>DE</td> + + <td>Tor Supporter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://neuland.dietrich.cx/dist/">http</a></td> + <td><a href="http://neuland.dietrich.cx/">http</a></td> + <td><a href="https://neuland.dietrich.cx/dist/">https</a></td> + <td><a href="https://neuland.dietrich.cx/">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>DE</td> + + <td>mirror-server.de</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.mirror-server.de/dist/">http</a></td> + <td><a href="http://tor.mirror-server.de/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td>TB-ITF</td> @@ -86,15 +324,15 @@ <tr> - <td>AT</td> + <td>EE</td> - <td>Tor Supporter</td> + <td>CyberSIDE</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://cyberside.net.ee/tor/">http</a></td> + <td><a href="http://cyberside.planet.ee/tor/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -103,17 +341,17 @@ <tr> - <td>AT</td> + <td>MX</td> <td>Tor Supporter</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> - </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> @@ -137,6 +375,23 @@ <tr> + <td>US</td> + + <td>HackThisSite.org</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://mirror.hackthissite.org/tor">http</a></td> + <td><a href="http://tor.hackthissite.org/">http</a></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> +</tr> + +<tr> + <td>DE</td> <td>Tor Supporter</td> @@ -171,17 +426,17 @@ <tr> - <td>AT</td> + <td>DE</td> - <td>cyberarmy</td> + <td>torservers</td> <td>Up to date</td> <td> - </td> - <td> - </td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> - <td> - </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> @@ -205,34 +460,34 @@ <tr> - <td>DE</td> + <td>FR</td> - <td>PW</td> + <td>stalkr.net</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.pw.is/dist/">http</a></td> - <td><a href="http://tor.pw.is/">http</a></td> - <td> - </td> - <td> - </td> + <td><a href="http://tor.stalkr.net/dist/">http</a></td> + <td><a href="http://tor.stalkr.net/">http</a></td> + <td><a href="https://tor.stalkr.net/dist/">https</a></td> + <td><a href="https://tor.stalkr.net/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>FR</td> + <td>DE</td> - <td>stalkr.net</td> + <td>cYbergueRrilLa AnonyMous NeXus</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.stalkr.net/dist/">http</a></td> - <td><a href="http://tor.stalkr.net/">http</a></td> - <td><a href="https://tor.stalkr.net/dist/">https</a></td> - <td><a href="https://tor.stalkr.net/">https</a></td> + <td><a href="https://tor-mirror.cyberguerrilla.org/dist/">http</a></td> + <td><a href="https://tor-mirror.cyberguerrilla.org">http</a></td> + <td> - </td> + <td> - </td> <td> - </td> <td> - </td> </tr> @@ -307,23 +562,6 @@ <tr> - <td>PL</td> - - <td>Sebastian M. Bobrecki</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.iv.net.pl/dist/">http</a></td> - <td><a href="http://tor.iv.net.pl">http</a></td> - <td><a href="https://tor.iv.net.pl/dist/">https</a></td> - <td><a href="https://tor.iv.net.pl">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>IS</td> <td>Tor Supporter</td> @@ -392,32 +630,15 @@ <tr> - <td>US</td> - - <td>Setec Administrator</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.nuclear-weapons.net/dist">http</a></td> - <td><a href="http://tor.nuclear-weapons.net">http</a></td> - <td> - </td> - <td><a href="https://tor.nuclear-weapons.net">https</a></td> - <td><a href="https://tor.nuclear-weapons.net/dist">rsync</a></td> - <td> - </td> -</tr> - -<tr> - - <td>DE</td> + <td>AT</td> <td>Tor Supporter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://torproject.hactar.bz/dist/">http</a></td> - <td><a href="http://torproject.hactar.bz">http</a></td> + <td><a href="http://tor.ludikovsky.name/dist">http</a></td> + <td><a href="http://tor.ludikovsky.name/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -426,19 +647,19 @@ <tr> - <td>NL</td> + <td>US</td> - <td>BBLN</td> + <td>Setec Administrator</td> <td>Up to date</td> - <td><a href="ftp://mirror-nl1.bbln.org/torproject/">ftp</a></td> - <td><a href="http://mirror-nl1.bbln.org/torproject/dist/">http</a></td> - <td><a href="http://mirror-nl1.bbln.org/torproject/">http</a></td> - <td><a href="https://mirror-nl1.bbln.org/torproject/dist/">https</a></td> - <td><a href="https://mirror-nl1.bbln.org/torproject/">https</a></td> - <td><a href="rsync://mirror-nl1.bbln.org/torproject/dist/">rsync</a></td> - <td><a href="rsync://mirror-nl1.bbln.org/torproject/">rsync</a></td> + <td> - </td> + <td><a href="http://tor.nuclear-weapons.net/dist">http</a></td> + <td><a href="http://tor.nuclear-weapons.net">http</a></td> + <td> - </td> + <td><a href="https://tor.nuclear-weapons.net">https</a></td> + <td><a href="https://tor.nuclear-weapons.net/dist">rsync</a></td> + <td> - </td> </tr> <tr> @@ -460,23 +681,6 @@ <tr> - <td>FR</td> - - <td>BBLN</td> - - <td>Up to date</td> - - <td><a href="ftp://mirror-fr2.bbln.org/torproject/">ftp</a></td> - <td><a href="http://mirror-fr2.bbln.org/torproject/dist/">http</a></td> - <td><a href="http://mirror-fr2.bbln.org/torproject/">http</a></td> - <td><a href="https://mirror-fr2.bbln.org/torproject/dist/">https</a></td> - <td><a href="https://mirror-fr2.bbln.org/torproject/">https</a></td> - <td><a href="rsync://mirror-fr2.bbln.org/torproject/dist/">rsync</a></td> - <td><a href="rsync://mirror-fr2.bbln.org/torproject/">rsync</a></td> -</tr> - -<tr> - <td>DE</td> <td>0x3d.lu</td> @@ -528,83 +732,32 @@ <tr> - <td>UK</td> - - <td>justaguy</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://mirrors.justaguy.pw/dist/">http</a></td> - <td><a href="http://mirrors.justaguy.pw/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> - <td>Anatomical Networks</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.ventricle.us/dist/">http</a></td> - <td><a href="http://tor.ventricle.us/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>MX</td> - - <td>Tor Supporter</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>DE</td> - - <td>torservers</td> + <td>Department of CS at USU</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-relay.cs.usu.edu/mirrors/torproject.org/dist/">http</a></td> + <td><a href="http://tor-relay.cs.usu.edu/mirrors/torproject.org/">http</a></td> + <td><a href="https://www.jessevictors.com/secureMirrors/torproject.org/dist/">https</a></td> + <td><a href="https://www.jessevictors.com/secureMirrors/torproject.org/">https</a></td> <td> - </td> <td> - </td> </tr> <tr> - <td>DE</td> + <td>UK</td> - <td>cYbergueRrilLa AnonyMous NeXus</td> + <td>justaguy</td> <td>Up to date</td> <td> - </td> - <td><a href="https://tor-mirror.cyberguerrilla.org/dist/">http</a></td> - <td><a href="https://tor-mirror.cyberguerrilla.org">http</a></td> + <td><a href="http://mirrors.justaguy.pw/dist/">http</a></td> + <td><a href="http://mirrors.justaguy.pw/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -615,30 +768,13 @@ <td>US</td> - <td>EFF</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="https://tor.eff.org/dist/">http</a></td> - <td><a href="https://tor.eff.org">http</a></td> - <td><a href="https://tor.eff.org/dist/">https</a></td> - <td><a href="https://tor.eff.org">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>FR</td> - - <td>Tor Supporter</td> + <td>Anatomical Networks</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor-mirror.zeropi.net/dist/">http</a></td> - <td><a href="http://tor-mirror.zeropi.net/">http</a></td> + <td><a href="http://tor.ventricle.us/dist/">http</a></td> + <td><a href="http://tor.ventricle.us/">http</a></td> <td> - </td> <td> - </td> <td> - </td> @@ -647,34 +783,17 @@ <tr> - <td>DE</td> - - <td>Tor Supporter</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://neuland.dietrich.cx/dist/">http</a></td> - <td><a href="http://neuland.dietrich.cx/">http</a></td> - <td><a href="https://neuland.dietrich.cx/dist/">https</a></td> - <td><a href="https://neuland.dietrich.cx/">https</a></td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>US</td> - <td>Department of CS at USU</td> + <td>Lucid Networks</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor-relay.cs.usu.edu/mirrors/torproject.org/dist/">http</a></td> - <td><a href="http://tor-relay.cs.usu.edu/mirrors/torproject.org/">http</a></td> - <td><a href="https://www.jessevictors.com/secureMirrors/torproject.org/dist/">https</a></td> - <td><a href="https://www.jessevictors.com/secureMirrors/torproject.org/">https</a></td> + <td><a href="http://tor.mirrors.lucidnetworks.net/dist">http</a></td> + <td><a href="http://tor.mirrors.lucidnetworks.net">http</a></td> <td> - </td> <td> - </td> + <td><a href="rsync://tor.mirrors.lucidnetworks.net::tor-dist">rsync</a></td> + <td><a href="rsync://tor.mirrors.lucidnetworks.net::tor">rsync</a></td> </tr> diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv index a99f2a4..4346280 100644 --- a/include/tor-mirrors.csv +++ b/include/tor-mirrors.csv @@ -16,91 +16,91 @@ Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, NO, http://tor.externenpr mirror-service(a)netcologne.de, NetCologne GmbH, DE, NRW, TRUE, TRUE, No, http://mirror.netcologne.de/torproject.org, , rsync://mirror.netcologne.de/torproject.org, ftp://mirror.netcologne.de/torproject.org/, http://mirror.netcologne.de/torproject.org/dist, , rsync://mirror.netcologne.de/torproject.org/dist, , , admin AT netgull DOT com, NetGull, US, United States, North America, TRUE, TRUE, No, , , , , http://www.netgull.com/torproject/, , , , mirrors[at]ip-connect[dot]vn[dot]ua, IP-Connect LLC, UA, VN, TRUE, TRUE, Yes, http://torproject.ip-connect.vn.ua, , rsync://torproject.ip-connect.vn.ua/torproject, ftp://torproject.ip-connect.vn.ua/mirror/torproject/, http://torproject.ip-connect.vn.ua/dist, , rsync://torproject.ip-connect.vn.ua/torproject/dist, , , -torsupport AT tb-itf DOT de, TB-ITF, DE, Germany, Europe, TRUE, TRUE, No, http://tormirror.tb-itf-tor.de, https://tormirror.tb-itf-tor.de, , , , http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, , Wed Nov 19 15:13:39 2014 +torsupport AT tb-itf DOT de, TB-ITF, DE, Germany, Europe, TRUE, TRUE, No, http://tormirror.tb-itf-tor.de, https://tormirror.tb-itf-tor.de, , , , http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, , Mon Nov 24 06:38:57 2014 admin at koreswatanabe dottnet, Tor Supporter, RO, Romania, RO, TRUE, TRUE, No, http://tor-relay.koreswatanabe.net, , , , http://tor-relay.koreswatanabe.net/dist/, , , , calebcenter(a)live.com, calebxu.tk, US, United States, US, TRUE, FALSE, NO, http://tor.calebxu.tk, , rsync://calebxu.tk/tor, ftp://ftp.calebxu.tk, http://tor.calebxu.tk/dist, , , , maki(a)maki-chan.de, Maki Hoshisawa, DE, Germany, DE, TRUE, FALSE, NO, http://tor.mirrors.maki-chan.de/, , , , http://tor.mirrors.maki-chan.de/dist/, , , , Sat Aug 23 14:09:07 2014 info AT zentrum-der-gesundheit DOT de, Zentrum der Gesundheit, DK, Denmark, Europe, TRUE, FALSE, No, http://tor.idnr.ws/, , , , http://tor.idnr.ws/dist/, , , , Tue Sep 2 17:16:00 2014 -mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Wed Nov 19 15:13:39 2014 -info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, TRUE, FALSE, No, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion, Wed Nov 19 15:13:39 2014 -Piratenpartei Bayern, Piratenpartei Bayern, DE, Germany, DE, TRUE, FALSE, NO, http://tormirror.piratenpartei-bayern.de, https://tormirror.piratenpartei-bayern.de, , , http://tormirror.piratenpartei-bayern.de/dist/, http://tormirror.piratenpartei-bayern.de/dist/, , , Wed Nov 19 15:13:39 2014 -Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://tor.hoi-polloi.org, http://tor.hossi-polloiorg, , , http://tor.hoi-polloi.org/dist/, http://tor.hosi-polloi.org/dist/, , , Wed Nov 19 15:13:39 2014 -kevinmg(a)pressfreedomfoundation.org, Freedom of the Press Foundation, US, United States, US, True, False, No, http://tor.pressfreedomfoundation.org, https://tor.pressfreedomfoundation.org, , , http://tor.pressfreedomfoundation.org/dist/, https://tor.pressfreedomfoundation.org/dist/, , , Tue Nov 18 15:15:49 2014 +mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Mon Nov 24 06:38:57 2014 +info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, TRUE, FALSE, No, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion, Mon Nov 24 06:38:57 2014 +Piratenpartei Bayern, Piratenpartei Bayern, DE, Germany, DE, TRUE, FALSE, NO, http://tormirror.piratenpartei-bayern.de, https://tormirror.piratenpartei-bayern.de, , , http://tormirror.piratenpartei-bayern.de/dist/, http://tormirror.piratenpartei-bayern.de/dist/, , , Mon Nov 24 06:38:57 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://tor.hoi-polloi.org, http://tor.hossi-polloiorg, , , http://tor.hoi-polloi.org/dist/, http://tor.hosi-polloi.org/dist/, , , Mon Nov 24 06:38:57 2014 +kevinmg(a)pressfreedomfoundation.org, Freedom of the Press Foundation, US, United States, US, True, False, No, http://tor.pressfreedomfoundation.org, https://tor.pressfreedomfoundation.org, , , http://tor.pressfreedomfoundation.org/dist/, https://tor.pressfreedomfoundation.org/dist/, , , Sun Nov 23 19:54:39 2014 tor(a)fodt.it // FoDT.it Webteam, FoDT.it, AT, Austria, Europe, TRUE, FALSE, No, http://tor.fodt.it, https://tor.fodt.it, , ftp://ftp.fodt.it/pub/mirrors/torproject.org/, http://tor.fodt.it/dist/, https://tor.fodt.it/dist/, , , Mon Aug 25 16:19:07 2014 -http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Wed Nov 19 15:13:39 2014 -haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Wed Nov 19 15:13:39 2014 -Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Wed Nov 19 15:13:39 2014 -margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Tue Nov 18 20:29:10 2014 -Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://www.torproject.is/, , , , http://www.torproject.is/dist/, , , , Wed Nov 19 15:13:39 2014 -Tor Fan, spline, DE, Germany, DE, TRUE, FALSE, No, http://tor.spline.de/, https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, ftp://ftp.spline.de/pub/tor, http://tor.spline.de/dist/, https://tor.spline.inf.fu-berlin.de/dist/, rsync://ftp.spline.de/tor/dist, , Wed Nov 19 15:13:39 2014 -Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Wed Nov 19 12:27:28 2014 -Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Wed Nov 19 15:13:39 2014 -Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, TRUE, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Wed Nov 19 15:13:39 2014 +http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Mon Nov 24 06:38:57 2014 +haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Mon Nov 24 15:12:47 2014 +Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Mon Nov 24 06:38:57 2014 +margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Mon Nov 24 06:38:57 2014 +Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://www.torproject.is/, , , , http://www.torproject.is/dist/, , , , Mon Nov 24 14:22:08 2014 +Tor Fan, spline, DE, Germany, DE, TRUE, FALSE, No, http://tor.spline.de/, https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, ftp://ftp.spline.de/pub/tor, http://tor.spline.de/dist/, https://tor.spline.inf.fu-berlin.de/dist/, rsync://ftp.spline.de/tor/dist, , Mon Nov 24 14:22:08 2014 +Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Mon Nov 24 06:38:57 2014 +Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Mon Nov 24 14:22:08 2014 +Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, TRUE, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Mon Nov 24 14:22:08 2014 coralcdn.org, CoralCDN, INT, International, INT, TRUE, FALSE, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , Mon Oct 20 19:41:01 2014 -Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Wed Nov 19 15:13:39 2014 - mail AT benjamin-meier DOT info, beme it, DE, Germany, DE, TRUE, FALSE, No, http://tor.beme-it.de/, https://tor.beme-it.de/, rsync://tor.beme-it.de/tor, , http://tor.beme-it.de/dist/, https://tor.beme-it.de/dist/, rsync://tor.beme-it.de/tor/dist, , Wed Nov 19 15:13:39 2014 -Tor Fan, Tor Supporter, MX, Mexico, MX, TRUE, FALSE, No, http://fbnaia.homelinux.net/torproject/, https://fbnaia.homelinux.net/torproject/, , , http://fbnaia.homelinux.net/torproject/dist/, https://fbnaia.homelinux.net/torproject/dist/, , , Wed Nov 19 12:27:28 2014 -webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Wed Nov 19 15:13:39 2014 -Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Wed Nov 19 15:13:39 2014 -http://sebastian.pfeifer.or.at/, TechAsk.IT, AT, Favoriten, Wien, TRUE, TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Wed Nov 19 15:13:39 2014 -root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Tue Nov 18 20:29:10 2014 -hackthissite.org, HackThisSite.org, US, United States, US, TRUE, TRUE, No, http://tor.hackthissite.org/, https://tor.hackthissite.org/, , , http://mirror.hackthissite.org/tor, https://mirror.hackthissite.org/tor, , , Wed Nov 19 15:13:39 2014 -Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , Wed Nov 19 15:13:39 2014 -paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Wed Nov 19 15:13:39 2014 -Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Wed Nov 19 15:13:39 2014 -hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Wed Nov 19 15:13:39 2014 +Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Mon Nov 24 15:12:47 2014 + mail AT benjamin-meier DOT info, beme it, DE, Germany, DE, TRUE, FALSE, No, http://tor.beme-it.de/, https://tor.beme-it.de/, rsync://tor.beme-it.de/tor, , http://tor.beme-it.de/dist/, https://tor.beme-it.de/dist/, rsync://tor.beme-it.de/tor/dist, , Mon Nov 24 14:22:08 2014 +Tor Fan, Tor Supporter, MX, Mexico, MX, TRUE, FALSE, No, http://fbnaia.homelinux.net/torproject/, https://fbnaia.homelinux.net/torproject/, , , http://fbnaia.homelinux.net/torproject/dist/, https://fbnaia.homelinux.net/torproject/dist/, , , Mon Nov 24 06:38:57 2014 +webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Mon Nov 24 06:38:57 2014 +Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Mon Nov 24 06:38:57 2014 +http://sebastian.pfeifer.or.at/, TechAsk.IT, AT, Favoriten, Wien, TRUE, TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Mon Nov 24 06:38:57 2014 +root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Sun Nov 23 21:09:00 2014 +hackthissite.org, HackThisSite.org, US, United States, US, TRUE, TRUE, No, http://tor.hackthissite.org/, https://tor.hackthissite.org/, , , http://mirror.hackthissite.org/tor, https://mirror.hackthissite.org/tor, , , Mon Nov 24 06:38:57 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , Mon Nov 24 06:38:57 2014 +paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Mon Nov 24 06:38:57 2014 +Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Mon Nov 24 14:22:08 2014 +hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Mon Nov 24 14:22:08 2014 Tor Fan, crazyhaze.de, DE, Germany, DE, TRUE, FALSE, No, http://tor.crazyhaze.de/, https://tor.crazyhaze.de/, , , http://tor.crazyhaze.de/dist/, https://tor.crazyhaze.de/dist/, , , Tue Oct 21 06:55:00 2014 -Tor Fan, chaos darmstadt, DE, Germany, Europe, TRUE, FALSE, No, http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Wed Nov 19 12:27:28 2014 -Tor Fan, Soviet Anonymous, RU, Russia, RU, TRUE, FALSE, No, http://creep.im/tor, https://creep.im/tor, rsync://creep.im/tor, ftp://creep.im/mirrors/tor, http://creep.im/tor/dist/, https://creep.im/tor/dist/, rsync://creep.im/tor-dist, , Mon Oct 27 16:18:23 2014 -Tor Fan, torservers, DE, Germany, DE, TRUE, FALSE, No, http://www.torservers.net/mirrors/torproject.org/, https://www.torservers.net/mirrors/torproject.org/, , , http://www.torservers.net/mirrors/torproject.org/dist/, https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Wed Nov 19 12:27:28 2014 -Tor Fan, torland, GB, United Kingdom, GB, TRUE, FALSE, No, http://mirror.torland.me/torproject.org/, https://mirror.torland.me/torproject.org/, , , http://mirror.torland.me/torproject.org/dist/, https://mirror.torland.me/torproject.org/dist/, , , Wed Nov 19 15:13:39 2014 -Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Wed Nov 19 15:13:39 2014 -IceBear, myRL.net, IS, Iceland, IS, TRUE, FALSE, No, http://tor.myrl.net/, https://tor.myrl.net/, , , http://tor.myrl.net/dist/, https://tor.myrl.net/dist/, , , Wed Nov 19 15:13:39 2014 -kiro AT userzap DOT de, Userzap, DE, Germany, DE, TRUE, FALSE, No, http://torprojekt.userzap.de, https://torprojekt.userzap.de, , , http://torprojekt.userzap.de/dist/, https://torprojekt.userzap.de/dist/, , , Wed Nov 19 15:13:39 2014 -tor(a)eprci.net, EPRCI, US, United States, US, TRUE, FALSE, NO, http://tor.eprci.net/, https://www.eprci.com/tor/, , , http://tor.eprci.net/dist/, https://www.eprci.com/tor/dist/, , , Wed Nov 19 15:13:39 2014 -tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Wed Nov 19 15:13:39 2014 -Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Wed Nov 19 15:13:39 2014 -tor(a)stalkr.net, stalkr.net, FR, France, FR, TRUE, TRUE, NO, http://tor.stalkr.net/, https://tor.stalkr.net/, , , http://tor.stalkr.net/dist/, https://tor.stalkr.net/dist/, , , Wed Nov 19 15:13:39 2014 -doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, Germany, DE, TRUE, FALSE, NO, https://tor-mirror.cyberguerrilla.org, , , , https://tor-mirror.cyberguerrilla.org/dist/, , , http://6dvj6v5imhny3anf.onion, Wed Nov 19 12:27:28 2014 -contact(a)gtor.org, Gtor, DE, Germany, DE, TRUE, TRUE, NO, http://torproject.gtor.org/, https://torproject.gtor.org/, rsync://torproject.gtor.org/website-mirror/, , http://torproject.gtor.org/dist/, https://torproject.gtor.org/dist/, rsync://torproject.gtor.org/website-mirror/dist/, , Wed Nov 19 15:13:39 2014 -SDL, SDL, US, United States, US, TRUE, TRUE, NO, http://torproject.nexiom.net, https://torproject.nexiom.net, , , http://torproject.nexiom.net, https://torproject.nexiom.net/dist, , , Wed Nov 19 12:27:28 2014 -Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://mirror.velcommuta.de/tor/, https://mirror.velcommuta.de/tor/, , , http://mirror.velcommuta.de/tor/dist/, https://mirror.velcommuta.de/tor/dist/, , , Wed Nov 19 15:13:39 2014 -EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, , , Wed Nov 19 12:27:28 2014 -Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, , , Wed Nov 19 15:13:39 2014 -Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, http://reichster.de/mirrors/torproject.org/, https://reichster.de/mirrors/torproject.org, , , http://reichster.de/mirrors/torproject.org/dist/, https://reichster.de/mirrors/torproject.org/dist/, , , Wed Nov 19 15:13:39 2014 -jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , Wed Nov 19 15:13:39 2014 -tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, http://tor.miglix.eu, https://tor.miglix.eu, , , http://tor.miglix.eu/dist/, https://tor.miglix.eu/dist/, , , Wed Nov 19 15:13:39 2014 +Tor Fan, chaos darmstadt, DE, Germany, Europe, TRUE, FALSE, No, http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Mon Nov 24 14:22:08 2014 +Tor Fan, Soviet Anonymous, RU, Russia, RU, TRUE, FALSE, No, http://creep.im/tor, https://creep.im/tor, rsync://creep.im/tor, ftp://creep.im/mirrors/tor, http://creep.im/tor/dist/, https://creep.im/tor/dist/, rsync://creep.im/tor-dist, , Mon Nov 24 14:22:08 2014 +Tor Fan, torservers, DE, Germany, DE, TRUE, FALSE, No, http://www.torservers.net/mirrors/torproject.org/, https://www.torservers.net/mirrors/torproject.org/, , , http://www.torservers.net/mirrors/torproject.org/dist/, https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Mon Nov 24 06:38:57 2014 +Tor Fan, torland, GB, United Kingdom, GB, TRUE, FALSE, No, http://mirror.torland.me/torproject.org/, https://mirror.torland.me/torproject.org/, , , http://mirror.torland.me/torproject.org/dist/, https://mirror.torland.me/torproject.org/dist/, , , Mon Nov 24 14:22:08 2014 +Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Mon Nov 24 14:22:08 2014 +IceBear, myRL.net, IS, Iceland, IS, TRUE, FALSE, No, http://tor.myrl.net/, https://tor.myrl.net/, , , http://tor.myrl.net/dist/, https://tor.myrl.net/dist/, , , Mon Nov 24 06:38:57 2014 +kiro AT userzap DOT de, Userzap, DE, Germany, DE, TRUE, FALSE, No, http://torprojekt.userzap.de, https://torprojekt.userzap.de, , , http://torprojekt.userzap.de/dist/, https://torprojekt.userzap.de/dist/, , , Sun Nov 23 21:09:00 2014 +tor(a)eprci.net, EPRCI, US, United States, US, TRUE, FALSE, NO, http://tor.eprci.net/, https://www.eprci.com/tor/, , , http://tor.eprci.net/dist/, https://www.eprci.com/tor/dist/, , , Mon Nov 24 06:38:57 2014 +tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Mon Nov 24 06:38:57 2014 +Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Mon Nov 24 14:22:08 2014 +tor(a)stalkr.net, stalkr.net, FR, France, FR, TRUE, TRUE, NO, http://tor.stalkr.net/, https://tor.stalkr.net/, , , http://tor.stalkr.net/dist/, https://tor.stalkr.net/dist/, , , Mon Nov 24 06:38:57 2014 +doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, Germany, DE, TRUE, FALSE, NO, https://tor-mirror.cyberguerrilla.org, , , , https://tor-mirror.cyberguerrilla.org/dist/, , , http://6dvj6v5imhny3anf.onion, Mon Nov 24 06:38:57 2014 +contact(a)gtor.org, Gtor, DE, Germany, DE, TRUE, TRUE, NO, http://torproject.gtor.org/, https://torproject.gtor.org/, rsync://torproject.gtor.org/website-mirror/, , http://torproject.gtor.org/dist/, https://torproject.gtor.org/dist/, rsync://torproject.gtor.org/website-mirror/dist/, , Mon Nov 24 06:38:57 2014 +SDL, SDL, US, United States, US, TRUE, TRUE, NO, http://torproject.nexiom.net, https://torproject.nexiom.net, , , http://torproject.nexiom.net, https://torproject.nexiom.net/dist, , , Mon Nov 24 06:38:57 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://mirror.velcommuta.de/tor/, https://mirror.velcommuta.de/tor/, , , http://mirror.velcommuta.de/tor/dist/, https://mirror.velcommuta.de/tor/dist/, , , Mon Nov 24 06:38:57 2014 +EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, , , Mon Nov 24 14:22:08 2014 +Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, , , Mon Nov 24 06:38:57 2014 +Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, http://reichster.de/mirrors/torproject.org/, https://reichster.de/mirrors/torproject.org, , , http://reichster.de/mirrors/torproject.org/dist/, https://reichster.de/mirrors/torproject.org/dist/, , , Mon Nov 24 06:38:57 2014 +jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , Mon Nov 24 06:38:57 2014 +tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, http://tor.miglix.eu, https://tor.miglix.eu, , , http://tor.miglix.eu/dist/, https://tor.miglix.eu/dist/, , , Mon Nov 24 06:38:57 2014 tor TA ninurta TOD name, TorNinurtaName, AT, Austria, AT, TRUE, TRUE, no, http://tor.ninurta.name/, , , , http://tor.ninurta.name/dist/, , , , Wed Oct 22 21:02:17 2014 -fr33tux <AT> general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Wed Nov 19 15:13:39 2014 -sebastian(at)bobrecki(dot)pl, Sebastian M. Bobrecki, PL, Poland, Europe, TRUE, FALSE, No, http://tor.iv.net.pl, https://tor.iv.net.pl, , , http://tor.iv.net.pl/dist/, https://tor.iv.net.pl/dist/, , , Wed Nov 19 15:13:39 2014 -tor-mirror AT rdns DOT cc, d0wn.biz, FR, France, Europe, TRUE, FALSE, No, http://tor.static.lu, https://tor.static.lu, , , http://tor.static.lu/dist/, https://tor.static.lu/dist/, , , Wed Nov 19 12:27:28 2014 -tor(a)moparisthebest.com, moparisthebest.com, DE, Germany, Europe, TRUE, TRUE, No, http://www.moparisthebest.com/tor/, https://www.moparisthebest.com/tor/, , , http://www.moparisthebest.com/tor/dist/, https://www.moparisthebest.com/tor/dist/, , , Wed Nov 19 15:13:39 2014 -Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Wed Nov 19 15:13:39 2014 -rorrim AT ayo DOT tl, Tor Supporter, IS, Iceland, Europe, TRUE, TRUE, No, http://ayo.tl/tor/, https://ayo.tl/tor/, , , http://ayo.tl/tor/dist/, https://ayo.tl/tor/dist/, , , Wed Nov 19 15:13:39 2014 -stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , Wed Nov 19 15:13:39 2014 -Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Nov 19 15:13:39 2014 -webmaster[at]hackabit.nl, Hackabit.nl, NL, The Netherlands, Europe, TRUE, FALSE, No, http://hackabit.nl/tor/, https://hackabit.nl/tor/, , , http://hackabit.nl/tor/dist/, https://hackabit.nl/tor/dist/, , , Wed Nov 19 15:13:39 2014 -Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , Wed Nov 19 15:13:39 2014 -Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, http://tor.euve33747.vserver.de/, , , , http://tor.euve33747.vserver.de/dist, , , , Wed Nov 19 15:13:39 2014 -s7r[at]sky-ip[d0t]org, sky-ip.org, NL, Netherlands, NL, TRUE, FALSE, No, http://beautiful-mind.sky-ip.org/, , , , http://beautiful-mind.sky-ip.org/dist/, , , , Wed Nov 19 15:13:39 2014 -tor#pajonzeck#de, ITsn, DE, Germany, Europe, TRUE, FALSE, No, http://tor.pajonzeck.de/, https://tor.pajonzeck.de/, rsync://tor.pajonzeck.de/tor, http://tor.pajonzeck.de/dist/, https://tor.pajonzeck.de/dist/, , rsync://tor.pajonzeck.de/tor/dist, http://zgfgvob256pffy62.onion, Wed Nov 19 15:13:39 2014 -peter AT ludikovsky DOT name, Tor Supporter, AT, Austria, Europe, TRUE, TRUE, No, http://tor.ludikovsky.name/, , , , http://tor.ludikovsky.name/dist, , , http://54lnbzjo6xlr4f4j.onion/, Tue Oct 28 08:37:30 2014 -admin AT nuclear DASH weapons DOT net, Setec Administrator, US, Texas, Austin, TRUE, FALSE, No, http://tor.nuclear-weapons.net, https://tor.nuclear-weapons.net, , , http://tor.nuclear-weapons.net/dist, , https://tor.nuclear-weapons.net/dist, , Wed Nov 19 15:13:39 2014 -0x43DE8191, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://torproject.hactar.bz, , , , http://torproject.hactar.bz/dist/, , , , Wed Nov 19 15:13:39 2014 --nick at calyx dot com, The Calyx Institute, US, United States, North America, TRUE, FALSE, No, http://tor.calyxinstitute.org, https://tor.calyxinstitute.org, , , http://tor.calyxinstitute.org/dist/, https://tor.calyxinstitute.org/dist/, , http://tmdrhl4e4anhsjc5.onion, Wed Nov 19 15:13:39 2014 -opi(a)zeropi.net, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor-mirror.zeropi.net/, , , , http://tor-mirror.zeropi.net/dist/, , , , Wed Nov 19 12:27:28 2014 -noc AT bbln DOT org, BBLN, NL, The Netherlands, Europe, TRUE, TRUE, No, http://mirror-nl1.bbln.org/torproject/, https://mirror-nl1.bbln.org/torproject/, rsync://mirror-nl1.bbln.org/torproject/, ftp://mirror-nl1.bbln.org/torproject/, http://mirror-nl1.bbln.org/torproject/dist/, https://mirror-nl1.bbln.org/torproject/dist/, rsync://mirror-nl1.bbln.org/torproject/dist/, , Wed Nov 19 15:13:39 2014 -noc AT bbln DOT org, BBLN, FR, France, Europe, TRUE, TRUE, No, http://mirror-fr1.bbln.org/torproject/, https://mirror-fr1.bbln.org/torproject/, rsync://mirror-fr1.bbln.org/torproject/, ftp://mirror-fr1.bbln.org/torproject/, http://mirror-fr1.bbln.org/torproject/dist/, https://mirror-fr1.bbln.org/torproject/dist/, rsync://mirror-fr1.bbln.org/torproject/dist/, , Wed Nov 19 15:13:39 2014 -noc AT bbln DOT org, BBLN, FR, France, Europe, TRUE, TRUE, No, http://mirror-fr2.bbln.org/torproject/, https://mirror-fr2.bbln.org/torproject/, rsync://mirror-fr2.bbln.org/torproject/, ftp://mirror-fr2.bbln.org/torproject/, http://mirror-fr2.bbln.org/torproject/dist/, https://mirror-fr2.bbln.org/torproject/dist/, rsync://mirror-fr2.bbln.org/torproject/dist/, , Wed Nov 19 15:13:39 2014 -alexander AT dietrich DOT cx, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://neuland.dietrich.cx/, https://neuland.dietrich.cx/, , , http://neuland.dietrich.cx/dist/, https://neuland.dietrich.cx/dist/, , , Wed Nov 19 12:27:28 2014 -tor(a)0x3d.lu, 0x3d.lu, DE, Germany, Europe, TRUE, FALSE, No, http://tor.0x3d.lu/, https://tor.0x3d.lu/, , , http://tor.0x3d.lu/dist/, https://tor.0x3d.lu/dist/, , , Wed Nov 19 15:13:39 2014 +fr33tux <AT> general-changelog-team.fr, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor.fr33tux.org, https://tor.fr33tux.org, , , http://tor.fr33tux.org/dist/, https://tor.fr33tux.org/dist/, , , Mon Nov 24 06:38:57 2014 +sebastian(at)bobrecki(dot)pl, Sebastian M. Bobrecki, PL, Poland, Europe, TRUE, FALSE, No, http://tor.iv.net.pl, https://tor.iv.net.pl, , , http://tor.iv.net.pl/dist/, https://tor.iv.net.pl/dist/, , , Mon Nov 24 15:12:47 2014 +tor-mirror AT rdns DOT cc, d0wn.biz, FR, France, Europe, TRUE, FALSE, No, http://tor.static.lu, https://tor.static.lu, , , http://tor.static.lu/dist/, https://tor.static.lu/dist/, , , Mon Nov 24 06:38:57 2014 +tor(a)moparisthebest.com, moparisthebest.com, DE, Germany, Europe, TRUE, TRUE, No, http://www.moparisthebest.com/tor/, https://www.moparisthebest.com/tor/, , , http://www.moparisthebest.com/tor/dist/, https://www.moparisthebest.com/tor/dist/, , , Mon Nov 24 14:22:08 2014 +Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Mon Nov 24 14:22:08 2014 +rorrim AT ayo DOT tl, Tor Supporter, IS, Iceland, Europe, TRUE, TRUE, No, http://ayo.tl/tor/, https://ayo.tl/tor/, , , http://ayo.tl/tor/dist/, https://ayo.tl/tor/dist/, , , Mon Nov 24 06:38:57 2014 +stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , Mon Nov 24 06:38:57 2014 +Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Mon Nov 24 06:38:57 2014 +webmaster[at]hackabit.nl, Hackabit.nl, NL, The Netherlands, Europe, TRUE, FALSE, No, http://hackabit.nl/tor/, https://hackabit.nl/tor/, , , http://hackabit.nl/tor/dist/, https://hackabit.nl/tor/dist/, , , Mon Nov 24 06:38:57 2014 +Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , Mon Nov 24 06:38:57 2014 +Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, http://tor.euve33747.vserver.de/, , , , http://tor.euve33747.vserver.de/dist, , , , Mon Nov 24 06:38:57 2014 +s7r[at]sky-ip[d0t]org, sky-ip.org, NL, Netherlands, NL, TRUE, FALSE, No, http://beautiful-mind.sky-ip.org/, , , , http://beautiful-mind.sky-ip.org/dist/, , , , Mon Nov 24 06:38:57 2014 +tor#pajonzeck#de, ITsn, DE, Germany, Europe, TRUE, FALSE, No, http://tor.pajonzeck.de/, https://tor.pajonzeck.de/, rsync://tor.pajonzeck.de/tor, http://tor.pajonzeck.de/dist/, https://tor.pajonzeck.de/dist/, , rsync://tor.pajonzeck.de/tor/dist, http://zgfgvob256pffy62.onion, Mon Nov 24 14:22:08 2014 +peter AT ludikovsky DOT name, Tor Supporter, AT, Austria, Europe, TRUE, TRUE, No, http://tor.ludikovsky.name/, , , , http://tor.ludikovsky.name/dist, , , http://54lnbzjo6xlr4f4j.onion/, Mon Nov 24 06:38:57 2014 +admin AT nuclear DASH weapons DOT net, Setec Administrator, US, Texas, Austin, TRUE, FALSE, No, http://tor.nuclear-weapons.net, https://tor.nuclear-weapons.net, , , http://tor.nuclear-weapons.net/dist, , https://tor.nuclear-weapons.net/dist, , Mon Nov 24 06:38:57 2014 +0x43DE8191, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://torproject.hactar.bz, , , , http://torproject.hactar.bz/dist/, , , , Mon Nov 24 15:12:47 2014 +-nick at calyx dot com, The Calyx Institute, US, United States, North America, TRUE, FALSE, No, http://tor.calyxinstitute.org, https://tor.calyxinstitute.org, , , http://tor.calyxinstitute.org/dist/, https://tor.calyxinstitute.org/dist/, , http://tmdrhl4e4anhsjc5.onion, Mon Nov 24 15:12:47 2014 +opi(a)zeropi.net, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor-mirror.zeropi.net/, , , , http://tor-mirror.zeropi.net/dist/, , , , Mon Nov 24 14:22:08 2014 +noc AT bbln DOT org, BBLN, NL, The Netherlands, Europe, TRUE, TRUE, No, http://mirror-nl1.bbln.org/torproject/, https://mirror-nl1.bbln.org/torproject/, rsync://mirror-nl1.bbln.org/torproject/, ftp://mirror-nl1.bbln.org/torproject/, http://mirror-nl1.bbln.org/torproject/dist/, https://mirror-nl1.bbln.org/torproject/dist/, rsync://mirror-nl1.bbln.org/torproject/dist/, , Mon Nov 24 15:12:47 2014 +noc AT bbln DOT org, BBLN, FR, France, Europe, TRUE, TRUE, No, http://mirror-fr1.bbln.org/torproject/, https://mirror-fr1.bbln.org/torproject/, rsync://mirror-fr1.bbln.org/torproject/, ftp://mirror-fr1.bbln.org/torproject/, http://mirror-fr1.bbln.org/torproject/dist/, https://mirror-fr1.bbln.org/torproject/dist/, rsync://mirror-fr1.bbln.org/torproject/dist/, , Mon Nov 24 06:38:57 2014 +noc AT bbln DOT org, BBLN, FR, France, Europe, TRUE, TRUE, No, http://mirror-fr2.bbln.org/torproject/, https://mirror-fr2.bbln.org/torproject/, rsync://mirror-fr2.bbln.org/torproject/, ftp://mirror-fr2.bbln.org/torproject/, http://mirror-fr2.bbln.org/torproject/dist/, https://mirror-fr2.bbln.org/torproject/dist/, rsync://mirror-fr2.bbln.org/torproject/dist/, , Mon Nov 24 14:22:08 2014 +alexander AT dietrich DOT cx, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://neuland.dietrich.cx/, https://neuland.dietrich.cx/, , , http://neuland.dietrich.cx/dist/, https://neuland.dietrich.cx/dist/, , , Mon Nov 24 14:22:08 2014 +tor(a)0x3d.lu, 0x3d.lu, DE, Germany, Europe, TRUE, FALSE, No, http://tor.0x3d.lu/, https://tor.0x3d.lu/, , , http://tor.0x3d.lu/dist/, https://tor.0x3d.lu/dist/, , , Mon Nov 24 06:38:57 2014 kraai(a)ftbfs.org 0xADCE6065, , SE, Sweden, Europe, TRUE, TRUE, No, http://tor.ftbfs.org/, , , , http://tor.ftbfs.org/dist/, , , , Fri Oct 24 14:28:32 2014 -kontakt(a)unicorncloud.org, UnicornCloud.org, AT, Favoriten, Wien, TRUE, TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Wed Nov 19 15:13:39 2014 -James Murphy, intfxdx.com, US, United States, US, TRUE, TRUE, No, http://108.248.87.242/, https://108.248.87.242/, , , http://108.248.87.242/dist/, https://108.248.87.242/dist/, , , Wed Nov 19 15:13:39 2014 +kontakt(a)unicorncloud.org, UnicornCloud.org, AT, Favoriten, Wien, TRUE, TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Mon Nov 24 06:38:57 2014 +James Murphy, intfxdx.com, US, United States, US, TRUE, TRUE, No, http://108.248.87.242/, https://108.248.87.242/, , , http://108.248.87.242/dist/, https://108.248.87.242/dist/, , , Mon Nov 24 06:38:57 2014 Sam Whited 4096R/54083AE104EA7AD3 <sam(a)samwhited.com>, SamWhited.com, US, GA, United States, TRUE, TRUE, FALSE, http://mirrors.samwhited.net/tor, https://mirrors.samwhited.net/tor, rsync://mirrors.samwhited.net/tor, , http://mirrors.samwhited.net/tor/dist, https://mirrors.samwhited.net/dist, rsync://mirrors.samwhited.net/tor-dist, , Thu Oct 9 19:32:00 2014 -rohit008 AT e DOT ntu DOT edu DOT sg, NTUOSS, SG, Singapore, Asia, TRUE, FALSE, No, http://torproject.ntuoss.com/, , , , http://torproject.ntuoss.com/dist/, , , , Wed Nov 19 15:13:39 2014 -jvictors at jessevictors dot com, Department of CS at USU, US, United States, North America, TRUE, FALSE, No, http://tor-relay.cs.usu.edu/mirrors/torproject.org/, https://www.jessevictors.com/secureMirrors/torproject.org/, , , http://tor-relay.cs.usu.edu/mirrors/torproject.org/dist/, https://www.jessevictors.com/secureMirrors/torproject.org/dist/, , , Tue Nov 18 20:29:10 2014 -justaguy AT riseup DOT net, justaguy, UK, United KIngdom, UK, TRUE, TRUE, No, http://mirrors.justaguy.pw/, , , , http://mirrors.justaguy.pw/dist/, , , , Wed Nov 19 15:13:39 2014 -Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Nov 19 15:13:39 2014 -hostmaster(a)lucidnetworks.net,Lucid Networks,US,United States,US,TRUE,FALSE,No,http://tor.mirrors.lucidnetworks.net,,rsync://tor.m…,, -hostmaster(a)vieth-server.de, mirror-server.de, DE, Germany, DE, TRUE, TRUE, No,http://tor.mirror-server.de/, , , ,http://tor.mirror-server.de/dist/, , , , \ No newline at end of file +rohit008 AT e DOT ntu DOT edu DOT sg, NTUOSS, SG, Singapore, Asia, TRUE, FALSE, No, http://torproject.ntuoss.com/, , , , http://torproject.ntuoss.com/dist/, , , , Mon Nov 24 06:38:57 2014 +jvictors at jessevictors dot com, Department of CS at USU, US, United States, North America, TRUE, FALSE, No, http://tor-relay.cs.usu.edu/mirrors/torproject.org/, https://www.jessevictors.com/secureMirrors/torproject.org/, , , http://tor-relay.cs.usu.edu/mirrors/torproject.org/dist/, https://www.jessevictors.com/secureMirrors/torproject.org/dist/, , , Mon Nov 24 06:38:57 2014 +justaguy AT riseup DOT net, justaguy, UK, United KIngdom, UK, TRUE, TRUE, No, http://mirrors.justaguy.pw/, , , , http://mirrors.justaguy.pw/dist/, , , , Mon Nov 24 06:38:57 2014 +Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Mon Nov 24 06:38:57 2014 +hostmaster(a)lucidnetworks.net, Lucid Networks, US, United States, US, TRUE, FALSE, No, http://tor.mirrors.lucidnetworks.net, , rsync://tor.mirrors.lucidnetworks.net::tor, , http://tor.mirrors.lucidnetworks.net/dist, , rsync://tor.mirrors.lucidnetworks.net::tor-dist, , Sat Nov 22 15:14:24 2014 +hostmaster(a)vieth-server.de, mirror-server.de, DE, Germany, DE, TRUE, TRUE, No, http://tor.mirror-server.de/, , , , http://tor.mirror-server.de/dist/, , , , Mon Nov 24 14:22:08 2014

1 0

[webwml/staging] Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml
by sebastian＠torproject.org 26 Nov '14

26 Nov '14

commit b39fa85f3865c5672d32857aa1b4d20d6de334aa Merge: d32bc78 cdb2483 Author: Andrew Lewman <andrew(a)torproject.is> Date: Mon Nov 24 11:52:19 2014 -0500 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml projects/en/sampleproject.wml | 25 ------------------------- 1 file changed, 25 deletions(-)

1 0

[tor-messenger-build/master] Fix instantbird filename on Windows
by boklm＠torproject.org 26 Nov '14

26 Nov '14

commit 6d39528d393f2bcae3ea8ca2dd4ee27d010e64c5 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Nov 26 18:40:23 2014 +0100 Fix instantbird filename on Windows --- projects/instantbird/build | 2 +- projects/instantbird/config | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/projects/instantbird/build b/projects/instantbird/build index f389db4..5bfa723 100644 --- a/projects/instantbird/build +++ b/projects/instantbird/build @@ -58,4 +58,4 @@ cd ../.. cp ../[% c('input_files_by_name/mozconfig') %] .mozconfig ./mozilla/mach build || ./mozilla/mach build ./mozilla/mach package -mv obj-*/dist/*.tar.bz2 [% dest_dir _ '/' _ c('filename') %] +mv obj-*/dist/*.[% c('var/archive_suffix') %] [% dest_dir _ '/' _ c('filename') %] diff --git a/projects/instantbird/config b/projects/instantbird/config index 6d25676..f49d4f8 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -1,13 +1,14 @@ version: '[% c("abbrev") %]' git_url: https://github.com/mozilla/releases-comm-central git_hash: master -filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].tar.bz2" +filename: "[% project %]-[% c('version') %]-[% c('var/osname') %]-[% c('var/build_id') %].[% c('var/archive_suffix') %]" remote_docker: 1 lsb_release: id: Ubuntu release: 10.04 codename: lucid var: + archive_suffix: tar.bz2 deps: - build-essential - libmpc2 @@ -35,6 +36,7 @@ targets: release: 12.04 codename: precise var: + archive_suffix: zip arch_deps: - yasm linux-x86_64:

1 0

[tor-messenger-build/master] mozconfig-windows-i686: set concurrency according to number of cpu
by boklm＠torproject.org 26 Nov '14

26 Nov '14

commit 0a886cd10610c4b01db129a2dfa1b9288554bc27 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Nov 26 18:44:51 2014 +0100 mozconfig-windows-i686: set concurrency according to number of cpu Same as commit ab4cf5ce68df0 on other mozconfig files. --- projects/instantbird/mozconfig-windows-i686 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/projects/instantbird/mozconfig-windows-i686 b/projects/instantbird/mozconfig-windows-i686 index 11fea5c..4c67a40 100644 --- a/projects/instantbird/mozconfig-windows-i686 +++ b/projects/instantbird/mozconfig-windows-i686 @@ -6,7 +6,8 @@ ac_add_options --target=i686-w64-mingw32 ac_add_options --enable-default-toolkit=cairo-windows ac_add_options --enable-strip -mk_add_options MOZ_MAKE_FLAGS="-j4" +CONCURRENCY=$(( `grep processor /proc/cpuinfo | wc -l` + 2 )) +mk_add_options MOZ_MAKE_FLAGS="-j$CONCURRENCY" ac_add_options --enable-application=im ac_add_options --enable-optimize

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 26 Nov '14

26 Nov '14

commit e8ec02f39444cd9cc66a324172158bb3f601eefe Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 26 15:15:47 2014 +0000 Update translations for torbutton-torbuttondtd --- fr_CA/torbutton.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA/torbutton.dtd b/fr_CA/torbutton.dtd index 1a6d185..ff4ae5a 100644 --- a/fr_CA/torbutton.dtd +++ b/fr_CA/torbutton.dtd @@ -149,9 +149,9 @@ <!ENTITY torbutton.prefs.restrict_thirdparty "Limiter les témoins tiers et les autres données de traçage"> <!ENTITY torbutton.prefs.block_plugins "Désactiver les plugiciels du navigateur (tel que Flash)"> <!ENTITY torbutton.prefs.resist_fingerprinting "Modifier les détails qui vous distingue d'autres utilisateurs du navigateur Tor"> -<!ENTITY torbutton.prefs.sec_caption "Degré de sécurité"> -<!ENTITY torbutton.prefs.sec_low "Bas (option par défaut)"> +<!ENTITY torbutton.prefs.sec_caption "Niveau de sécurité"> +<!ENTITY torbutton.prefs.sec_low "Bas (par défaut)"> <!ENTITY torbutton.prefs.sec_med_low "Moyen-bas"> <!ENTITY torbutton.prefs.sec_med_high "Moyen-haut"> <!ENTITY torbutton.prefs.sec_high "Élevé"> -<!ENTITY torbutton.prefs.sec_custom "Paramétrage manuel"> +<!ENTITY torbutton.prefs.sec_custom "Valeurs personnalisées">

1 0

[torspec/master] Set default value for bw weights if absent from consensus.
by nickm＠torproject.org 26 Nov '14

26 Nov '14

commit b5b771b19df9fc052b424228045409467a7b6414 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Nov 25 00:11:43 2014 +0000 Set default value for bw weights if absent from consensus. --- path-spec.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/path-spec.txt b/path-spec.txt index 9575d25..f3c7c9f 100644 --- a/path-spec.txt +++ b/path-spec.txt @@ -209,7 +209,7 @@ of their choices. position they are being selected for. These weights are published in the consensus, and are computed as described - in Section 3.4.3 of dir-spec.txt. They are: + in Section "Computing Bandwidth Weights" of dir-spec.txt. They are: Wgg - Weight for Guard-flagged nodes in the guard position Wgm - Weight for non-flagged nodes in the guard Position @@ -235,6 +235,10 @@ of their choices. Wbe - Weight for Guard+Exit-flagged nodes for BEGIN_DIR requests Wbd - Weight for Guard+Exit-flagged nodes for BEGIN_DIR requests + If any of those weights is malformed or not present in a consensus, + clients proceed with the regular path selection algorithm setting + the weights to the default value of 10000. + Additionally, we may be building circuits with one or more requests in mind. Each kind of request puts certain constraints on paths:

1 0

[tor/master] Merge remote-tracking branch 'public/bug13126'
by nickm＠torproject.org 26 Nov '14

26 Nov '14

commit 3d2366c676233c30133928940b4bc19d8f25f193 Merge: 3a91a08 415a841 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 26 09:03:30 2014 -0500 Merge remote-tracking branch 'public/bug13126' Conflicts: src/or/or.h changes/bug13126 | 10 +++ src/or/or.h | 2 +- src/or/routerlist.c | 236 +++------------------------------------------------ 3 files changed, 25 insertions(+), 223 deletions(-) diff --cc src/or/or.h index bbb9192,a681def..bff7267 --- a/src/or/or.h +++ b/src/or/or.h @@@ -5001,31 -4998,15 +5001,31 @@@ typedef enum /** Return value for router_add_to_routerlist() and dirserv_add_descriptor() */ typedef enum was_router_added_t { + /* Router was added successfully. */ ROUTER_ADDED_SUCCESSFULLY = 1, + /* Router descriptor was added with warnings to submitter. */ ROUTER_ADDED_NOTIFY_GENERATOR = 0, + /* Extrainfo document was rejected because no corresponding router + * descriptor was found OR router descriptor was rejected because + * it was incompatible with its extrainfo document. */ ROUTER_BAD_EI = -1, - ROUTER_WAS_NOT_NEW = -2, + /* Router descriptor was rejected because it is already known. */ + ROUTER_IS_ALREADY_KNOWN = -2, + /* General purpose router was rejected, because it was not listed + * in consensus. */ ROUTER_NOT_IN_CONSENSUS = -3, + /* Router was neither in directory consensus nor in any of + * networkstatus documents. Caching it to access later. + * (Applies to fetched descriptors only.) */ ROUTER_NOT_IN_CONSENSUS_OR_NETWORKSTATUS = -4, + /* Router was rejected by directory authority. */ ROUTER_AUTHDIR_REJECTS = -5, + /* Bridge descriptor was rejected because such bridge was not one + * of the bridges we have listed in our configuration. */ ROUTER_WAS_NOT_WANTED = -6, + /* Router descriptor was rejected because it was older than + * OLD_ROUTER_DESC_MAX_AGE. */ - ROUTER_WAS_TOO_OLD = -7, + ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'NOT_NEW' */ } was_router_added_t; /********************************* routerparse.c ************************/

1 0

[tor/master] Remove smartlist_choose_node_by_bandwidth()
by nickm＠torproject.org 26 Nov '14

26 Nov '14

commit 415a841378db2489c525ea0c55b169bd2894e992 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 3 13:30:19 2014 -0500 Remove smartlist_choose_node_by_bandwidth() We were only using it when smartlist_choose_node_by_bandwidth_weights failed. But that function could only fail in the presence of buggy/ancient authorities or in the absence of a consensus. Either way, it's better to use sensible defaults and a nicer algorithm. --- changes/bug13126 | 10 +++ src/or/or.h | 2 +- src/or/routerlist.c | 236 +++------------------------------------------------ 3 files changed, 25 insertions(+), 223 deletions(-) diff --git a/changes/bug13126 b/changes/bug13126 new file mode 100644 index 0000000..45d22ee --- /dev/null +++ b/changes/bug13126 @@ -0,0 +1,10 @@ + o Code simplification and refactoring: + + - Remove our old, non-weighted bandwidth-based node selection code. + Previously, we used it as a fallback when we couldn't perform + weighted bandwidth-based node selection. But that would only + happen in the cases where we had no consensus, or when we had a + consensus generated by buggy or ancient directory authorities. In + either case, it's better to use the more modern, better maintained + algorithm, with reasonable defaults for the weights. Closes + ticket 13126. \ No newline at end of file diff --git a/src/or/or.h b/src/or/or.h index 6170c21..a681def 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -5006,7 +5006,7 @@ typedef enum was_router_added_t { ROUTER_NOT_IN_CONSENSUS_OR_NETWORKSTATUS = -4, ROUTER_AUTHDIR_REJECTS = -5, ROUTER_WAS_NOT_WANTED = -6, - ROUTER_WAS_TOO_OLD = -7, + ROUTER_WAS_TOO_OLD = -7, /* note contrast with 'NOT_NEW' */ } was_router_added_t; /********************************* routerparse.c ************************/ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index d81dae4..46010ea 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2030,9 +2030,10 @@ compute_weighted_bandwidths(const smartlist_t *sl, if (Wg < 0 || Wm < 0 || We < 0 || Wd < 0 || Wgb < 0 || Wmb < 0 || Wdb < 0 || Web < 0) { log_debug(LD_CIRC, - "Got negative bandwidth weights. Defaulting to old selection" + "Got negative bandwidth weights. Defaulting to naive selection" " algorithm."); - return -1; // Use old algorithm. + Wg = Wm = We = Wd = weight_scale; + Wgb = Wmb = Web = Wdb = weight_scale; } Wg /= weight_scale; @@ -2048,6 +2049,7 @@ compute_weighted_bandwidths(const smartlist_t *sl, bandwidths = tor_calloc(smartlist_len(sl), sizeof(u64_dbl_t)); // Cycle through smartlist and total the bandwidth. + static int warned_missing_bw = 0; SMARTLIST_FOREACH_BEGIN(sl, const node_t *, node) { int is_exit = 0, is_guard = 0, is_dir = 0, this_bw = 0; double weight = 1; @@ -2056,15 +2058,18 @@ compute_weighted_bandwidths(const smartlist_t *sl, is_dir = node_is_dir(node); if (node->rs) { if (!node->rs->has_bandwidth) { - tor_free(bandwidths); /* This should never happen, unless all the authorites downgrade * to 0.2.0 or rogue routerstatuses get inserted into our consensus. */ - log_warn(LD_BUG, - "Consensus is not listing bandwidths. Defaulting back to " - "old router selection algorithm."); - return -1; + if (! warned_missing_bw) { + log_warn(LD_BUG, + "Consensus is missing some bandwidths. Using a naive " + "router selection algorithm"); + warned_missing_bw = 1; + } + this_bw = 30000; /* Chosen arbitrarily */ + } else { + this_bw = kb_to_bytes(node->rs->bandwidth_kb); } - this_bw = kb_to_bytes(node->rs->bandwidth_kb); } else if (node->ri) { /* bridge or other descriptor not in our consensus */ this_bw = bridge_get_advertised_bandwidth_bounded(node->ri); @@ -2141,226 +2146,13 @@ frac_nodes_with_descriptors(const smartlist_t *sl, return present / total; } -/** Helper function: - * choose a random node_t element of smartlist <b>sl</b>, weighted by - * the advertised bandwidth of each element. - * - * If <b>rule</b>==WEIGHT_FOR_EXIT. we're picking an exit node: consider all - * nodes' bandwidth equally regardless of their Exit status, since there may - * be some in the list because they exit to obscure ports. If - * <b>rule</b>==NO_WEIGHTING, we're picking a non-exit node: weight - * exit-node's bandwidth less depending on the smallness of the fraction of - * Exit-to-total bandwidth. If <b>rule</b>==WEIGHT_FOR_GUARD, we're picking a - * guard node: consider all guard's bandwidth equally. Otherwise, weight - * guards proportionally less. - */ -static const node_t * -smartlist_choose_node_by_bandwidth(const smartlist_t *sl, - bandwidth_weight_rule_t rule) -{ - unsigned int i; - u64_dbl_t *bandwidths; - int is_exit; - int is_guard; - int is_fast; - double total_nonexit_bw = 0, total_exit_bw = 0; - double total_nonguard_bw = 0, total_guard_bw = 0; - double exit_weight; - double guard_weight; - int n_unknown = 0; - bitarray_t *fast_bits; - bitarray_t *exit_bits; - bitarray_t *guard_bits; - - // This function does not support WEIGHT_FOR_DIR - // or WEIGHT_FOR_MID - if (rule == WEIGHT_FOR_DIR || rule == WEIGHT_FOR_MID) { - rule = NO_WEIGHTING; - } - - /* Can't choose exit and guard at same time */ - tor_assert(rule == NO_WEIGHTING || - rule == WEIGHT_FOR_EXIT || - rule == WEIGHT_FOR_GUARD); - - if (smartlist_len(sl) == 0) { - log_info(LD_CIRC, - "Empty routerlist passed in to old node selection for rule %s", - bandwidth_weight_rule_to_string(rule)); - return NULL; - } - - /* First count the total bandwidth weight, and make a list - * of each value. We use UINT64_MAX to indicate "unknown". */ - bandwidths = tor_calloc(smartlist_len(sl), sizeof(u64_dbl_t)); - fast_bits = bitarray_init_zero(smartlist_len(sl)); - exit_bits = bitarray_init_zero(smartlist_len(sl)); - guard_bits = bitarray_init_zero(smartlist_len(sl)); - - /* Iterate over all the routerinfo_t or routerstatus_t, and */ - SMARTLIST_FOREACH_BEGIN(sl, const node_t *, node) { - /* first, learn what bandwidth we think i has */ - int is_known = 1; - uint32_t this_bw = 0; - i = node_sl_idx; - - is_exit = node_is_good_exit(node); - is_guard = node->is_possible_guard; - if (node->rs) { - if (node->rs->has_bandwidth) { - this_bw = kb_to_bytes(node->rs->bandwidth_kb); - } else { /* guess */ - is_known = 0; - } - } else if (node->ri) { - /* Must be a bridge if we're willing to use it */ - this_bw = bridge_get_advertised_bandwidth_bounded(node->ri); - } - - if (is_exit) - bitarray_set(exit_bits, i); - if (is_guard) - bitarray_set(guard_bits, i); - if (node->is_fast) - bitarray_set(fast_bits, i); - - if (is_known) { - bandwidths[i].dbl = this_bw; - if (is_guard) - total_guard_bw += this_bw; - else - total_nonguard_bw += this_bw; - if (is_exit) - total_exit_bw += this_bw; - else - total_nonexit_bw += this_bw; - } else { - ++n_unknown; - bandwidths[i].dbl = -1.0; - } - } SMARTLIST_FOREACH_END(node); - -#define EPSILON .1 - - /* Now, fill in the unknown values. */ - if (n_unknown) { - int32_t avg_fast, avg_slow; - if (total_exit_bw+total_nonexit_bw < EPSILON) { - /* if there's some bandwidth, there's at least one known router, - * so no worries about div by 0 here */ - int n_known = smartlist_len(sl)-n_unknown; - avg_fast = avg_slow = (int32_t) - ((total_exit_bw+total_nonexit_bw)/((uint64_t) n_known)); - } else { - avg_fast = 40000; - avg_slow = 20000; - } - for (i=0; i<(unsigned)smartlist_len(sl); ++i) { - if (bandwidths[i].dbl >= 0.0) - continue; - is_fast = bitarray_is_set(fast_bits, i); - is_exit = bitarray_is_set(exit_bits, i); - is_guard = bitarray_is_set(guard_bits, i); - bandwidths[i].dbl = is_fast ? avg_fast : avg_slow; - if (is_exit) - total_exit_bw += bandwidths[i].dbl; - else - total_nonexit_bw += bandwidths[i].dbl; - if (is_guard) - total_guard_bw += bandwidths[i].dbl; - else - total_nonguard_bw += bandwidths[i].dbl; - } - } - - /* If there's no bandwidth at all, pick at random. */ - if (total_exit_bw+total_nonexit_bw < EPSILON) { - tor_free(bandwidths); - tor_free(fast_bits); - tor_free(exit_bits); - tor_free(guard_bits); - return smartlist_choose(sl); - } - - /* Figure out how to weight exits and guards */ - { - double all_bw = U64_TO_DBL(total_exit_bw+total_nonexit_bw); - double exit_bw = U64_TO_DBL(total_exit_bw); - double guard_bw = U64_TO_DBL(total_guard_bw); - /* - * For detailed derivation of this formula, see - * http://archives.seul.org/or/dev/Jul-2007/msg00056.html - */ - if (rule == WEIGHT_FOR_EXIT || total_exit_bw<EPSILON) - exit_weight = 1.0; - else - exit_weight = 1.0 - all_bw/(3.0*exit_bw); - - if (rule == WEIGHT_FOR_GUARD || total_guard_bw<EPSILON) - guard_weight = 1.0; - else - guard_weight = 1.0 - all_bw/(3.0*guard_bw); - - if (exit_weight <= 0.0) - exit_weight = 0.0; - - if (guard_weight <= 0.0) - guard_weight = 0.0; - - for (i=0; i < (unsigned)smartlist_len(sl); i++) { - tor_assert(bandwidths[i].dbl >= 0.0); - - is_exit = bitarray_is_set(exit_bits, i); - is_guard = bitarray_is_set(guard_bits, i); - if (is_exit && is_guard) - bandwidths[i].dbl *= exit_weight * guard_weight; - else if (is_guard) - bandwidths[i].dbl *= guard_weight; - else if (is_exit) - bandwidths[i].dbl *= exit_weight; - } - } - -#if 0 - log_debug(LD_CIRC, "Total weighted bw = "U64_FORMAT - ", exit bw = "U64_FORMAT - ", nonexit bw = "U64_FORMAT", exit weight = %f " - "(for exit == %d)" - ", guard bw = "U64_FORMAT - ", nonguard bw = "U64_FORMAT", guard weight = %f " - "(for guard == %d)", - U64_PRINTF_ARG(total_bw), - U64_PRINTF_ARG(total_exit_bw), U64_PRINTF_ARG(total_nonexit_bw), - exit_weight, (int)(rule == WEIGHT_FOR_EXIT), - U64_PRINTF_ARG(total_guard_bw), U64_PRINTF_ARG(total_nonguard_bw), - guard_weight, (int)(rule == WEIGHT_FOR_GUARD)); -#endif - - scale_array_elements_to_u64(bandwidths, smartlist_len(sl), NULL); - - { - int idx = choose_array_element_by_weight(bandwidths, - smartlist_len(sl)); - tor_free(bandwidths); - tor_free(fast_bits); - tor_free(exit_bits); - tor_free(guard_bits); - return idx < 0 ? NULL : smartlist_get(sl, idx); - } -} - /** Choose a random element of status list <b>sl</b>, weighted by * the advertised bandwidth of each node */ const node_t * node_sl_choose_by_bandwidth(const smartlist_t *sl, bandwidth_weight_rule_t rule) { /*XXXX MOVE */ - const node_t *ret; - if ((ret = smartlist_choose_node_by_bandwidth_weights(sl, rule))) { - return ret; - } else { - return smartlist_choose_node_by_bandwidth(sl, rule); - } + return smartlist_choose_node_by_bandwidth_weights(sl, rule); } /** Return a random running node from the nodelist. Never

1 0