tor-commits
Threads by month
- ----- 2025 -----
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
January 2015
- 20 participants
- 934 discussions

[chutney/master] Document the environment variables CHUTNEY_TOR and CHUTNEY_TOR_GENCERT.
by nickm@torproject.org 23 Jan '15
by nickm@torproject.org 23 Jan '15
23 Jan '15
commit 000adfdf8bb47aa2542ffca44fc0e4d048891488
Author: cypherpunks <cypherpunks(a)torproject.org>
Date: Fri Jan 23 11:12:55 2015 +0100
Document the environment variables CHUTNEY_TOR and CHUTNEY_TOR_GENCERT.
---
README | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/README b/README
index 192438a..a8b5660 100644
--- a/README
+++ b/README
@@ -3,15 +3,17 @@ This is chutney. It doesn't do much so far. It isn't ready for prime-time.
If it breaks, you get to keep all the pieces.
It is supposed to be a good tool for:
- - Configuring a testing tor network
- - Launching and monitoring a testing tor network
- - Running tests on a testing tor network
+ - Configuring a testing tor network
+ - Launching and monitoring a testing tor network
+ - Running tests on a testing tor network
Right now it only sorta does the first two.
You will need, at the moment:
- Tor installed somewhere in your path.
- Python 2.7 or later
+ - Tor installed somewhere in your path or the location of the 'tor' and
+ 'tor-gencert' binaries specified through the environment variables
+ CHUTNEY_TOR and CHUTNEY_TOR_GENCERT, respectively.
+ - Python 2.7 or later
Stuff to try:
./chutney configure networks/basic
@@ -27,5 +29,3 @@ The configuration files:
The working files:
chutney sticks its working files, including all data directories, log
files, etc, in ./net/. Each tor instance gets a subdirectory of net/nodes.
-
-
1
0
commit 2bf9d096bb45a4e6c69f1cbdc3d2565f54a44efc
Author: George Kadianakis <desnacked(a)riseup.net>
Date: Fri Jan 23 02:20:36 2015 +0000
Fix a mistake in the obfs2 spec.
---
ChangeLog | 5 +++++
doc/obfs2/obfs2-protocol-spec.txt | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index a919976..f94c5a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Changes in version 0.2.14 - UNRELEASED:
+ - Correct a mistake in the obfs2 spec. Found by David Fifield.
+ Fixes bug #14329.
+
+
Changes in version 0.2.13 - 2014-12-31:
- Correctly handle the ScrambleSuit password being missing entirely
when running in managed mode. Patch by Yawning Angel. Fixes #13587.
diff --git a/doc/obfs2/obfs2-protocol-spec.txt b/doc/obfs2/obfs2-protocol-spec.txt
index c0b0578..f6dc3de 100644
--- a/doc/obfs2/obfs2-protocol-spec.txt
+++ b/doc/obfs2/obfs2-protocol-spec.txt
@@ -57,7 +57,7 @@
And the responder generates:
RESP_SEED = SR(SEED_LENGTH)
- RESP_PAD_KEY = MAC("Responder obfuscation padding", INIT_SEED)[:KEYLEN]
+ RESP_PAD_KEY = MAC("Responder obfuscation padding", RESP_SEED)[:KEYLEN]
Each then generates a random number PADLEN in range from 0 through
MAX_PADDING (inclusive).
1
0

23 Jan '15
commit 01a5d50179af4adf28195ce6a926c735eede6b06
Author: George Kadianakis <desnacked(a)riseup.net>
Date: Wed Dec 31 17:34:31 2014 +0200
Do the release ritual for obfsproxy-0.2.13.
---
ChangeLog | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 315c5f8..a919976 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.2.13 - UNRELEASED:
+Changes in version 0.2.13 - 2014-12-31:
- Correctly handle the ScrambleSuit password being missing entirely
when running in managed mode. Patch by Yawning Angel. Fixes #13587.
- Make ScrambleSuit servers cache the HMAC of their own UniformDH messages.
1
0

22 Jan '15
commit 0843a7a0efc0afdab72943bd057473400b9765cd
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Mon Jan 19 23:14:45 2015 +0000
Add icons to links in base.html footer.
---
lib/bridgedb/templates/base.html | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
diff --git a/lib/bridgedb/templates/base.html b/lib/bridgedb/templates/base.html
index 05d6285..69a4a80 100644
--- a/lib/bridgedb/templates/base.html
+++ b/lib/bridgedb/templates/base.html
@@ -87,19 +87,23 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)}
<hr>
<div class="footer">
- <p>© The Tor Project</p>
<p>
- <a href="https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…">${_("Report a Bug")}</a>
- ·
- <a href="https://gitweb.torproject.org/bridgedb.git">${_("Source Code")}</a>
- ·
+ <a href="https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…">
+ <i class="icon icon-large icon-bug"> ${_("Report a Bug")}</i></a>
+ ·
+ <a href="https://gitweb.torproject.org/bridgedb.git">
+ <i class="icon icon-large icon-code"> ${_("Source Code")}</i></a>
+ ·
<a href="https://gitweb.torproject.org/bridgedb.git/blob/HEAD:/CHANGELOG">
- ${_("Changelog")}</a>
- ·
- <a href="mailto:help@rt.torproject.org">${_("Contact")}</a>
- ·
- <a href="../keys">${_("Public Keys")}</a>
+ <i class="icon icon-large icon-rocket"> ${_("Changelog")}</i></a>
+ ·
+ <a href="mailto:help@rt.torproject.org">
+ <i class="icon icon-large icon-envelope"> ${_("Contact")}</i></a>
+ ·
+ <a href="../keys"><i class="icon icon-large icon-key"> ${_("Public Keys")}</i></a>
</p>
+ <br />
+ <p>© The Tor Project</p>
</div>
</div> <!-- /container -->
1
0

[bridgedb/develop] Merge branch 'hotfix/0.2.3-html-footer-icons' into develop
by isis@torproject.org 22 Jan '15
by isis@torproject.org 22 Jan '15
22 Jan '15
commit f58f9f82a75cc471d3116116cf93961594b94c85
Merge: b2ef934 0843a7a
Author: Isis Lovecruft <isis(a)torproject.org>
Date: Mon Jan 19 23:41:29 2015 +0000
Merge branch 'hotfix/0.2.3-html-footer-icons' into develop
lib/bridgedb/templates/base.html | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)
1
0
commit 4a6b43bf76a993b0167f28f875cd4cf922daba71
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Jan 22 14:22:39 2015 -0500
fix some warnings in compat_threads.c
---
src/common/compat_threads.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c
index ba21c95..d2d929e 100644
--- a/src/common/compat_threads.c
+++ b/src/common/compat_threads.c
@@ -94,7 +94,7 @@ write_ni(int fd, const void *buf, size_t n)
{
int r;
again:
- r = write(fd, buf, n);
+ r = (int) write(fd, buf, n);
if (r < 0 && errno == EINTR)
goto again;
return r;
@@ -104,7 +104,7 @@ read_ni(int fd, void *buf, size_t n)
{
int r;
again:
- r = read(fd, buf, n);
+ r = (int) read(fd, buf, n);
if (r < 0 && errno == EINTR)
goto again;
return r;
@@ -117,7 +117,7 @@ send_ni(int fd, const void *buf, size_t n, int flags)
{
int r;
again:
- r = send(fd, buf, n, flags);
+ r = (int) send(fd, buf, n, flags);
if (r < 0 && errno == EINTR)
goto again;
return r;
@@ -128,7 +128,7 @@ recv_ni(int fd, void *buf, size_t n, int flags)
{
int r;
again:
- r = recv(fd, buf, n, flags);
+ r = (int) recv(fd, buf, n, flags);
if (r < 0 && errno == EINTR)
goto again;
return r;
@@ -160,7 +160,7 @@ eventfd_drain(int fd)
static int
pipe_alert(int fd)
{
- ssize_t r = write(fd, "x", 1);
+ ssize_t r = write_ni(fd, "x", 1);
if (r < 0 && errno != EAGAIN)
return -1;
return 0;
@@ -171,7 +171,7 @@ pipe_drain(int fd)
{
char buf[32];
ssize_t r;
- while ((r = read(fd, buf, sizeof(buf))) >= 0)
+ while ((r = read_ni(fd, buf, sizeof(buf))) >= 0)
;
if (r == 0 || errno != EAGAIN)
return -1;
1
0

[tor/master] Move a redundant _GNU_SOURCE to where it is not redundant
by nickm@torproject.org 22 Jan '15
by nickm@torproject.org 22 Jan '15
22 Jan '15
commit 1fb9979eb8b4db7a32d311a9a7323a681b68ee14
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Jan 22 14:18:10 2015 -0500
Move a redundant _GNU_SOURCE to where it is not redundant
---
src/common/compat_pthreads.c | 2 ++
src/common/compat_threads.c | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/common/compat_pthreads.c b/src/common/compat_pthreads.c
index e1d4b0e..f4a6cad 100644
--- a/src/common/compat_pthreads.c
+++ b/src/common/compat_pthreads.c
@@ -3,6 +3,8 @@
* Copyright (c) 2007-2015, The Tor Project, Inc. */
/* See LICENSE for licensing information */
+#define _GNU_SOURCE
+
#include "orconfig.h"
#include <pthread.h>
#include <signal.h>
diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c
index 3b79292..ba21c95 100644
--- a/src/common/compat_threads.c
+++ b/src/common/compat_threads.c
@@ -6,7 +6,6 @@
#define _GNU_SOURCE
#include "orconfig.h"
-#define _GNU_SOURCE
#include <stdlib.h>
#include "compat.h"
#include "compat_threads.h"
1
0

22 Jan '15
commit 8ec8ab5802a1d8b7169fd0591cd2ad694787e301
Author: Andrew Lewman <andrew(a)torproject.is>
Date: Thu Jan 22 09:48:00 2015 -0500
update mirror tables with current status
---
include/mirrors-table.wmi | 524 ++++++++++++++++++++++++---------------------
include/tor-mirrors.csv | 160 +++++++-------
2 files changed, 359 insertions(+), 325 deletions(-)
diff --git a/include/mirrors-table.wmi b/include/mirrors-table.wmi
index 67428a0..551927d 100644
--- a/include/mirrors-table.wmi
+++ b/include/mirrors-table.wmi
@@ -1,32 +1,15 @@
<tr>
- <td>ES</td>
-
- <td>Tor Supporter</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://tor.zilog.es/dist/">http</a></td>
- <td><a href="http://tor.zilog.es/">http</a></td>
- <td><a href="https://tor.zilog.es/dist/">https</a></td>
- <td><a href="https://tor.zilog.es/">https</a></td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
- <td>INT</td>
+ <td>IS</td>
- <td>CoralCDN</td>
+ <td>torproject.is</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td>
- <td><a href="http://www.torproject.org.nyud.net/">http</a></td>
+ <td><a href="http://www.torproject.is/dist/">http</a></td>
+ <td><a href="http://www.torproject.is/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -52,52 +35,52 @@
<tr>
- <td>FR</td>
+ <td>IS</td>
- <td>stalkr.net</td>
+ <td>TheOnionRouter</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="http://www.theonionrouter.com/dist/">http</a></td>
+ <td><a href="http://www.theonionrouter.com/">http</a></td>
+ <td> - </td>
+ <td> - </td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>US</td>
+ <td>GR</td>
- <td>Evil Routers</td>
+ <td>Tor Supporter</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor1.evilrouters.net/dist/">http</a></td>
- <td><a href="http://tor1.evilrouters.net/">http</a></td>
- <td> - </td>
- <td> - </td>
+ <td><a href="https://tor.void.gr/dist/">http</a></td>
+ <td><a href="https://tor.void.gr">http</a></td>
+ <td><a href="https://tor.void.gr/dist/">https</a></td>
+ <td><a href="https://tor.void.gr">https</a></td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>US</td>
+ <td>PL</td>
- <td>Setec Administrator</td>
+ <td>Sebastian M. Bobrecki</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><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><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>
@@ -137,34 +120,17 @@
<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>SG</td>
- <td>0x3d.lu</td>
+ <td>NTUOSS</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.0x3d.lu/dist/">http</a></td>
- <td><a href="http://tor.0x3d.lu/">http</a></td>
- <td><a href="https://tor.0x3d.lu/dist/">https</a></td>
- <td><a href="https://tor.0x3d.lu/">https</a></td>
+ <td><a href="http://torproject.ntuoss.com/dist/">http</a></td>
+ <td><a href="http://torproject.ntuoss.com/">http</a></td>
+ <td> - </td>
+ <td> - </td>
<td> - </td>
<td> - </td>
</tr>
@@ -239,6 +205,23 @@
<tr>
+ <td>ES</td>
+
+ <td>Tor Supporter</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://tor.zilog.es/dist/">http</a></td>
+ <td><a href="http://tor.zilog.es/">http</a></td>
+ <td><a href="https://tor.zilog.es/dist/">https</a></td>
+ <td><a href="https://tor.zilog.es/">https</a></td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
<td>US</td>
<td>Tor Supporter</td>
@@ -273,15 +256,15 @@
<tr>
- <td>IS</td>
+ <td>AT</td>
- <td>torproject.is</td>
+ <td>Tor Supporter</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><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>
@@ -290,17 +273,17 @@
<tr>
- <td>AT</td>
+ <td>MX</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><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>
@@ -341,15 +324,15 @@
<tr>
- <td>AT</td>
+ <td>AU</td>
- <td>cyberarmy</td>
+ <td>CoffsWiFi</td>
<td>Up to date</td>
<td> - </td>
- <td> - </td>
- <td><a href="http://tor.cyberarmy.at/">http</a></td>
+ <td><a href="http://torproject.coffswifi.net/dist">http</a></td>
+ <td><a href="http://torproject.coffswifi.net">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -358,15 +341,15 @@
<tr>
- <td>IS</td>
+ <td>AT</td>
- <td>TheOnionRouter</td>
+ <td>cyberarmy</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://www.theonionrouter.com/dist/">http</a></td>
- <td><a href="http://www.theonionrouter.com/">http</a></td>
+ <td> - </td>
+ <td><a href="http://tor.cyberarmy.at/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -394,49 +377,49 @@
<td>DE</td>
- <td>PW</td>
+ <td>torservers</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://www.torservers.net/mirrors/torproject.org/dist/">http</a></td>
+ <td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td>
+ <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td>
+ <td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>US</td>
+ <td>IS</td>
- <td>EFF</td>
+ <td>myRL.net</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><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>GR</td>
+ <td>US</td>
- <td>Tor Supporter</td>
+ <td>EPRCI</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="https://tor.void.gr/dist/">http</a></td>
- <td><a href="https://tor.void.gr">http</a></td>
- <td><a href="https://tor.void.gr/dist/">https</a></td>
- <td><a href="https://tor.void.gr">https</a></td>
+ <td><a href="http://tor.eprci.net/dist/">http</a></td>
+ <td><a href="http://tor.eprci.net/">http</a></td>
+ <td><a href="https://www.eprci.com/tor/dist/">https</a></td>
+ <td><a href="https://www.eprci.com/tor/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
@@ -445,15 +428,15 @@
<td>DE</td>
- <td>Tor Supporter</td>
+ <td>PW</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://reichster.de/mirrors/torproject.org/dist/">http</a></td>
- <td><a href="http://reichster.de/mirrors/torproject.org/">http</a></td>
- <td><a href="https://reichster.de/mirrors/torproject.org/dist/">https</a></td>
- <td><a href="https://reichster.de/mirrors/torproject.org">https</a></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>
@@ -462,149 +445,149 @@
<td>FR</td>
- <td>Tor Supporter</td>
+ <td>stalkr.net</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.fr33tux.org/dist/">http</a></td>
- <td><a href="http://tor.fr33tux.org">http</a></td>
- <td><a href="https://tor.fr33tux.org/dist/">https</a></td>
- <td><a href="https://tor.fr33tux.org">https</a></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>PL</td>
+ <td>DE</td>
- <td>Sebastian M. Bobrecki</td>
+ <td>cYbergueRrilLa AnonyMous NeXus</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><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>
<tr>
- <td>IS</td>
+ <td>DE</td>
- <td>Tor Supporter</td>
+ <td>Gtor</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://ayo.tl/tor/dist/">http</a></td>
- <td><a href="http://ayo.tl/tor/">http</a></td>
- <td><a href="https://ayo.tl/tor/dist/">https</a></td>
- <td><a href="https://ayo.tl/tor/">https</a></td>
- <td> - </td>
- <td> - </td>
+ <td><a href="http://torproject.gtor.org/dist/">http</a></td>
+ <td><a href="http://torproject.gtor.org/">http</a></td>
+ <td><a href="https://torproject.gtor.org/dist/">https</a></td>
+ <td><a href="https://torproject.gtor.org/">https</a></td>
+ <td><a href="rsync://torproject.gtor.org/website-mirror/dist/">rsync</a></td>
+ <td><a href="rsync://torproject.gtor.org/website-mirror/">rsync</a></td>
</tr>
<tr>
- <td>NL</td>
+ <td>US</td>
- <td>Hackabit.nl</td>
+ <td>EFF</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://hackabit.nl/tor/dist/">http</a></td>
- <td><a href="http://hackabit.nl/tor/">http</a></td>
- <td><a href="https://hackabit.nl/tor/dist/">https</a></td>
- <td><a href="https://hackabit.nl/tor/">https</a></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>DE</td>
- <td>BBLN</td>
+ <td>Tor Supporter</td>
<td>Up to date</td>
- <td><a href="ftp://mirror-fr1.bbln.org/torproject/">ftp</a></td>
- <td><a href="http://mirror-fr1.bbln.org/torproject/dist/">http</a></td>
- <td><a href="http://mirror-fr1.bbln.org/torproject/">http</a></td>
- <td><a href="https://mirror-fr1.bbln.org/torproject/dist/">https</a></td>
- <td><a href="https://mirror-fr1.bbln.org/torproject/">https</a></td>
- <td><a href="rsync://mirror-fr1.bbln.org/torproject/dist/">rsync</a></td>
- <td><a href="rsync://mirror-fr1.bbln.org/torproject/">rsync</a></td>
+ <td> - </td>
+ <td><a href="http://reichster.de/mirrors/torproject.org/dist/">http</a></td>
+ <td><a href="http://reichster.de/mirrors/torproject.org/">http</a></td>
+ <td><a href="https://reichster.de/mirrors/torproject.org/dist/">https</a></td>
+ <td><a href="https://reichster.de/mirrors/torproject.org">https</a></td>
+ <td> - </td>
+ <td> - </td>
</tr>
<tr>
- <td>DE</td>
+ <td>US</td>
- <td>Tor Supporter</td>
+ <td>Evil Routers</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><a href="http://tor1.evilrouters.net/dist/">http</a></td>
+ <td><a href="http://tor1.evilrouters.net/">http</a></td>
+ <td> - </td>
+ <td> - </td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>AT</td>
+ <td>FR</td>
- <td>UnicornCloud.org</td>
+ <td>Tor Supporter</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://www.unicorncloud.org/public/torproject.org/dist">http</a></td>
- <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td>
- <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td>
- <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td>
+ <td><a href="http://tor.fr33tux.org/dist/">http</a></td>
+ <td><a href="http://tor.fr33tux.org">http</a></td>
+ <td><a href="https://tor.fr33tux.org/dist/">https</a></td>
+ <td><a href="https://tor.fr33tux.org">https</a></td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>US</td>
+ <td>IS</td>
- <td>SamWhited.com</td>
+ <td>Tor Supporter</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://mirrors.samwhited.net/tor/dist">http</a></td>
- <td><a href="http://mirrors.samwhited.net/tor">http</a></td>
- <td><a href="https://mirrors.samwhited.net/tor/dist">https</a></td>
- <td><a href="https://mirrors.samwhited.net/tor">https</a></td>
- <td><a href="rsync://mirrors.samwhited.net/tor-dist">rsync</a></td>
- <td><a href="rsync://mirrors.samwhited.net/tor">rsync</a></td>
+ <td><a href="http://ayo.tl/tor/dist/">http</a></td>
+ <td><a href="http://ayo.tl/tor/">http</a></td>
+ <td><a href="https://ayo.tl/tor/dist/">https</a></td>
+ <td><a href="https://ayo.tl/tor/">https</a></td>
+ <td> - </td>
+ <td> - </td>
</tr>
<tr>
- <td>SG</td>
+ <td>DE</td>
- <td>NTUOSS</td>
+ <td>Tor Supporter</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://torproject.ntuoss.com/dist/">http</a></td>
- <td><a href="http://torproject.ntuoss.com/">http</a></td>
+ <td><a href="http://tor.euve33747.vserver.de/dist">http</a></td>
+ <td><a href="http://tor.euve33747.vserver.de/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -613,32 +596,32 @@
<tr>
- <td>US</td>
+ <td>NL</td>
- <td>Department of CS at USU</td>
+ <td>sky-ip.org</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://beautiful-mind.sky-ip.org/dist/">http</a></td>
+ <td><a href="http://beautiful-mind.sky-ip.org/">http</a></td>
+ <td> - </td>
+ <td> - </td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>DE</td>
+ <td>AT</td>
- <td>mirror-server.de</td>
+ <td>Tor Supporter</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><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>
@@ -647,85 +630,119 @@
<tr>
- <td>AR</td>
+ <td>US</td>
- <td>Xfree.com.ar</td>
+ <td>Setec Administrator</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.xfree.com.ar/dist/">http</a></td>
- <td><a href="http://tor.xfree.com.ar/">http</a></td>
- <td> - </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>MX</td>
+ <td>FR</td>
+
+ <td>BBLN</td>
+
+ <td>Up to date</td>
+
+ <td><a href="ftp://mirror-fr1.bbln.org/torproject/">ftp</a></td>
+ <td><a href="http://mirror-fr1.bbln.org/torproject/dist/">http</a></td>
+ <td><a href="http://mirror-fr1.bbln.org/torproject/">http</a></td>
+ <td><a href="https://mirror-fr1.bbln.org/torproject/dist/">https</a></td>
+ <td><a href="https://mirror-fr1.bbln.org/torproject/">https</a></td>
+ <td><a href="rsync://mirror-fr1.bbln.org/torproject/dist/">rsync</a></td>
+ <td><a href="rsync://mirror-fr1.bbln.org/torproject/">rsync</a></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://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><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>AU</td>
+ <td>DE</td>
- <td>CoffsWiFi</td>
+ <td>0x3d.lu</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://torproject.coffswifi.net/dist">http</a></td>
- <td><a href="http://torproject.coffswifi.net">http</a></td>
- <td> - </td>
- <td> - </td>
+ <td><a href="http://tor.0x3d.lu/dist/">http</a></td>
+ <td><a href="http://tor.0x3d.lu/">http</a></td>
+ <td><a href="https://tor.0x3d.lu/dist/">https</a></td>
+ <td><a href="https://tor.0x3d.lu/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>DE</td>
+ <td>AT</td>
- <td>torservers</td>
+ <td>UnicornCloud.org</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://www.unicorncloud.org/public/torproject.org/dist">http</a></td>
+ <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td>
+ <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td>
+ <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>IS</td>
+ <td>US</td>
- <td>myRL.net</td>
+ <td>intfxdx.com</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://108.248.87.242/dist/">http</a></td>
+ <td><a href="http://108.248.87.242/">http</a></td>
+ <td><a href="https://108.248.87.242/dist/">https</a></td>
+ <td><a href="https://108.248.87.242/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
@@ -734,47 +751,64 @@
<td>US</td>
- <td>EPRCI</td>
+ <td>SamWhited.com</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.eprci.net/dist/">http</a></td>
- <td><a href="http://tor.eprci.net/">http</a></td>
- <td><a href="https://www.eprci.com/tor/dist/">https</a></td>
- <td><a href="https://www.eprci.com/tor/">https</a></td>
- <td> - </td>
- <td> - </td>
+ <td><a href="http://mirrors.samwhited.net/tor/dist">http</a></td>
+ <td><a href="http://mirrors.samwhited.net/tor">http</a></td>
+ <td><a href="https://mirrors.samwhited.net/tor/dist">https</a></td>
+ <td><a href="https://mirrors.samwhited.net/tor">https</a></td>
+ <td><a href="rsync://mirrors.samwhited.net/tor-dist">rsync</a></td>
+ <td><a href="rsync://mirrors.samwhited.net/tor">rsync</a></td>
</tr>
<tr>
- <td>DE</td>
+ <td>US</td>
- <td>cYbergueRrilLa AnonyMous NeXus</td>
+ <td>Department of CS at USU</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://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>US</td>
+
+ <td>Lucid Networks</td>
+
+ <td>Up to date</td>
+
+ <td> - </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>
<tr>
<td>DE</td>
- <td>Tor Supporter</td>
+ <td>mirror-server.de</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.euve33747.vserver.de/dist">http</a></td>
- <td><a href="http://tor.euve33747.vserver.de/">http</a></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>
@@ -783,32 +817,32 @@
<tr>
- <td>NL</td>
+ <td>DE</td>
- <td>sky-ip.org</td>
+ <td>Netzkonstrukt Berlin</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://beautiful-mind.sky-ip.org/dist/">http</a></td>
- <td><a href="http://beautiful-mind.sky-ip.org/">http</a></td>
- <td> - </td>
- <td> - </td>
+ <td><a href="http://mirror.ntzk.de/torproject.org/dist/">http</a></td>
+ <td><a href="http://mirror.ntzk.de/torproject.org/">http</a></td>
+ <td><a href="https://mirror.ntzk.de/torproject.org/dist/">https</a></td>
+ <td><a href="https://mirror.ntzk.de/torproject.org/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>AT</td>
+ <td>AR</td>
- <td>Tor Supporter</td>
+ <td>Xfree.com.ar</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.ludikovsky.name/dist">http</a></td>
- <td><a href="http://tor.ludikovsky.name/">http</a></td>
+ <td><a href="http://tor.xfree.com.ar/dist/">http</a></td>
+ <td><a href="http://tor.xfree.com.ar/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -819,66 +853,66 @@
<td>US</td>
- <td>intfxdx.com</td>
+ <td>EPRCI</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://108.248.87.242/dist/">http</a></td>
- <td><a href="http://108.248.87.242/">http</a></td>
- <td><a href="https://108.248.87.242/dist/">https</a></td>
- <td><a href="https://108.248.87.242/">https</a></td>
+ <td><a href="http://tor.eprci.net/dist/">http</a></td>
+ <td><a href="http://tor.eprci.net/">http</a></td>
+ <td><a href="https://www.eprci.com/tor/dist/">https</a></td>
+ <td><a href="https:/www.eprci.com/tor/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>US</td>
+ <td>FR</td>
- <td>Lucid Networks</td>
+ <td>Tor Supporter</td>
<td>Up to date</td>
<td> - </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><a href="http://tor.mrtino.eu/dist">http</a></td>
+ <td><a href="http://tor.mrtino.eu">http</a></td>
+ <td> - </td>
+ <td> - </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>
<tr>
- <td>DE</td>
+ <td>FR</td>
- <td>Netzkonstrukt Berlin</td>
+ <td>wardsback.org</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://mirror.ntzk.de/torproject.org/dist/">http</a></td>
- <td><a href="http://mirror.ntzk.de/torproject.org/">http</a></td>
- <td><a href="https://mirror.ntzk.de/torproject.org/dist/">https</a></td>
- <td><a href="https://mirror.ntzk.de/torproject.org/">https</a></td>
+ <td><a href="http://alliumcepa.wardsback.org/dist/">http</a></td>
+ <td><a href="http://alliumcepa.wardsback.org/">http</a></td>
+ <td> - </td>
+ <td> - </td>
<td> - </td>
<td> - </td>
</tr>
<tr>
- <td>US</td>
+ <td>DE</td>
- <td>EPRCI</td>
+ <td>PW</td>
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.eprci.net/dist/">http</a></td>
- <td><a href="http://tor.eprci.net/">http</a></td>
- <td><a href="https://www.eprci.com/tor/dist/">https</a></td>
- <td><a href="https:/www.eprci.com/tor/">https</a></td>
+ <td><a href="http://tor.pw.is/dist/">http</a></td>
+ <td><a href="http://tor.pw.is/">http</a></td>
+ <td><a href="https://www.it-sicherheitschannel.de/dist/">https</a></td>
+ <td><a href="https://www.it-sicherheitschannel.de/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv
index c92525b..1e6ce3c 100644
--- a/include/tor-mirrors.csv
+++ b/include/tor-mirrors.csv
@@ -16,95 +16,95 @@ 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/, , , Thu Jan 8 02:14:18 2015
+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/, , , Tue Jan 20 19:17:52 2015
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
-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, Thu Jan 8 02:14:18 2015
-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 Jan 7 18:27:42 2015
-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/, , , Thu Jan 8 02:14:18 2015
+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, Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
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/, , , , Thu Jan 8 02:14:18 2015
-haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, TRUE, No, http://tor.zilog.es/, https://tor.zilog.es/, , , http://tor.zilog.es/dist/, https://tor.zilog.es/dist/, , , Thu Jan 8 05:01:06 2015
-Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Thu Jan 8 02:14:18 2015
-margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Thu Jan 8 02:14:18 2015
-Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://www.torproject.is/, , , , http://www.torproject.is/dist/, , , , Thu Jan 8 02:14:18 2015
-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, , Thu Jan 8 05:01:06 2015
-Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Tue Dec 23 19:30:17 2014
-Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Thu Jan 8 02:14:18 2015
-Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, TRUE, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Thu Jan 8 02:14:18 2015
+http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Tue Jan 20 19:17:52 2015
+haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, TRUE, No, http://tor.zilog.es/, https://tor.zilog.es/, , , http://tor.zilog.es/dist/, https://tor.zilog.es/dist/, , , Tue Jan 20 19:17:52 2015
+Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Tue Jan 20 19:17:52 2015
+margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Tue Jan 20 19:17:52 2015
+Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://www.torproject.is/, , , , http://www.torproject.is/dist/, , , , Wed Jan 21 15:15:41 2015
+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, , Tue Jan 20 19:17:52 2015
+Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Thu Jan 1 19:17:56 2015
+Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Tue Jan 20 19:17:52 2015
+Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, TRUE, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Tue Jan 20 19:17:52 2015
coralcdn.org, CoralCDN, INT, International, INT, TRUE, FALSE, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , Thu Jan 8 05:01:06 2015
-Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Thu Jan 8 05:01:06 2015
-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 Jan 7 18:27:42 2015
-webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Thu Jan 8 05:01:06 2015
-Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Wed Jan 7 18:27:42 2015
-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, , , Thu Jan 8 02:14:18 2015
-root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Wed Jan 7 18:27:42 2015
-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 Jan 7 18:27:42 2015
-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/, , , Thu Jan 8 02:14:18 2015
-paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Wed Jan 7 18:27:42 2015
-Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Thu Jan 8 02:14:18 2015
-hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Thu Jan 8 02:14:18 2015
+Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Wed Jan 21 15:15:41 2015
+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/, , , Tue Jan 20 19:17:52 2015
+webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Tue Jan 20 19:17:52 2015
+Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Tue Jan 20 19:17:52 2015
+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, , , Tue Jan 20 19:17:52 2015
+root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Tue Jan 20 19:17:52 2015
+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, , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Tue Jan 20 19:17:52 2015
+Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Tue Jan 20 19:17:52 2015
+hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Wed Jan 21 15:15:41 2015
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/, , , , Thu Jan 8 02:14:18 2015
-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, , Thu Jan 8 02:14:18 2015
-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 Jan 7 18:27:42 2015
-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/, , , Thu Jan 8 02:14:18 2015
-Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Thu Jan 8 02:14:18 2015
-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 Jan 7 18:27:42 2015
-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/, , , Thu Jan 8 02:14:18 2015
-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 Jan 7 18:27:42 2015
-tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Wed Jan 7 18:27:42 2015
-Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Thu Jan 8 02:14:18 2015
-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/, , , Thu Jan 8 05:01:06 2015
-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 Jan 7 18:27:42 2015
-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/, , Thu Jan 8 02:14:18 2015
-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 Jan 7 18:27:42 2015
-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/, , , Thu Jan 8 02:14:18 2015
-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/, , , Thu Jan 8 02:14:18 2015
-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/, , , Thu Jan 8 02:14:18 2015
-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/, , , Thu Jan 8 02:14:18 2015
-jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , Thu Jan 8 05:01:06 2015
-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/, , , Thu Jan 8 02:14:18 2015
+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/, , , , Tue Jan 20 19:17:52 2015
+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, , Tue Jan 20 19:17:52 2015
+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/, Tue Jan 20 19:17:52 2015
+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 Jan 21 15:15:41 2015
+Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Tue Jan 20 19:17:52 2015
+Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+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, Tue Jan 20 19:17:52 2015
+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/, , Tue Jan 20 19:17:52 2015
+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, , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+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 Jan 21 15:15:41 2015
+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/, , , Tue Jan 20 19:17:52 2015
+jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
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/, , , Thu Jan 8 02:14:18 2015
-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/, , , Thu Jan 8 02:14:18 2015
-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/, , , Thu Jan 8 02:14:18 2015
-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/, , , Thu Jan 8 02:14:18 2015
-Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Thu Jan 8 02:14:18 2015
-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/, , , Thu Jan 8 02:14:18 2015
-stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , Thu Jan 8 05:01:06 2015
-Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Jan 7 18:27:42 2015
+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/, , , Tue Jan 20 19:17:52 2015
+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 Jan 21 15:15:41 2015
+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/, , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+Sebastian, Maxanoo, NL, The Netherlands, Amsterdam, TRUE, FALSE, NO, http://tor.maxanoo.com/, , , , http://tor.maxanoo.com/dist/, , , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+stefano.fenoglio AT gmail DOT com, Tor Supporter, IT, Italy, Europe, TRUE, FALSE, No, http://tor.stefanof.com, , , , , , http://tor.stefanof.com/dist, , Tue Jan 20 19:17:52 2015
+Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Tue Jan 20 19:17:52 2015
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/, , , Thu Jan 8 02:14:18 2015
-Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , Thu Jan 8 02:14:18 2015
-Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, http://tor.euve33747.vserver.de/, , , , http://tor.euve33747.vserver.de/dist, , , , Wed Jan 7 18:27:42 2015
-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 Jan 7 18:27:42 2015
-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, Thu Jan 8 02:14:18 2015
-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/, Wed Jan 7 18:27:42 2015
-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, , Thu Jan 8 05:01:06 2015
-0x43DE8191, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://torproject.hactar.bz, , , , http://torproject.hactar.bz/dist/, , , , Thu Jan 8 05:01:06 2015
--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, Thu Jan 8 05:01:06 2015
+Tor Fan, Ramos Research, US, United States, US, TRUE, TRUE, No, http://tor.ramosresearch.com/, , , , http://tor.ramosresearch.com/dist/, , , , Wed Jan 21 15:15:41 2015
+Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, FALSE, No, http://tor.euve33747.vserver.de/, , , , http://tor.euve33747.vserver.de/dist, , , , Tue Jan 20 19:17:52 2015
+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/, , , , Tue Jan 20 19:17:52 2015
+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, Tue Jan 20 19:17:52 2015
+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 Jan 20 19:17:52 2015
+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, , Tue Jan 20 19:17:52 2015
+0x43DE8191, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, No, http://torproject.hactar.bz, , , , http://torproject.hactar.bz/dist/, , , , Wed Jan 21 15:15:41 2015
+-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 Jan 21 15:15:41 2015
opi(a)zeropi.net, Tor Supporter, FR, France, FR, TRUE, TRUE, No, http://tor-mirror.zeropi.net/, , , , http://tor-mirror.zeropi.net/dist/, , , , Mon Dec 1 15:15:20 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/, , Fri Jan 2 19:33:28 2015
-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/, , Thu Jan 8 02:14:18 2015
-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/, , Thu Jan 8 05:01:06 2015
-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/, , , Thu Jan 8 02:14:18 2015
-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/, , , Thu Jan 8 05:01:06 2015
+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/, , Tue Jan 20 19:17:52 2015
+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/, , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
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, , , Thu Jan 8 02:14:18 2015
-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 Jan 7 18:27:42 2015
-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/tor/dist, rsync://mirrors.samwhited.net/tor-dist, , Thu Jan 8 02:14:18 2015
-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/, , , , Thu Jan 8 02:14:18 2015
-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/, , , Thu Jan 8 02:14:18 2015
-Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Wed Jan 7 18:27:42 2015
-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, , Wed Jan 7 18:27:42 2015
-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/, , , , Thu Jan 8 02:14:18 2015
-mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, http://mirror.ntzk.de/torproject.org/, https://mirror.ntzk.de/torproject.org/, , , http://mirror.ntzk.de/torproject.org/dist/, https://mirror.ntzk.de/torproject.org/dist/, , , Wed Jan 7 18:27:42 2015
-mirror(a)xfree.com.ar, Xfree.com.ar, AR, Argentina, South America, TRUE, FALSE, No, http://tor.xfree.com.ar/, , , , http://tor.xfree.com.ar/dist/, , , , Thu Jan 8 02:14:18 2015
-tor AT eprci NET, EPRCI, US, NH, 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 Jan 7 18:27:42 2015
-contact(a)mrtino.eu, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mrtino.eu,,,, http://tor.mrtino.eu/dist,,,,
-tor(a)kura.io,KURA IO LIMITED,NL,Netherlands,Europe,TRUE,TRUE,TRUE,http://tor-mirror.kura.io/,htt…,,
-tor-admin AT wardsback DOT org, wardsback.org, FR, France, FR, TRUE, FALSE, No, http://alliumcepa.wardsback.org/, , , , http://alliumcepa.wardsback.org/dist/, , , ,
-PW,PW,DE,Germany,DE,TRUE,TRUE,NO,http://tor.pw.is/,https://www.it-sicherheitschannel.de/,,,http://tor.pw.is/dist/,https://www.it-sicherheitschannel.de/dist/,,,
-kevin(a)freedom.press, Freedom of the Press Foundation, ,US, US, True, False, No, http://tor.freedom.press,https://tor.freedom.press, ,http://tor.freedom.press/dist/,https://tor.freedom.press/dist/, , ,
\ No newline at end of file
+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, , , Tue Jan 20 19:17:52 2015
+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/, , , Tue Jan 20 19:17:52 2015
+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/tor/dist, rsync://mirrors.samwhited.net/tor-dist, , Tue Jan 20 19:17:52 2015
+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 Jan 21 15:15:41 2015
+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 Jan 20 19:17:52 2015
+Jacob Henner, Anatomical Networks, US, United States, US, TRUE, TRUE, TRUE, http://tor.ventricle.us/, , , , http://tor.ventricle.us/dist/, , , , Tue Jan 20 19:17:52 2015
+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, , Tue Jan 20 19:17:52 2015
+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/, , , , Tue Jan 20 19:17:52 2015
+mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, http://mirror.ntzk.de/torproject.org/, https://mirror.ntzk.de/torproject.org/, , , http://mirror.ntzk.de/torproject.org/dist/, https://mirror.ntzk.de/torproject.org/dist/, , , Tue Jan 20 19:17:52 2015
+mirror(a)xfree.com.ar, Xfree.com.ar, AR, Argentina, South America, TRUE, FALSE, No, http://tor.xfree.com.ar/, , , , http://tor.xfree.com.ar/dist/, , , , Tue Jan 20 19:17:52 2015
+tor AT eprci NET, EPRCI, US, NH, US, TRUE, FALSE, No, http://tor.eprci.net/, https:/www.eprci.com/tor/, , , http://tor.eprci.net/dist/, https://www.eprci.com/tor/dist/, , , Tue Jan 20 19:17:52 2015
+contact(a)mrtino.eu, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mrtino.eu, , , , http://tor.mrtino.eu/dist, , , , Tue Jan 20 19:17:52 2015
+tor(a)kura.io, KURA IO LIMITED, NL, Netherlands, Europe, TRUE, TRUE, TRUE, http://tor-mirror.kura.io/, https://tor-mirror.kura.io/, rsync://tor-mirror.kura.io/torproject.org, ftp://tor-mirror.kura.io, http://tor-mirror.kura.io/dist/, https://tor-mirror.kura.io/dist/, rsync://tor-mirror.kura.io/torproject.org/dist, , Sat Dec 27 00:21:38 2014
+tor-admin AT wardsback DOT org, wardsback.org, FR, France, FR, TRUE, FALSE, No, http://alliumcepa.wardsback.org/, , , , http://alliumcepa.wardsback.org/dist/, , , , Tue Jan 20 19:17:52 2015
+PW, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, https://www.it-sicherheitschannel.de/, , , http://tor.pw.is/dist/, https://www.it-sicherheitschannel.de/dist/, , , Tue Jan 20 19:17:52 2015
+kevin(a)freedom.press, Freedom of the Press Foundation, , US, US, True, False, No, http://tor.freedom.press, https://tor.freedom.press, , http://tor.freedom.press/dist/, https://tor.freedom.press/dist/, , , ,
1
0

22 Jan '15
commit e0e53189158646aa2f01add172ec757ea7c1a921
Author: Georg Koppen <gk(a)torproject.org>
Date: Thu Jan 22 09:26:08 2015 +0000
Add goxcrypto to verifiy-tags.sh
---
gitian/verify-tags.sh | 1 +
1 file changed, 1 insertion(+)
diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh
index 09454bb..55bb857 100755
--- a/gitian/verify-tags.sh
+++ b/gitian/verify-tags.sh
@@ -116,6 +116,7 @@ txsocksx $TXSOCKSX_TAG
faketime $FAKETIME_TAG
ed25519 $GOED25519_TAG
siphash $GOSIPHASH_TAG
+goxcrypto $GO_X_CRYPTO_TAG
EOF
# Verify signatures on signed packages
1
0

[tor-browser-bundle/master] Add golang.org/x/crypto to the build process.
by gk@torproject.org 22 Jan '15
by gk@torproject.org 22 Jan '15
22 Jan '15
commit e33339c763c212a09f9976d5c04f033c1ec7c18c
Author: Yawning Angel <yawning(a)schwanenlied.me>
Date: Wed Jan 21 19:34:00 2015 +0000
Add golang.org/x/crypto to the build process.
This is required for any of:
* Go >= 1.4.x (It is backwards compatible though).
* obfs4proxy >= cdeda5724124ca393c87be6d01c84fe4f906d612
And replaces go.crypto (the developers moved/renamed the package). As
there is no formal release process as far as I can tell for the
codebase the current tip of tree commit is used for versions.alpha, and
master for versions.nightly.
When obfs4proxy 0.0.4 is tagged, the old go.crypto code can be removed
from the build process after the new tag is added to all the
versions.foo files.
Fixes #14316.
---
gitian/descriptors/linux/gitian-pluggable-transports.yml | 14 +++++++++++++-
gitian/descriptors/mac/gitian-pluggable-transports.yml | 14 +++++++++++++-
.../descriptors/windows/gitian-pluggable-transports.yml | 14 +++++++++++++-
gitian/fetch-inputs.sh | 1 +
gitian/mkbundle-linux.sh | 2 +-
gitian/mkbundle-mac.sh | 2 +-
gitian/mkbundle-windows.sh | 2 +-
gitian/versions.alpha | 1 +
gitian/versions.nightly | 1 +
9 files changed, 45 insertions(+), 6 deletions(-)
diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml
index e79e8af..d180f97 100644
--- a/gitian/descriptors/linux/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml
@@ -36,6 +36,8 @@ remotes:
"dir": "ed25519"
- "url": "https://github.com/dchest/siphash.git"
"dir": "siphash"
+- "url": "https://go.googlesource.com/crypto"
+ "dir": "goxcrypto"
- "url": "https://git.torproject.org/pluggable-transports/obfs4.git"
"dir": "obfs4"
files:
@@ -242,7 +244,17 @@ script: |
go install github.com/dchest/siphash
cd ..
- # Building go.crypto
+ # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4)
+ cd goxcrypto
+ find -type f | xargs touch --date="$REFERENCE_DATETIME"
+ mkdir -p "$GOPATH/src/golang.org/x/"
+ ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto"
+ go install golang.org/x/crypto/curve25519
+ go install golang.org/x/crypto/hkdf
+ go install golang.org/x/crypto/nacl/secretbox
+ cd ..
+
+ # Building go.crypto (obfs4proxy <= 0.0.3)
tar xjf go.crypto.tar.bz2
cd go.crypto
find -type f | xargs touch --date="$REFERENCE_DATETIME"
diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml
index 0931c59..9a86b1a 100644
--- a/gitian/descriptors/mac/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml
@@ -34,6 +34,8 @@ remotes:
"dir": "ed25519"
- "url": "https://github.com/dchest/siphash.git"
"dir": "siphash"
+- "url": "https://go.googlesource.com/crypto"
+ "dir": "goxcrypto"
- "url": "https://git.torproject.org/pluggable-transports/obfs4.git"
"dir": "obfs4"
files:
@@ -270,7 +272,17 @@ script: |
go install github.com/dchest/siphash
cd ..
- # Building go.crypto
+ # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4)
+ cd goxcrypto
+ find -type f | xargs touch --date="$REFERENCE_DATETIME"
+ mkdir -p "$GOPATH/src/golang.org/x/"
+ ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto"
+ go install golang.org/x/crypto/curve25519
+ go install golang.org/x/crypto/hkdf
+ go install golang.org/x/crypto/nacl/secretbox
+ cd ..
+
+ # Building go.crypto (obfs4proxy <= 0.0.3)
tar xjf go.crypto.tar.bz2
cd go.crypto
find -type f | xargs touch --date="$REFERENCE_DATETIME"
diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml
index 70d4b91..6e3c3a7 100644
--- a/gitian/descriptors/windows/gitian-pluggable-transports.yml
+++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml
@@ -33,6 +33,8 @@ remotes:
"dir": "ed25519"
- "url": "https://github.com/dchest/siphash.git"
"dir": "siphash"
+- "url": "https://go.googlesource.com/crypto"
+ "dir": "goxcrypto"
- "url": "https://git.torproject.org/pluggable-transports/obfs4.git"
"dir": "obfs4"
files:
@@ -348,7 +350,17 @@ script: |
go install github.com/dchest/siphash
cd ..
- # Building go.crypto
+ # Building golang.org/x/crypto (obfs4proxy > 0.0.3 || Go >= 1.4)
+ cd goxcrypto
+ find -type f | xargs touch --date="$REFERENCE_DATETIME"
+ mkdir -p "$GOPATH/src/golang.org/x/"
+ ln -sf "$PWD" "$GOPATH/src/golang.org/x/crypto"
+ go install golang.org/x/crypto/curve25519
+ go install golang.org/x/crypto/hkdf
+ go install golang.org/x/crypto/nacl/secretbox
+ cd ..
+
+ # Building go.crypto (obfs4proxy <= 0.0.3)
tar xjf go.crypto.tar.bz2
cd go.crypto
find -type f | xargs touch --date="$REFERENCE_DATETIME"
diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh
index 049824a..3311547 100755
--- a/gitian/fetch-inputs.sh
+++ b/gitian/fetch-inputs.sh
@@ -309,6 +309,7 @@ meek https://git.torproject.org/pluggable-transports/meek.git $
faketime https://github.com/wolfcw/libfaketime $FAKETIME_TAG
ed25519 https://github.com/agl/ed25519.git $GOED25519_TAG
siphash https://github.com/dchest/siphash.git $GOSIPHASH_TAG
+goxcrypto https://go.googlesource.com/crypto $GO_X_CRYPTO_TAG
obfs4 https://git.torproject.org/pluggable-transports/obfs4.git $OBFS4_TAG
EOF
diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh
index 4a773b8..0dba906 100755
--- a/gitian/mkbundle-linux.sh
+++ b/gitian/mkbundle-linux.sh
@@ -224,7 +224,7 @@ then
echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******"
echo
- ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml
+ ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml
if [ $? -ne 0 ];
then
#mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S`
diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh
index ed54dc6..09b3172 100755
--- a/gitian/mkbundle-mac.sh
+++ b/gitian/mkbundle-mac.sh
@@ -190,7 +190,7 @@ then
echo "****** Starting Pluggable Transports Component of Mac Bundle (4/5 for Mac) ******"
echo
- ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
+ ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml
if [ $? -ne 0 ];
then
#mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S`
diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh
index 945511b..39c57ce 100755
--- a/gitian/mkbundle-windows.sh
+++ b/gitian/mkbundle-windows.sh
@@ -194,7 +194,7 @@ then
echo "****** Starting Pluggable Transports Component of Windows Bundle (4/5 for Windows) ******"
echo
- ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
+ ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,libfte=$LIBFTE_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG,goptlib=$GOPTLIB_TAG,meek=$MEEK_TAG,ed25519=$GOED25519_TAG,siphash=$GOSIPHASH_TAG,goxcrypto=$GO_X_CRYPTO_TAG,obfs4=$OBFS4_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml
if [ $? -ne 0 ];
then
#mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S`
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 890b6a3..a0af194 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -29,6 +29,7 @@ MEEK_TAG=0.15
FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
+GO_X_CRYPTO_TAG=4ed45ec682102c643324fae5dff8dab085b6c300
OBFS4_TAG=obfs4proxy-0.0.3
GITIAN_TAG=tor-browser-builder-3.x-7
diff --git a/gitian/versions.nightly b/gitian/versions.nightly
index d200f54..cb6e53a 100755
--- a/gitian/versions.nightly
+++ b/gitian/versions.nightly
@@ -33,6 +33,7 @@ MEEK_TAG=master
FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6
GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de
GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd
+GO_X_CRYPTO_TAG=master
OBFS4_TAG=master
GITIAN_TAG=tor-browser-builder-3.x-7
1
0