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

[tor/master] Add support for TPROXY via new TransTPRoxy option
by nickm＠torproject.org 02 Feb '14

02 Feb '14

commit 09ccc4c4a3b67695295ad95f24b2f102d5f2fa1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 31 12:59:35 2014 -0500 Add support for TPROXY via new TransTPRoxy option Based on patch from "thomo" at #10582. --- changes/10582_tproxy | 7 +++++++ doc/tor.1.txt | 13 +++++++++++++ src/or/config.c | 26 ++++++++++++++++++++++---- src/or/connection.c | 11 +++++++++++ src/or/or.h | 2 ++ 5 files changed, 55 insertions(+), 4 deletions(-) diff --git a/changes/10582_tproxy b/changes/10582_tproxy new file mode 100644 index 0000000..3609d56 --- /dev/null +++ b/changes/10582_tproxy @@ -0,0 +1,7 @@ + o Minor features: + + - Add support for the TPROXY transparent proxying facility on Linux. + See documentation for the new TransTRPOXY option for more details. + Implementation by "thomo". Closes ticket 10582. + + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 28e7c5d..69452a0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1183,6 +1183,19 @@ The following options are useful only for clients (that is, if compatibility, TransListenAddress is only allowed when TransPort is just a port number.) +[[TransTPROXY]] **TransTPROXY** **0**|**1**:: + TransTPROXY may only be enabled when there is transparent proxy listener + enabled and only for Linux. + + + Set this 1 if you wish to be able to use the TPROXY linux module to + transparently proxy connections that are configured using the TransPort + option. This setting lets the listener on the TransPort accept connections + for all addresses, even when the TransListenAddress is configured for an + internal address. Detailed information on how to configure the TPROXY + feature can be found in the Linux kernel source tree in the file + Documentation/networking/tproxy.txt. + (Default: 0) + [[NATDPort]] **NATDPort** \['address':]__port__|**auto** [_isolation flags_]:: Open this port to listen for connections from old versions of ipfw (as included in old versions of FreeBSD, etc) using the NATD protocol. diff --git a/src/or/config.c b/src/or/config.c index d348f10..a2366c0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -408,6 +408,7 @@ static config_var_t option_vars_[] = { OBSOLETE("TrafficShaping"), V(TransListenAddress, LINELIST, NULL), VPORT(TransPort, LINELIST, NULL), + V(TransTPROXY, BOOL, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), V(UseBridges, BOOL, "0"), @@ -2530,10 +2531,27 @@ options_validate(or_options_t *old_options, or_options_t *options, "undefined, and there aren't any hidden services configured. " "Tor will still run, but probably won't do anything."); -#ifndef USE_TRANSPARENT - /* XXXX024 I think we can remove this TransListenAddress */ - if (options->TransPort_set || options->TransListenAddress) - REJECT("TransPort and TransListenAddress are disabled in this build."); +#ifdef USE_TRANSPARENT + if (options->TransTPROXY) { +#ifndef __linux__ + REJECT("TransTPROXY is a Linux-specific feature.") +#endif + if (!options->TransPort_set) { + REJECT("Cannot use TransTPROXY without any valid TransPort or " + "TransListenAddress."); + } + /* Friendly suggestion about running as root initially. */ + if (!options->User) { + log_warn(LD_CONFIG, + "You have enabled TransTPROXY but have not specified the " + "\"User\" option. TransTPROXY will not function without " + "root privileges."); + } + } +#else + if (options->TransPort_set || options->TransTPROXY) + REJECT("TransPort, TransListenAddress, and TransTPROXY are disabled " + "in this build."); #endif if (options->TokenBucketRefillInterval <= 0 diff --git a/src/or/connection.c b/src/or/connection.c index 1f6e11f..7d8feeb 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1035,6 +1035,17 @@ connection_listener_new(const struct sockaddr *listensockaddr, make_socket_reuseable(s); +#if defined USE_TRANSPARENT && defined(IP_TRANSPARENT) + if (options->TransTPROXY && type == CONN_TYPE_AP_TRANS_LISTENER) { + int one = 1; + if (setsockopt(s, SOL_IP, IP_TRANSPARENT, &one, sizeof(one)) < 0) { + int e = tor_socket_errno(s); + log_warn(LD_NET, "Error setting IP_TRANSPARENT flag: %s", + tor_socket_strerror(e)); + } + } +#endif + #ifdef IPV6_V6ONLY if (listensockaddr->sa_family == AF_INET6) { #ifdef _WIN32 diff --git a/src/or/or.h b/src/or/or.h index 7df6c37..55f2862 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3553,6 +3553,8 @@ typedef struct { config_line_t *SocksPort_lines; /** Ports to listen on for transparent pf/netfilter connections. */ config_line_t *TransPort_lines; + int TransTPROXY; /** < Boolean: are we going to listen for all destinations + * on the TransPort_lines are required for TPROXY? */ config_line_t *NATDPort_lines; /**< Ports to listen on for transparent natd * connections. */ config_line_t *ControlPort_lines; /**< Ports to listen on for control

1 0

[tor/master] Add a sandbox rule to allow IP_TRANSPARENT
by nickm＠torproject.org 02 Feb '14

02 Feb '14

commit 25f0eb4512a57e305ed0bff00eb276812a7c8de6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 2 15:47:48 2014 -0500 Add a sandbox rule to allow IP_TRANSPARENT --- src/common/sandbox.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index dec6bfe..6b78748 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -475,6 +475,14 @@ sb_setsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter) if (rc) return rc; +#ifdef IP_TRANSPARENT + rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt), 2, + SCMP_CMP(1, SCMP_CMP_EQ, SOL_IP), + SCMP_CMP(2, SCMP_CMP_EQ, IP_TRANSPARENT)); + if (rc) + return rc; +#endif + return 0; }

1 0

[tor/master] Move the friendly warning about TPROXY and root to EPERM time
by nickm＠torproject.org 02 Feb '14

02 Feb '14

commit fd8947afc2815cc3316513fe4461d8d8096eddea Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Feb 2 15:45:00 2014 -0500 Move the friendly warning about TPROXY and root to EPERM time I'm doing this because: * User doesn't mean you're running as root, and running as root doesn't mean you've set User. * It's possible that the user has done some other capability-based hack to retain the necessary privileges. --- src/or/config.c | 7 ------- src/or/connection.c | 8 ++++++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index a2366c0..c921bb7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2540,13 +2540,6 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Cannot use TransTPROXY without any valid TransPort or " "TransListenAddress."); } - /* Friendly suggestion about running as root initially. */ - if (!options->User) { - log_warn(LD_CONFIG, - "You have enabled TransTPROXY but have not specified the " - "\"User\" option. TransTPROXY will not function without " - "root privileges."); - } } #else if (options->TransPort_set || options->TransTPROXY) diff --git a/src/or/connection.c b/src/or/connection.c index 7d8feeb..6dbba66 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1039,9 +1039,13 @@ connection_listener_new(const struct sockaddr *listensockaddr, if (options->TransTPROXY && type == CONN_TYPE_AP_TRANS_LISTENER) { int one = 1; if (setsockopt(s, SOL_IP, IP_TRANSPARENT, &one, sizeof(one)) < 0) { + const char *extra = ""; int e = tor_socket_errno(s); - log_warn(LD_NET, "Error setting IP_TRANSPARENT flag: %s", - tor_socket_strerror(e)); + if (e == EPERM) + extra = "TransTPROXY requires root privileges or similar" + " capabilities."; + log_warn(LD_NET, "Error setting IP_TRANSPARENT flag: %s.%s", + tor_socket_strerror(e), extra); } } #endif

1 0

[flashproxy/master] Also figure out the register_addr after opening listeners.
by dcf＠torproject.org 02 Feb '14

02 Feb '14

commit 5a6529e1e2792fe794cee239f963bf5a65503e16 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 1 21:01:04 2014 -0800 Also figure out the register_addr after opening listeners. So that you register the proper port number when you give ":0" on the command line. There may be up to two listeners: one for IPv4 and one for IPv6, and they may be on different ports or they may be the same. Previously they could only be the same, so we could pass a specification like ":9000" to a registration helper, and whether it happened to use IPv4 or IPv6 things would work out. Now that the ports may be different with ":0", there is ambiguity because omitting the host part has meant "registration helper guesses the external address" which really means "the remote server the registration helper talks to guesses the address." If we have, for example, $ ./flashproxy-client --external --register :9001 :0 2014-02-01 21:35:29 Listening remote on 0.0.0.0:10000. 2014-02-01 21:35:29 Listening remote on [::]:20000. it would be a mistake to try and register both ":10000" and ":20000", because they will both be guessed to be the same address family. We don't have a way to hint to registration helpers that a guessed address should belong to a certain address family. A similar but smaller difficulty exists with --register-addr. That option takes default values from the actual listening address, so that you can, for example, provide an IP address and have the port filled in automatically. Providing an IPv4 address would cause the IPv4 address to be registered twice, once correctly with a port belonging to IPv4 and once incorrectly with a port belonging to IPv6. Unsure fo the best way to handle this, I kept that there is a single register_addr, and it is set only to the IPv4 listener. The behavior is the same in all cases that worked before; that is, all cases that don't use ":0" as a port specification. If you need to override it, you can use --register-addr. --- flashproxy-client | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/flashproxy-client b/flashproxy-client index f3c8926..09630b3 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -1179,7 +1179,6 @@ def main(): options.remote_addrs.append(("0.0.0.0", remote_addr[1])) if socket.has_ipv6: options.remote_addrs.append(("::", remote_addr[1])) - options.register_addr = parse_addr_spec(register_addr_spec or ":", *remote_addr) if not register_methods: register_methods = DEFAULT_REGISTER_METHODS @@ -1196,6 +1195,13 @@ def main(): continue remote_listen.append(listen) log(u"Listening remote on %s." % format_sockaddr(listen.getsockname())) + if options.register_addr is None: + host, port = socket.getnameinfo(listen.getsockname(), socket.NI_NUMERICHOST | socket.NI_NUMERICSERV) + port = int(port) + if not remote_addr[0]: + # Make host part blank (not 0.0.0.0) if unspecified. + host = "" + options.register_addr = parse_addr_spec(register_addr_spec or ":", host, port) if not remote_listen: log(u"Failed to open any remote listeners, quitting.") pt_cmethoderror("Failed to open any remote listeners.")

1 0

[flashproxy/master] Fix the test for duplicate --register-addr.
by dcf＠torproject.org 02 Feb '14

02 Feb '14

commit de78ea0a881eeeef7f25cfd090d397d549274076 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 1 19:57:38 2014 -0800 Fix the test for duplicate --register-addr. Was broken by 4b0292e01bca5aa6e2585340f8bd8a2a09034682. --- flashproxy-client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flashproxy-client b/flashproxy-client index 6a7667e..f3c8926 100755 --- a/flashproxy-client +++ b/flashproxy-client @@ -1113,7 +1113,7 @@ def main(): elif o == "-r" or o == "--register": options.register = True elif o == "--register-addr": - if options.register_addr is not None: + if register_addr_spec is not None: print >> sys.stderr, "%s: only one --register-addr is allowed." % sys.argv[0] sys.exit(1) options.register = True

1 0

r26576: {website} update mirror status. (website/trunk/include)
by Andrew Lewman 02 Feb '14

02 Feb '14

Author: phobos Date: 2014-02-02 05:49:39 +0000 (Sun, 02 Feb 2014) New Revision: 26576 Modified: website/trunk/include/mirrors-table.wmi website/trunk/include/tor-mirrors.csv Log: update mirror status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2014-02-01 15:37:31 UTC (rev 26575) +++ website/trunk/include/mirrors-table.wmi 2014-02-02 05:49:39 UTC (rev 26576) @@ -18,6 +18,23 @@ <tr> + <td>DK</td> + + <td>Zentrum der Gesundheit</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.idnr.ws/dist/">http</a></td> + <td><a href="http://tor.idnr.ws/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NO</td> <td>MultiNet AS</td> @@ -35,6 +52,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> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>NL</td> <td>BBLN</td> @@ -358,42 +392,8 @@ <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>US</td> - <td>AskApache</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - <td>hessmo</td> <td>Up to date</td> @@ -545,6 +545,23 @@ <tr> + <td>AU</td> + + <td>CoffsWiFi</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> - </td> + <td> - </td> +</tr> + +<tr> + <td>AT</td> <td>cyberarmy</td> @@ -800,23 +817,6 @@ <tr> - <td>US</td> - - <td>EPRCI</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> -</tr> - -<tr> - <td>CA</td> <td>tor(a)les.net</td> @@ -916,37 +916,3 @@ <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>DK</td> - - <td>Zentrum der Gesundheit</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.idnr.ws/dist/">http</a></td> - <td><a href="http://tor.idnr.ws/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-02-01 15:37:31 UTC (rev 26575) +++ website/trunk/include/tor-mirrors.csv 2014-02-02 05:49:39 UTC (rev 26576) @@ -1,80 +1,80 @@ adminContact, orgName, isoCC, subRegion, region, ipv4, ipv6, loadBalanced, httpWebsiteMirror, httpsWebsiteMirror, rsyncWebsiteMirror, ftpWebsiteMirror, httpDistMirror, httpsDistMirror, rsyncDistMirror, hiddenServiceMirror, updateDate -Tor Fan, Tor Supporter, US, United States, US, True, False, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Sat Jan 25 21:32:38 2014 +Tor Fan, Tor Supporter, US, United States, US, True, False, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Sat Feb 1 14:21:23 2014 Tor Fan, Tor Supporter, US, United States, US, True, True, No, http://tor.loritsu.com/, , , , http://tor.loritsu.com/dist/, , , , -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/, , , , Sat Jan 25 07:39:35 2014 -http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, True, True, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Sat Jan 25 21:32:38 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/, , , , Sat Feb 1 14:21:23 2014 +http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, True, True, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Sat Feb 1 14:21:23 2014 Tor Fan, Tor Supporter, US, United States, US, True, False, No, http://tor.mirrors.whitedholdings.org/, https://tor.mirrors.whitedholdings.org/, rsync://mirrors.whitedholdings.org/tor, , http://tor.mirrors.whitedholdings.org/dist/, https://tor.mirrors.whitedholdings.org/dist/, rsync://tor.mirrors.whitedholdings.org/tor-dist, , -haskell at gmx.es, Tor Supporter, ES, Spain, Europe, True, False, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Sat Jan 25 07:39:35 2014 -webmaster AT bbln DOT nl, BBLN, NL, The Netherlands, Europe, True, True, No, http://mirror.ml/tor/, https://mirror.ml/tor/, , , http://mirror.ml/tor/dist/, https://mirror.ml/tor/dist/, , , Sat Jan 25 21:32:38 2014 -Tor Fan, Tor Supporter, US, United States, US, True, False, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Sat Jan 25 21:32:38 2014 -margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, True, False, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Sat Jan 25 21:32:38 2014 -Tor Fan, torproject.is, IS, Iceland, IS, True, False, No, http://torproject.is/, , , , http://torproject.is/dist/, , , , Sat Jan 25 21:32:38 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, , Sat Jan 25 21:32:38 2014 -Tor Fan, me0w.cc, RO, Romania, RO, True, False, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Sat Jan 25 21:32:38 2014 -Tor Fan, borgmann.tv, DE, Germany, DE, True, False, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Sat Jan 25 21:32:38 2014 -security AT hostoffice DOT hu, Unknown, HU, Hungary, Europe, True, False, No, http://mirror.tor.hu/, , , , http://mirror.tor.hu/dist/, , , , Sat Jan 25 21:32:38 2014 -Tor Fan, Tor Supporter, TN, Tunisia, TN, True, False, No, http://torproject.antagonism.org/, https://torproject.antagonism.org/, , , , , , , Sat Jan 25 21:32:38 2014 -webmaster AT ccc DOT de, CCC, NL, The Netherlands, Europe, True, False, No, http://tor.ccc.de/, , , , http://tor.ccc.de/dist/, , , , Sat Jan 25 21:32:38 2014 +haskell at gmx.es, Tor Supporter, ES, Spain, Europe, True, False, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Sat Feb 1 14:21:23 2014 +webmaster AT bbln DOT nl, BBLN, NL, The Netherlands, Europe, True, True, No, http://mirror.ml/tor/, https://mirror.ml/tor/, , , http://mirror.ml/tor/dist/, https://mirror.ml/tor/dist/, , , Sat Feb 1 14:21:23 2014 +Tor Fan, Tor Supporter, US, United States, US, True, False, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Sat Feb 1 14:21:23 2014 +margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, True, False, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Sat Feb 1 14:21:23 2014 +Tor Fan, torproject.is, IS, Iceland, IS, True, False, No, http://torproject.is/, , , , http://torproject.is/dist/, , , , Sat Feb 1 14:21:23 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, , Sat Feb 1 14:21:23 2014 +Tor Fan, me0w.cc, RO, Romania, RO, True, False, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Sat Feb 1 14:21:23 2014 +Tor Fan, borgmann.tv, DE, Germany, DE, True, False, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Sat Feb 1 14:21:23 2014 +security AT hostoffice DOT hu, Unknown, HU, Hungary, Europe, True, False, No, http://mirror.tor.hu/, , , , http://mirror.tor.hu/dist/, , , , Sat Feb 1 14:21:23 2014 +Tor Fan, Tor Supporter, TN, Tunisia, TN, True, False, No, http://torproject.antagonism.org/, https://torproject.antagonism.org/, , , , , , , Sat Feb 1 14:21:23 2014 +webmaster AT ccc DOT de, CCC, NL, The Netherlands, Europe, True, False, No, http://tor.ccc.de/, , , , http://tor.ccc.de/dist/, , , , Sat Feb 1 14:21:23 2014 Tor Fan, searchprivate, US, TX, US, True, False, No, http://tor.searchprivate.com/, , , , http://tor.searchprivate.com/dist/, , , , Sun Jul 29 23:49:26 2012 -Tor Fan, Tor Supporter, AT, Austria, AT, True, True, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Sat Jan 25 21:32:38 2014 +Tor Fan, Tor Supporter, AT, Austria, AT, True, True, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Sat Feb 1 14:21:23 2014 marz.michael at gmail.com, Tor Supporter, DE, Germany, DE, True, False, No, http://tor.taskserver.de/, , , , http://tor.taskserver.de/dist/, , , , Tor Fan, Tor Supporter, LU, Luxemborg, LU, True, False, No, http://torproject.adamas.ai/, , , , http://torproject.adamas.ai/dist/, , , , -mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, True, False, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Sat Jan 25 21:32:38 2014 -coralcdn.org, CoralCDN, INT, International, INT, True, False, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , Sat Jan 25 21:32:38 2014 -Tor Fan, Tor Supporter, US, United States, US, True, True, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Sat Jan 25 21:32:38 2014 -Tor Fan, Tor Supporter, AT, Austria, AT, True, False, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Sat Jan 25 21:32:38 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/, , , , Sat Feb 1 14:21:23 2014 +coralcdn.org, CoralCDN, INT, International, INT, True, False, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , Sat Feb 1 14:21:23 2014 +Tor Fan, Tor Supporter, US, United States, US, True, True, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Sat Feb 1 14:21:23 2014 +Tor Fan, Tor Supporter, AT, Austria, AT, True, False, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Sat Feb 1 14:21:23 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 Jan 20 19:14:22 2014 -neutrino8 AT gmail DOT com, teambelgium, BE, Belgium, Europe, True, False, No, http://tor.teambelgium.net:8080/, , , ftp://tor.teambelgium.net:2121/torproject/, http://tor.teambelgium.net:8080/dist/, , , , Sat Jan 25 21:32:38 2014 -tormaster AT xpdm DOT us, Xpdm, US, United States, North America, True, False, No, http://torproj.xpdm.us/, https://torproj.xpdm.us/, , , http://torproj.xpdm.us/dist/, https://torproj.xpdm.us/dist/, , http://h3prhz46uktgm4tt.onion/, Sat Jan 25 21:32:38 2014 +neutrino8 AT gmail DOT com, teambelgium, BE, Belgium, Europe, True, False, No, http://tor.teambelgium.net:8080/, , , ftp://tor.teambelgium.net:2121/torproject/, http://tor.teambelgium.net:8080/dist/, , , , Sat Feb 1 14:21:23 2014 +tormaster AT xpdm DOT us, Xpdm, US, United States, North America, True, False, No, http://torproj.xpdm.us/, https://torproj.xpdm.us/, , , http://torproj.xpdm.us/dist/, https://torproj.xpdm.us/dist/, , http://h3prhz46uktgm4tt.onion/, Sat Feb 1 14:21:23 2014 Tor Fan, Tor Supporter, UA, Ukraine, UA, True, False, No, http://torua.reactor-xg.kiev.ua/, , , , http://torua.reactor-xg.kiev.ua/dist/, , , , - 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, , Sat Jan 25 21:32:38 2014 -wollomatic at posteo.eu, Tor Supporter, DE, Germany, Europe, True, True, No, http://tormirror.almnet.de/, https://tormirror.almnet.de/, , , http://tormirror.almnet.de/dist/, https://tormirror.almnet.de/dist/, , , Sat Jan 25 21:32:38 2014 -Tor Fan, Tor Supporter, LT, Lithuania, LT, True, False, No, http://tor.vesta.nu/, , , , http://tor.vesta.nu/dist/, , , , Sat Jan 25 21:32:38 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, , Sat Feb 1 14:21:23 2014 +wollomatic at posteo.eu, Tor Supporter, DE, Germany, Europe, True, True, No, http://tormirror.almnet.de/, https://tormirror.almnet.de/, , , http://tormirror.almnet.de/dist/, https://tormirror.almnet.de/dist/, , , Sat Feb 1 14:21:23 2014 +Tor Fan, Tor Supporter, LT, Lithuania, LT, True, False, No, http://tor.vesta.nu/, , , , http://tor.vesta.nu/dist/, , , , Sat Feb 1 14:21:23 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/, , , Sat Jan 25 21:32:38 2014 Tor Fan, Tor Supporter, FR, France, FR, True, False, No, http://37.187.0.127/tormirror/, , , , http://37.187.0.127/tormirror/dist/, , , , Tor Fan, Tor Supporter, US, United States, US, True, False, No, http://tor.minibofh.org/, , , , http://tor.minibofh.org/dist/, , , , Tor Fan, Tor Supporter, UK, United Kingdom, UK, True, False, No, http://tor.mage.me.uk/, , , , http://tor.mage.me.uk/dist/, , , , -webmaster AT askapache DOT com, AskApache, US, California, US, True, False, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Sat Jan 25 21:32:38 2014 +webmaster AT askapache DOT com, AskApache, US, California, US, True, False, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Thu Jan 30 02:50:25 2014 nsane2307 eml cc, tor-mirror.de, DE, Germany, Europe, True, False, No, http://tor-mirror.de/, https://tor-mirror.de/, , , http://tor-mirror.de/dist/, https://tor-mirror.de/dist/, , , -Tor Fan, hessmo, US, United States, US, True, False, No, http://mirror.hessmo.com/tor/, , , , http://mirror.hessmo.com/tor/dist/, , , , Sat Jan 25 21:32:38 2014 -Tor Fan, Tor Supporter, DE, Germany, DE, True, False, No, http://tor.dev-random.de/, https://tor.dev-random.de/, , , http://tor.dev-random.de/dist/, https://tor.dev-random.de/dist/, , , Sat Jan 25 21:32:38 2014 +Tor Fan, hessmo, US, United States, US, True, False, No, http://mirror.hessmo.com/tor/, , , , http://mirror.hessmo.com/tor/dist/, , , , Sat Feb 1 14:21:23 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, True, False, No, http://tor.dev-random.de/, https://tor.dev-random.de/, , , http://tor.dev-random.de/dist/, https://tor.dev-random.de/dist/, , , Sat Feb 1 14:21:23 2014 Tor Fan, India Tor Fans, IN, India, IN, True, False, No, http://www.torproject.org.in/, , , , http://www.torproject.org.in/dist/, , , , Mon Nov 25 18:31:18 2013 -mirror-admin(a)linsrv.net, linsrv, FR, France, Europe, True, False, No, http://mirrors.linsrv.net/torproject/, , mirrors.linsrv.net::pub/torproject, ftp://ftp.linsrv.net/pub/torproject/, http://mirrors.linsrv.net/torproject/dist/, , mirrors.linsrv.net::pub/torproject/dist, , Sat Jan 25 21:32:38 2014 -Tor Fan, Tor Supporter, FR, France, FR, True, False, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Sat Jan 25 21:32:38 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, , , Sat Jan 25 21:32:38 2014 -BarkerJr AT barkerjr DOT net, BarkerJr, FR, France, FR, True, False, No, http://www.oignon.net/, https://www.oignon.net/, , , http://www.oignon.net/dist/, https://www.oignon.net/dist/, , , Sat Jan 25 21:32:38 2014 -root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, True, False, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Sat Jan 25 21:32:38 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, , , Sat Jan 25 21:32:38 2014 +mirror-admin(a)linsrv.net, linsrv, FR, France, Europe, True, False, No, http://mirrors.linsrv.net/torproject/, , mirrors.linsrv.net::pub/torproject, ftp://ftp.linsrv.net/pub/torproject/, http://mirrors.linsrv.net/torproject/dist/, , mirrors.linsrv.net::pub/torproject/dist, , Sat Feb 1 14:21:23 2014 +Tor Fan, Tor Supporter, FR, France, FR, True, False, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Sat Feb 1 14:21:23 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, , , Sat Feb 1 14:21:23 2014 +BarkerJr AT barkerjr DOT net, BarkerJr, FR, France, FR, True, False, No, http://www.oignon.net/, https://www.oignon.net/, , , http://www.oignon.net/dist/, https://www.oignon.net/dist/, , , Sat Feb 1 14:21:23 2014 +root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, True, False, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Sat Feb 1 14:21:23 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, , , Sat Feb 1 14:21:23 2014 citizen428 AT gmail DOT com, [[:bbs:]], DE, Germany, Europe, True, False, No, http://tor.blingblingsquad.net/, https://tor.blingblingsquad.net/, , , http://tor.blingblingsquad.net/dist/, https://tor.blingblingsquad.net/dist/, , , -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/, , , Sat Jan 25 21:32:38 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/, , , Sat Feb 1 14:21:23 2014 Tor Fan, Tor Supporter, US, United States, US, True, False, No, , , , , http://www.netgull.com/torproject/, , , , -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 14 06:07:13 2014 -Tor Fan, cyberarmy, AT, Austria, AT, True, False, No, http://tor.cyberarmy.at/, , , , , , , , Sat Jan 25 21:32:38 2014 -Tor Fan, Tor Supporter, DE, Germany, DE, True, False, No, http://torproject.cryptowars.info/, https://torproject.cryptowars.info/, rsync://torproject.cryptowars.info/, , http://torproject.cryptowars.info/dist/, https://torproject.cryptowars.info/dist/, , , Sat Jan 25 21:32:38 2014 -hostmaster AT zombiewerks DOT com, TheOnionRouter, IS, Iceland, Iceland, True, False, No, http://theonionrouter.com/, , , , http://theonionrouter.com/dist/, , , , Sat Jan 25 21:32:38 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/, , , Sat Jan 25 21:32:38 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/, , , , Sat Jan 25 21:32:38 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, , Sat Jan 25 21:32:38 2014 +paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, True, False, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Sat Feb 1 14:21:23 2014 +Tor Fan, cyberarmy, AT, Austria, AT, True, False, No, http://tor.cyberarmy.at/, , , , , , , , Sat Feb 1 14:21:23 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, True, False, No, http://torproject.cryptowars.info/, https://torproject.cryptowars.info/, rsync://torproject.cryptowars.info/, , http://torproject.cryptowars.info/dist/, https://torproject.cryptowars.info/dist/, , , Sat Feb 1 14:21:23 2014 +hostmaster AT zombiewerks DOT com, TheOnionRouter, IS, Iceland, Iceland, True, False, No, http://theonionrouter.com/, , , , http://theonionrouter.com/dist/, , , , Sat Feb 1 14:21:23 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/, , , Sat Feb 1 14:21:23 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/, , , , Sat Feb 1 14:21:23 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, , Sat Feb 1 14:21:23 2014 Tor Fan, Tor Supporter, US, United States, US, True, False, No, , , , ftp://mirrors.go-parts.com/tor/, http://mirrors.go-parts.com/tor/dist/, , rsync://mirrors.go-parts.com/mirrors/tor/, , Wed Jan 8 16:41:17 2014 Tor Fan, NW Linux, US, WA, US, True, False, No, http://torproject.nwlinux.us/, , rsync://nwlinux.us/tor-web, , http://torproject.nwlinux.us/dist/, , rsync://nwlinux.us/tor-dist, , -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/, Sat Jan 25 21:32:38 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/, Sat Feb 1 14:21:23 2014 Tor Fan, Tor Supporter, NL, The Netherlands, NL, True, False, No, , , , , , https://www.coevoet.nl/tor/dist/, , , -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/, , , Sat Jan 25 21:32:38 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/, , , Sat Feb 1 14:21:23 2014 Tor Fan, Tor Supporter, FR, France, FR, True, False, No, http://torproject.c3l.lu/, , , , http://torproject.c3l.lu/dist/, , , , Wed Dec 25 05:35:51 2013 -Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, True, False, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Sat Jan 25 21:32:38 2014 +Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, True, False, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Sat Feb 1 14:21:23 2014 Tor Fan, LazyTiger, FR, France, FR, True, False, No, http://tor.taiga-san.net/, , , , http://tor.taiga-san.net/dist/, , , , Tor Fan, Tor Supporter, EE, Estonia, EE, True, False, No, http://tor.li/, https://tor.li/, , , http://tor.li/dist/, https://tor.li/dist/, , , -Tor Fan, homosu, SE, Sweden, SE, True, False, No, http://tor.homosu.net/, , , , http://tor.homosu.net/dist/, , , , Sat Jan 25 21:32:38 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/, , , Sat Jan 25 21:32:38 2014 -barkerjr(a)gmail.com, BarkerJr, LU, Luxemborg, LU, TRUE, TRUE, No, http://www.tor.lu, https://www.tor.lu, , , http://www.tor.lu/dist/, https://www.tor.lu/dist/, , , Sat Jan 25 21:32:38 2014 -Tor Fan, DevRandom, NL, The Netherlands, NL, TRUE, FALSE, No, http://devrandom.co/tor-mirror, https://devrandom.co/tor-mirror, , , http://devrandom.co/tor-mirror/dist, https://devrandom.co/tor-mirror/dist, , , Sat Jan 25 21:32:38 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/, , , Sat Jan 25 21:32:38 2014 -postmaster(a)otivpn.com, otivpn.com, US, United States, US, TRUE, FALSE, Yes, http://otivpn.com/tor/, https://otivpn.com/tor/, , , http://otivpn.com/tor/dist, https://otivpn.com/tor/dist, , https://l4aujgukgr2osawn.onion/, Sat Jan 25 21:32:38 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/, , , Sat Jan 25 21:32:38 2014 -tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Sat Jan 25 21:32:38 2014 -Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Sat Jan 25 21:32:38 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/, , , Sat Jan 25 21:32:38 2014 -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 Jan 25 21:32:38 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, Sat Jan 25 21:32:38 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/, , Sat Jan 25 21:32:38 2014 -mirrors(a)dev-null.io,dev-null.io,NL,The Netherlands,NL,TRUE,FALSE,NO,http://tor.dev-null.io/,https://tor.dev-null.io/,,,http://tor.dev-null.io/dist/,https://tor.dev-null.io/dist/,,, +Tor Fan, homosu, SE, Sweden, SE, True, False, No, http://tor.homosu.net/, , , , http://tor.homosu.net/dist/, , , , Sat Feb 1 14:21:23 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/, , , Sat Feb 1 14:21:23 2014 +barkerjr(a)gmail.com, BarkerJr, LU, Luxemborg, LU, TRUE, TRUE, No, http://www.tor.lu, https://www.tor.lu, , , http://www.tor.lu/dist/, https://www.tor.lu/dist/, , , Sat Feb 1 14:21:23 2014 +Tor Fan, DevRandom, NL, The Netherlands, NL, TRUE, FALSE, No, http://devrandom.co/tor-mirror, https://devrandom.co/tor-mirror, , , http://devrandom.co/tor-mirror/dist, https://devrandom.co/tor-mirror/dist, , , Sat Feb 1 14:21:23 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/, , , Sat Feb 1 14:21:23 2014 +postmaster(a)otivpn.com, otivpn.com, US, United States, US, TRUE, FALSE, Yes, http://otivpn.com/tor/, https://otivpn.com/tor/, , , http://otivpn.com/tor/dist, https://otivpn.com/tor/dist, , https://l4aujgukgr2osawn.onion/, Sat Feb 1 14:21:23 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/, , , Sat Feb 1 14:21:23 2014 +tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Sat Feb 1 14:21:23 2014 +Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Sat Feb 1 14:21:23 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/, , , Sat Feb 1 14:21:23 2014 +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 Feb 1 14:21:23 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, Sat Feb 1 14:21:23 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/, , Sat Feb 1 14:21:23 2014 +mirrors(a)dev-null.io, dev-null.io, NL, The Netherlands, NL, TRUE, FALSE, NO, http://tor.dev-null.io/, https://tor.dev-null.io/, , , http://tor.dev-null.io/dist/, https://tor.dev-null.io/dist/, , ,

1 0

[flashproxy/master] Make version number extraction compatible with Python 2.6.
by dcf＠torproject.org 02 Feb '14

02 Feb '14

commit aa82bea89021bf75417920f86d972fc21ff09408 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 1 17:54:25 2014 -0800 Make version number extraction compatible with Python 2.6. --- setup-common.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup-common.py b/setup-common.py index bcfdb71..ffe7c33 100755 --- a/setup-common.py +++ b/setup-common.py @@ -25,7 +25,10 @@ import sys from setuptools import setup, find_packages -version = subprocess.check_output(["sh", "version.sh"]).strip() +p = subprocess.Popen(["sh", "version.sh"], stdout=subprocess.PIPE) +output, _ = p.communicate() +assert p.poll() == 0 +version = output.strip() setup( name = "flashproxy-common",

1 0

[flashproxy/master] Raise ValueError on non-integer port in format_addr.
by dcf＠torproject.org 02 Feb '14

02 Feb '14

commit 15e76754dfa01aa77de3c4c906887976c0b479d9 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 1 17:21:36 2014 -0800 Raise ValueError on non-integer port in format_addr. --- flashproxy/util.py | 1 + 1 file changed, 1 insertion(+) diff --git a/flashproxy/util.py b/flashproxy/util.py index 63cdef5..bf3950a 100644 --- a/flashproxy/util.py +++ b/flashproxy/util.py @@ -116,6 +116,7 @@ def format_addr(addr): else: host_str = u"%s" % host if port is not None: + port = int(port) if not (0 < port <= 65535): raise ValueError("port must be between 1 and 65535 (is %d)" % port) port_str = u":%d" % port

1 0

[flashproxy/master] Add tests for flashproxy.util.format_addr.
by dcf＠torproject.org 02 Feb '14

02 Feb '14

commit 6cf2eb6266af506d58a0cd4221cb1b94b854d84c Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 1 17:21:16 2014 -0800 Add tests for flashproxy.util.format_addr. --- flashproxy/test/test_util.py | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/flashproxy/test/test_util.py b/flashproxy/test/test_util.py index e095f38..3529d23 100644 --- a/flashproxy/test/test_util.py +++ b/flashproxy/test/test_util.py @@ -3,7 +3,7 @@ import socket import unittest -from flashproxy.util import parse_addr_spec, canonical_ip, addr_family +from flashproxy.util import parse_addr_spec, canonical_ip, addr_family, format_addr class ParseAddrSpecTest(unittest.TestCase): def test_ipv4(self): @@ -50,5 +50,42 @@ class AddrFamilyTest(unittest.TestCase): def test_name(self): self.assertRaises(socket.gaierror, addr_family, "localhost") +class FormatAddrTest(unittest.TestCase): + def test_none_none(self): + self.assertRaises(ValueError, format_addr, (None, None)) + + def test_none_port(self): + self.assertEqual(format_addr((None, 1234)), ":1234") + + def test_none_invalid(self): + self.assertRaises(ValueError, format_addr, (None, "string")) + + def test_ipv4_none(self): + self.assertEqual(format_addr(("1.2.3.4", None)), "1.2.3.4") + + def test_ipv4_port(self): + self.assertEqual(format_addr(("1.2.3.4", 1234)), "1.2.3.4:1234") + + def test_ipv4_invalid(self): + self.assertRaises(ValueError, format_addr, ("1.2.3.4", "string")) + + def test_ipv6_none(self): + self.assertEqual(format_addr(("1:2::3:4", None)), "[1:2::3:4]") + + def test_ipv6_port(self): + self.assertEqual(format_addr(("1:2::3:4", 1234)), "[1:2::3:4]:1234") + + def test_ipv6_invalid(self): + self.assertRaises(ValueError, format_addr, ("1:2::3:4", "string")) + + def test_name_none(self): + self.assertEqual(format_addr(("localhost", None)), "localhost") + + def test_name_port(self): + self.assertEqual(format_addr(("localhost", 1234)), "localhost:1234") + + def test_name_invalid(self): + self.assertRaises(ValueError, format_addr, ("localhost", "string")) + if __name__ == "__main__": unittest.main()

1 0

[flashproxy/master] Add flashproxy.util.addr_family function.
by dcf＠torproject.org 02 Feb '14

02 Feb '14

commit 7787056bc7055bfe8efc5df0af20ca9e13a1ffaa Author: David Fifield <david(a)bamsoftware.com> Date: Sat Feb 1 17:03:33 2014 -0800 Add flashproxy.util.addr_family function. --- flashproxy/test/test_util.py | 13 ++++++++++++- flashproxy/util.py | 9 +++++++-- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/flashproxy/test/test_util.py b/flashproxy/test/test_util.py index 935dd1f..e095f38 100644 --- a/flashproxy/test/test_util.py +++ b/flashproxy/test/test_util.py @@ -1,8 +1,9 @@ #!/usr/bin/env python +import socket import unittest -from flashproxy.util import parse_addr_spec, canonical_ip +from flashproxy.util import parse_addr_spec, canonical_ip, addr_family class ParseAddrSpecTest(unittest.TestCase): def test_ipv4(self): @@ -39,5 +40,15 @@ class ParseAddrSpecTest(unittest.TestCase): """Test that canonical_ip does not do DNS resolution by default.""" self.assertRaises(ValueError, canonical_ip, *parse_addr_spec("example.com:80")) +class AddrFamilyTest(unittest.TestCase): + def test_ipv4(self): + self.assertEqual(addr_family("1.2.3.4"), socket.AF_INET) + + def test_ipv6(self): + self.assertEqual(addr_family("1:2::3:4"), socket.AF_INET6) + + def test_name(self): + self.assertRaises(socket.gaierror, addr_family, "localhost") + if __name__ == "__main__": unittest.main() diff --git a/flashproxy/util.py b/flashproxy/util.py index a53bdad..63cdef5 100644 --- a/flashproxy/util.py +++ b/flashproxy/util.py @@ -95,6 +95,12 @@ def canonical_ip(host, port, af=0): except that the host param must already be an IP address.""" return resolve_to_ip(host, port, af, gai_flags=socket.AI_NUMERICHOST) +def addr_family(ip): + """Return the address family of an IP address. Raises socket.gaierror if ip + is not a numeric IP.""" + addrs = socket.getaddrinfo(ip, 0, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) + return addrs[0][0] + def format_addr(addr): host, port = addr host_str = u"" @@ -102,8 +108,7 @@ def format_addr(addr): if host is not None: # Numeric IPv6 address? try: - addrs = socket.getaddrinfo(host, port, 0, socket.SOCK_STREAM, socket.IPPROTO_TCP, socket.AI_NUMERICHOST) - af = addrs[0][0] + af = addr_family(host) except socket.gaierror, e: af = 0 if af == socket.AF_INET6:

1 0