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

[tor/master] Merge remote-tracking branch 'public/bug9963_v2_024'
by nickm＠torproject.org 18 Apr '14

18 Apr '14

commit 0cca8dc35a4e59944b83db0a36c7033e09fb98b4 Merge: b8fe8ee 5b36f0d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 18 15:25:36 2014 -0400 Merge remote-tracking branch 'public/bug9963_v2_024' changes/bug9963 | 5 +++++ src/or/control.c | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) diff --cc src/or/control.c index c917052,27aeab1..2815b79 mode 100755,100644..100755 --- a/src/or/control.c +++ b/src/or/control.c

1 0

[tor/master] Log descriptor-download bootstrapping messages less verbosely
by nickm＠torproject.org 18 Apr '14

18 Apr '14

commit 5b36f0d7e78db369da0552ca8fad53b7f202aece Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Mar 27 11:23:53 2014 -0400 Log descriptor-download bootstrapping messages less verbosely This is a fix for 9963. I say this is a feature, but if it's a bugfix, it's a bugfix on 0.2.4.18-rc. Old behavior: Mar 27 11:02:19.000 [notice] Bootstrapped 50%: Loading relay descriptors. Mar 27 11:02:20.000 [notice] Bootstrapped 51%: Loading relay descriptors. Mar 27 11:02:20.000 [notice] Bootstrapped 52%: Loading relay descriptors. ... [Many lines omitted] ... Mar 27 11:02:29.000 [notice] Bootstrapped 78%: Loading relay descriptors. Mar 27 11:02:33.000 [notice] We now have enough directory information to build circuits. New behavior: Mar 27 11:16:17.000 [notice] Bootstrapped 50%: Loading relay descriptors Mar 27 11:16:19.000 [notice] Bootstrapped 55%: Loading relay descriptors Mar 27 11:16:21.000 [notice] Bootstrapped 60%: Loading relay descriptors Mar 27 11:16:21.000 [notice] Bootstrapped 65%: Loading relay descriptors Mar 27 11:16:21.000 [notice] Bootstrapped 70%: Loading relay descriptors Mar 27 11:16:21.000 [notice] Bootstrapped 75%: Loading relay descriptors Mar 27 11:16:21.000 [notice] We now have enough directory information to build circuits. --- changes/bug9963 | 5 +++++ src/or/control.c | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) diff --git a/changes/bug9963 b/changes/bug9963 new file mode 100644 index 0000000..b8b95f2 --- /dev/null +++ b/changes/bug9963 @@ -0,0 +1,5 @@ + o Minor features: + - Don't log so many notice-level bootstrapping messages at startup about + downloading descriptors. Previously, we'd log a notice whenever we + learned about more routers. Now, we only log a notice at every 5% of + progress. Fixes bug 9963. diff --git a/src/or/control.c b/src/or/control.c index a88de12..27aeab1 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4636,16 +4636,28 @@ bootstrap_status_to_string(bootstrap_status_t s, const char **tag, * Tor initializes. */ static int bootstrap_percent = BOOTSTRAP_STATUS_UNDEF; +/** As bootstrap_percent, but holds the bootstrapping level at which we last + * logged a NOTICE-level message. We use this, plus BOOTSTRAP_PCT_INCREMENT, + * to avoid flooding the log with a new message every time we get a few more + * microdescriptors */ +static int notice_bootstrap_percent = 0; + /** How many problems have we had getting to the next bootstrapping phase? * These include failure to establish a connection to a Tor relay, * failures to finish the TLS handshake, failures to validate the * consensus document, etc. */ static int bootstrap_problems = 0; -/* We only tell the controller once we've hit a threshold of problems +/** We only tell the controller once we've hit a threshold of problems * for the current phase. */ #define BOOTSTRAP_PROBLEM_THRESHOLD 10 +/** When our bootstrapping progress level changes, but our bootstrapping + * status has not advanced, we only log at NOTICE when we have made at least + * this much progress. + */ +#define BOOTSTRAP_PCT_INCREMENT 5 + /** Called when Tor has made progress at bootstrapping its directory * information and initial circuits. * @@ -4665,7 +4677,7 @@ control_event_bootstrap(bootstrap_status_t status, int progress) * can't distinguish what the connection is going to be for. */ if (status == BOOTSTRAP_STATUS_HANDSHAKE) { if (bootstrap_percent < BOOTSTRAP_STATUS_CONN_OR) { - status = BOOTSTRAP_STATUS_HANDSHAKE_DIR; + status = BOOTSTRAP_STATUS_HANDSHAKE_DIR; } else { status = BOOTSTRAP_STATUS_HANDSHAKE_OR; } @@ -4673,9 +4685,19 @@ control_event_bootstrap(bootstrap_status_t status, int progress) if (status > bootstrap_percent || (progress && progress > bootstrap_percent)) { + int loglevel = LOG_NOTICE; bootstrap_status_to_string(status, &tag, &summary); - tor_log(status ? LOG_NOTICE : LOG_INFO, LD_CONTROL, - "Bootstrapped %d%%: %s.", progress ? progress : status, summary); + + if (status <= bootstrap_percent && + (progress < notice_bootstrap_percent + BOOTSTRAP_PCT_INCREMENT)) { + /* We log the message at info if the status hasn't advanced, and if less + * than BOOTSTRAP_PCT_INCREMENT progress has been made. + */ + loglevel = LOG_INFO; + } + + tor_log(loglevel, LD_CONTROL, + "Bootstrapped %d%%: %s", progress ? progress : status, summary); tor_snprintf(buf, sizeof(buf), "BOOTSTRAP PROGRESS=%d TAG=%s SUMMARY=\"%s\"", progress ? progress : status, tag, summary); @@ -4691,6 +4713,11 @@ control_event_bootstrap(bootstrap_status_t status, int progress) bootstrap_percent = progress; bootstrap_problems = 0; /* Progress! Reset our problem counter. */ } + if (loglevel == LOG_NOTICE && + bootstrap_percent > notice_bootstrap_percent) { + /* Remember that we gave a notice at this level. */ + notice_bootstrap_percent = bootstrap_percent; + } } }

1 0

[tor/master] Improved message when running sandbox on Linux without libseccomp
by nickm＠torproject.org 18 Apr '14

18 Apr '14

commit b8fe8ee7486f43b33ccd5cfad99a5e87a7d246f6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 18 14:49:39 2014 -0400 Improved message when running sandbox on Linux without libseccomp Previously we said "Sandbox is not implemented on this platform" on Linux boxes without libseccomp. Now we say that you need to build Tor built with libseccomp. Fixes bug 11543; bugfix on 0.2.5.1-alpha. --- changes/11543 | 8 ++++++++ src/common/sandbox.c | 18 ++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/changes/11543 b/changes/11543 new file mode 100644 index 0000000..ebc22f7 --- /dev/null +++ b/changes/11543 @@ -0,0 +1,8 @@ + o Minor bugfixes: + + - Improve the warning message when trying to enable the Linux + sandbox code on a Tor built without libseccomp. Instead of + saying "Sandbox is not implemented on this platform", we now + explain that we to need be built with libseccomp. Fixes bug + 11543; bugfix on 0.2.5.1-alpha. + diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 4224e03..4ce9aa9 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -1613,21 +1613,19 @@ sandbox_init(sandbox_cfg_t *cfg) #if defined(USE_LIBSECCOMP) return initialise_libseccomp_sandbox(cfg); -#elif defined(_WIN32) +#elif defined(__linux__) (void)cfg; - log_warn(LD_BUG,"Windows sandboxing is not implemented. The feature is " - "currently disabled."); + log_warn(LD_GENERAL, + "This version of Tor was built without support for sanboxing. To " + "build with support for sandboxing on Linux, you must have " + "libseccomp and its necessary header files (e.g. seccomp.h)."); return 0; -#elif defined(TARGET_OS_MAC) - (void)cfg; - log_warn(LD_BUG,"Mac OSX sandboxing is not implemented. The feature is " - "currently disabled"); - return 0; #else (void)cfg; - log_warn(LD_BUG,"Sandboxing is not implemented for your platform. The " - "feature is currently disabled"); + log_warn(LD_GENERAL, + "Currently, sandboxing is only implemented on Linux. The feature " + "is disabled on your platform."); return 0; #endif }

1 0

r26716: {website} add two anchors for mirror operators (website/trunk/docs/en)
by Andrew Lewman 18 Apr '14

18 Apr '14

Author: phobos Date: 2014-04-18 18:31:20 +0000 (Fri, 18 Apr 2014) New Revision: 26716 Modified: website/trunk/docs/en/running-a-mirror.wml Log: add two anchors for mirror operators Modified: website/trunk/docs/en/running-a-mirror.wml =================================================================== --- website/trunk/docs/en/running-a-mirror.wml 2014-04-18 16:08:12 UTC (rev 26715) +++ website/trunk/docs/en/running-a-mirror.wml 2014-04-18 18:31:20 UTC (rev 26716) @@ -19,7 +19,7 @@ to make the initial setup and ongoing maintenance a minimal effort. The Tor website and distribution directory currently require 8.0 GB of disk space.</p> - + <h2><a class="anchor" href="#sysconfig">Configuring your System</a></h2> <p> If you would like to run a mirror, it's as easy as this command to download everything a mirror should share with the world: @@ -112,12 +112,14 @@ binary releases change often. An update frequency of six hours is recommended. Tor users everywhere will thank you. </p> <br/> + <h2><a class="anchor" href="#mirrorops">Joining the mirror community</a></h2> <p> If you are running a mirror, please subscribe to the <A href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-mirrors">tor-mirrors mailing list</A>, and introduce yourself there. Help for mirror support and configuration issues may also be found on the list. </p> + <p> In order to add your mirror, please send a single, comma delimited line of text based on <a @@ -129,7 +131,7 @@ (such as Akamai, Cloudflare, Fastly, etc), as most of them block access from countries where the mirror is needed the most.</li> <li> Try not to redirect http to https. Many places in the world - cannot use https due to firewalling.</li> + cannot use https due to local or national firewalls.</li> </ol> </p> </div>

1 0

[tor-browser-bundle/master] Bug 11552: Back out HTTPS-Everywhere version bump.
by gk＠torproject.org 18 Apr '14

18 Apr '14

commit ef1ac0c2de37bc8e66e078584424492c29f31e7a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Apr 18 20:06:30 2014 +0000 Bug 11552: Back out HTTPS-Everywhere version bump. Testing on Linux as well would be a good idea in the future... --- gitian/versions | 3 ++- gitian/versions.alpha | 3 ++- gitian/versions.beta | 3 ++- gitian/versions.nightly | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/gitian/versions b/gitian/versions index addcb3b..3c82a79 100755 --- a/gitian/versions +++ b/gitian/versions @@ -9,7 +9,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build1 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.4.4 TORBUTTON_TAG=1.6.7.0 -HTTPSE_TAG=3.5 +# XXX: 3.5 requires python2.7, see #11556 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 56192a8..ae1fcb8 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -10,7 +10,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.5.3-alpha TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -HTTPSE_TAG=3.5 +# XXX: 3.5 requires python2.7, see #11556 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.beta b/gitian/versions.beta index 95e7235..bf2030e 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -10,7 +10,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1-build2 TOR_TAG=tor-0.2.4.21 TORLAUNCHER_TAG=0.2.5.3 TORBUTTON_TAG=1.6.8.1 -HTTPSE_TAG=3.5 +# XXX: 3.5 requires python2.7, see #11556 +HTTPSE_TAG=3.4.5 NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 74455b6..f483670 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -10,7 +10,8 @@ TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-1 TOR_TAG=master TORLAUNCHER_TAG=master TORBUTTON_TAG=master -HTTPSE_TAG=3.5 # XXX: Master and 4.0 require python2.7 +# XXX: Master and 3.5 require python2.7, see #11556 +HTTPSE_TAG=3.4.5 NSIS_TAG=master ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable

1 0

r26715: {website} update mirror status (website/trunk/include)
by Andrew Lewman 18 Apr '14

18 Apr '14

Author: phobos Date: 2014-04-18 16:08:12 +0000 (Fri, 18 Apr 2014) New Revision: 26715 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-04-17 22:11:00 UTC (rev 26714) +++ website/trunk/include/mirrors-table.wmi 2014-04-18 16:08:12 UTC (rev 26715) @@ -205,23 +205,6 @@ <tr> - <td>INT</td> - - <td>CoralCDN</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> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>AT</td> <td>Tor Supporter</td> @@ -290,6 +273,23 @@ <tr> + <td>LT</td> + + <td>Tor Supporter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>MX</td> <td>Tor Supporter</td> @@ -307,6 +307,57 @@ <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> + + <td> - </td> + <td><a href="http://mirror.hessmo.com/tor/dist/">http</a></td> + <td><a href="http://mirror.hessmo.com/tor/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + + <td>IN</td> + + <td>India Tor Fans</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://www.torproject.org.in/dist/">http</a></td> + <td><a href="http://www.torproject.org.in/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>FR</td> <td>linsrv</td> @@ -664,23 +715,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> @@ -851,6 +885,23 @@ <tr> + <td>DE</td> + + <td>Tor Supporter</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.hoi-polloi.org/dist/">http</a></td> + <td><a href="http://tor.hoi-polloi.org">http</a></td> + <td><a href="http://tor.hosi-polloi.or/dist/g">https</a></td> + <td><a href="http://tor.hossi-polloiorg">https</a></td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td>EFF</td> @@ -919,51 +970,17 @@ <tr> - <td>LT</td> + <td>DE</td> <td>Tor Supporter</td> <td>Up to date</td> <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> + <td><a href="http://tor.miglix.eu/dist/">http</a></td> + <td><a href="http://tor.miglix.eu">http</a></td> + <td><a href="https://tor.miglix.eu/dist/">https</a></td> + <td><a href="https://tor.miglix.eu">https</a></td> <td> - </td> <td> - </td> - <td> - </td> - <td> - </td> </tr> - -<tr> - - <td>US</td> - - <td>AskApache</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>IN</td> - - <td>India Tor Fans</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://www.torproject.org.in/dist/">http</a></td> - <td><a href="http://www.torproject.org.in/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-04-17 22:11:00 UTC (rev 26714) +++ website/trunk/include/tor-mirrors.csv 2014-04-18 16:08:12 UTC (rev 26715) @@ -1,93 +1,93 @@ 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/, , , , Tue Feb 11 08:42:17 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/, , , , Sun Apr 13 08:04:43 2014 -http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Sun Apr 13 08:04:43 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/, , , , Wed Apr 16 16:29:40 2014 +http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, TRUE, TRUE, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Wed Apr 16 16:29:40 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/, , , , Sun Apr 13 08:04:43 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/, , , Sun Apr 13 08:04:43 2014 +haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, FALSE, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Wed Apr 16 16:29:40 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/, , , Wed Apr 16 16:29:40 2014 Tor Fan, Tor Supporter, US, United States, US, TRUE, FALSE, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Tue Apr 8 23:51:05 2014 -margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Sun Apr 13 08:04:43 2014 -Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://torproject.is/, , , , http://torproject.is/dist/, , , , Sun Apr 13 08:04:43 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, , Sun Apr 13 08:04:43 2014 -Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Sun Apr 13 08:04:43 2014 -Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Sun Apr 13 08:04:43 2014 -security AT hostoffice DOT hu, Unknown, HU, Hungary, Europe, TRUE, FALSE, No, http://mirror.tor.hu/, , , , http://mirror.tor.hu/dist/, , , , Sun Apr 13 08:04:43 2014 +margus.random at mail.ee, CyberSIDE, EE, Estonia, EE, TRUE, FALSE, No, http://cyberside.planet.ee/tor/, , , , http://cyberside.net.ee/tor/, , , , Wed Apr 16 16:29:40 2014 +Tor Fan, torproject.is, IS, Iceland, IS, TRUE, FALSE, No, http://torproject.is/, , , , http://torproject.is/dist/, , , , Wed Apr 16 16:29:40 2014 +Tor Fan, spline, DE, Germany, DE, TRUE, FALSE, No, http://tor.spline.de/, https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, ftp://ftp.spline.de/pub/tor, http://tor.spline.de/dist/, https://tor.spline.inf.fu-berlin.de/dist/, rsync://ftp.spline.de/tor/dist, , Wed Apr 16 16:29:40 2014 +Tor Fan, me0w.cc, RO, Romania, RO, TRUE, FALSE, No, http://tor.me0w.cc/, , , , http://tor.me0w.cc/dist/, , , , Wed Apr 16 16:29:40 2014 +Tor Fan, borgmann.tv, DE, Germany, DE, TRUE, FALSE, No, http://tor.borgmann.tv/, , , , http://tor.borgmann.tv/dist/, , , , Wed Apr 16 16:29:40 2014 +security AT hostoffice DOT hu, Unknown, HU, Hungary, Europe, TRUE, FALSE, No, http://mirror.tor.hu/, , , , http://mirror.tor.hu/dist/, , , , Wed Apr 16 16:29:40 2014 Tor Fan, Tor Supporter, TN, Tunisia, TN, TRUE, FALSE, No, http://torproject.antagonism.org/, https://torproject.antagonism.org/, , , , , , , Sun Mar 2 06:08:00 2014 -webmaster AT ccc DOT de, CCC, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.ccc.de/, , , , http://tor.ccc.de/dist/, , , , Sun Apr 13 08:04:43 2014 +webmaster AT ccc DOT de, CCC, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.ccc.de/, , , , http://tor.ccc.de/dist/, , , , Wed Apr 16 16:29:40 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/, , , , Sun Apr 13 08:04:43 2014 +Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, TRUE, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Wed Apr 16 16:29:40 2014 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/, , , , Sun Apr 13 08:04:43 2014 +mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, TRUE, FALSE, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Wed Apr 16 16:29:40 2014 coralcdn.org, CoralCDN, INT, International, INT, TRUE, FALSE, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , Sun Apr 13 08:04:43 2014 Tor Fan, Tor Supporter, US, United States, US, TRUE, TRUE, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Tue Feb 11 08:42:17 2014 -Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Sun Apr 13 08:04:43 2014 +Tor Fan, Tor Supporter, AT, Austria, AT, TRUE, FALSE, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Wed Apr 16 16:29:40 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/, , , , Sun Apr 13 08:04:43 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/, , , , Wed Apr 16 16:29:40 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/, Tue Feb 11 08:42:17 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, , Sun Apr 13 08:04:43 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/, , , Sun Apr 13 08:04:43 2014 -Tor Fan, Tor Supporter, LT, Lithuania, LT, TRUE, FALSE, No, http://tor.vesta.nu/, , , , http://tor.vesta.nu/dist/, , , , Sat Apr 12 04:02:54 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/, , , Sun Apr 13 08:04:43 2014 + mail AT benjamin-meier DOT info, beme it, DE, Germany, DE, TRUE, FALSE, No, http://tor.beme-it.de/, https://tor.beme-it.de/, rsync://tor.beme-it.de/tor, , http://tor.beme-it.de/dist/, https://tor.beme-it.de/dist/, rsync://tor.beme-it.de/tor/dist, , Wed Apr 16 16:29:40 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/, , , Wed Apr 16 16:29:40 2014 +Tor Fan, Tor Supporter, LT, Lithuania, LT, TRUE, FALSE, No, http://tor.vesta.nu/, , , , http://tor.vesta.nu/dist/, , , , Wed Apr 16 16:29:40 2014 +Tor Fan, Tor Supporter, MX, Mexico, MX, TRUE, FALSE, No, http://fbnaia.homelinux.net/torproject/, https://fbnaia.homelinux.net/torproject/, , , http://fbnaia.homelinux.net/torproject/dist/, https://fbnaia.homelinux.net/torproject/dist/, , , Wed Apr 16 16:29:40 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 Apr 12 04:02:54 2014 +webmaster AT askapache DOT com, AskApache, US, California, US, TRUE, FALSE, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Wed Apr 16 16:29:40 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/, , , , Tue Apr 8 03:19:48 2014 +Tor Fan, hessmo, US, United States, US, TRUE, FALSE, No, http://mirror.hessmo.com/tor/, , , , http://mirror.hessmo.com/tor/dist/, , , , Wed Apr 16 16:29:40 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/, , , Sun Mar 2 06:08:00 2014 -Tor Fan, India Tor Fans, IN, India, IN, TRUE, FALSE, No, http://www.torproject.org.in/, , , , http://www.torproject.org.in/dist/, , , , Sat Apr 12 04:02:54 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, , Sun Apr 13 08:04:43 2014 -Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Sun Apr 13 08:04:43 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, , , Sun Apr 13 08:04:43 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/, , , Sun Apr 13 08:04:43 2014 +Tor Fan, India Tor Fans, IN, India, IN, TRUE, FALSE, No, http://www.torproject.org.in/, , , , http://www.torproject.org.in/dist/, , , , Wed Apr 16 16:29:40 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, , Wed Apr 16 16:29:40 2014 +Tor Fan, Tor Supporter, FR, France, FR, TRUE, FALSE, No, http://tor.mirror.chekanov.net/, , , , http://tor.mirror.chekanov.net/dist/, , , , Wed Apr 16 16:29:40 2014 +http://sebastian.pfeifer.or.at/, TechAsk.IT, AT, Favoriten, Wien, TRUE, TRUE, No, http://www.unicorncloud.org/public/torproject.org/, https://www.unicorncloud.org/public/torproject.org/, , , http://www.unicorncloud.org/public/torproject.org/dist, https://www.unicorncloud.org/public/torproject.org/dist, , , Wed Apr 16 16:29:40 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/, , , Wed Apr 16 16:29:40 2014 root AT amorphis DOT eu, Amorphis, NL, The Netherlands, Europe, TRUE, FALSE, No, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Thu Feb 6 17:28:24 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, , , Sun Apr 13 08:04:43 2014 +hackthissite.org, HackThisSite.org, US, United States, US, TRUE, TRUE, No, http://tor.hackthissite.org/, https://tor.hackthissite.org/, , , http://mirror.hackthissite.org/tor, https://mirror.hackthissite.org/tor, , , Wed Apr 16 16:29:40 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/, , , Sun Apr 13 08:04:43 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , Wed Apr 16 16:29:40 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, , , , Sun Apr 13 08:04:43 2014 -Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Sun Apr 13 08:04:43 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/, , , Sun Apr 13 08:04:43 2014 -hostmaster AT zombiewerks DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://theonionrouter.com/, , , , http://theonionrouter.com/dist/, , , , Sun Apr 13 08:04:43 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/, , , Sun Apr 13 08:04:43 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/, , , , Sun Apr 13 08:04:43 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, , Sun Apr 13 08:04:43 2014 +paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, TRUE, FALSE, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Wed Apr 16 16:29:40 2014 +Tor Fan, cyberarmy, AT, Austria, AT, TRUE, FALSE, No, http://tor.cyberarmy.at/, , , , , , , , Wed Apr 16 16:29:40 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/, , , Wed Apr 16 16:29:40 2014 +hostmaster AT zombiewerks DOT com, TheOnionRouter, IS, Iceland, Iceland, TRUE, FALSE, No, http://theonionrouter.com/, , , , http://theonionrouter.com/dist/, , , , Wed Apr 16 16:29:40 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/, , , Wed Apr 16 16:29:40 2014 +Tor Fan, chaos darmstadt, DE, Germany, Europe, TRUE, FALSE, No, http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Wed Apr 16 16:29:40 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, , Wed Apr 16 16:29:40 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/, Sun Apr 13 08:04:43 2014 +Tor Fan, torservers, DE, Germany, DE, TRUE, FALSE, No, http://www.torservers.net/mirrors/torproject.org/, https://www.torservers.net/mirrors/torproject.org/, , , http://www.torservers.net/mirrors/torproject.org/dist/, https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Wed Apr 16 16:29:40 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/, , , Sun Apr 13 08:04:43 2014 +Tor Fan, torland, GB, United Kingdom, GB, TRUE, FALSE, No, http://mirror.torland.me/torproject.org/, https://mirror.torland.me/torproject.org/, , , http://mirror.torland.me/torproject.org/dist/, https://mirror.torland.me/torproject.org/dist/, , , Wed Apr 16 16:29:40 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/, , , , Sun Apr 13 08:04:43 2014 +Tor Fan, Lightning-bolt.net, CZ, Czech Republic, CZ, TRUE, FALSE, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Wed Apr 16 16:29:40 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/, , , , Sun Apr 13 08:04:43 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/, , , Sun Apr 13 08:04:43 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/, , , Sun Apr 13 08:04:43 2014 +Tor Fan, homosu, SE, Sweden, SE, TRUE, FALSE, No, http://tor.homosu.net/, , , , http://tor.homosu.net/dist/, , , , Wed Apr 16 16:29:40 2014 +IceBear, myRL.net, IS, Iceland, IS, TRUE, FALSE, No, http://tor.myrl.net/, https://tor.myrl.net/, , , http://tor.myrl.net/dist/, https://tor.myrl.net/dist/, , , Wed Apr 16 16:29:40 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/, , , Wed Apr 16 16:29:40 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, , , Sun Feb 2 05:50:15 2014 -kiro AT userzap DOT de, Userzap, DE, Germany, DE, TRUE, FALSE, No, http://torprojekt.userzap.de, https://torprojekt.userzap.de, , , http://torprojekt.userzap.de/dist/, https://torprojekt.userzap.de/dist/, , , Sun Apr 13 08:04:43 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/, Sun Apr 13 08:04:43 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/, , , Sun Apr 13 08:04:43 2014 -tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Sun Apr 13 08:04:43 2014 -Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Sun Apr 13 08:04:43 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/, , , Sun Apr 13 08:04:43 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/, , , , Sun Apr 13 08:04:43 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, Sun Apr 13 08:04:43 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/, , Sun Apr 13 08:04:43 2014 +kiro AT userzap DOT de, Userzap, DE, Germany, DE, TRUE, FALSE, No, http://torprojekt.userzap.de, https://torprojekt.userzap.de, , , http://torprojekt.userzap.de/dist/, https://torprojekt.userzap.de/dist/, , , Wed Apr 16 16:29:40 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/, Wed Apr 16 16:29:40 2014 +tor(a)eprci.net, EPRCI, US, United States, US, TRUE, FALSE, NO, http://tor.eprci.net/, https://www.eprci.com/tor/, , , http://tor.eprci.net/dist/, https://www.eprci.com/tor/dist/, , , Wed Apr 16 16:29:40 2014 +tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Wed Apr 16 16:29:40 2014 +Tor Fan, PW, DE, Germany, DE, TRUE, TRUE, NO, http://tor.pw.is/, , , , http://tor.pw.is/dist/, , , , Wed Apr 16 16:29:40 2014 +tor(a)stalkr.net, stalkr.net, FR, France, FR, TRUE, TRUE, NO, http://tor.stalkr.net/, https://tor.stalkr.net/, , , http://tor.stalkr.net/dist/, https://tor.stalkr.net/dist/, , , Wed Apr 16 16:29:40 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/, , , , Wed Apr 16 16:29:40 2014 +doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, Germany, DE, TRUE, FALSE, NO, https://tor-mirror.cyberguerrilla.org, , , , https://tor-mirror.cyberguerrilla.org/dist/, , , http://6dvj6v5imhny3anf.onion, Wed Apr 16 16:29:40 2014 +contact(a)gtor.org, Gtor, DE, Germany, DE, TRUE, TRUE, NO, http://torproject.gtor.org/, https://torproject.gtor.org/, rsync://torproject.gtor.org/website-mirror/, , http://torproject.gtor.org/dist/, https://torproject.gtor.org/dist/, rsync://torproject.gtor.org/website-mirror/dist/, , Wed Apr 16 16:29:40 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/, , , Thu Jan 30 02:50:25 2014 Tor Fan, Quintex Alliance Consulting, US, United States, US, TRUE, FALSE, NO, http://tor.mirror.quintex.com, , rsync://tor.mirror.quintex.com::tor, ftp://mirror.quintex.com/tor/, http://tor.mirror.quintex.com/dist, , rsync://mirror.quintex.com::tordist, , Sat Feb 1 14:21:23 2014 -SDL, SDL, US, United States, US, TRUE, TRUE, NO, http://torproject.nexiom.net, https://torproject.nexiom.net, , , http://torproject.nexiom.net, https://torproject.nexiom.net/dist, , , Sun Apr 13 08:04:43 2014 +SDL, SDL, US, United States, US, TRUE, TRUE, NO, http://torproject.nexiom.net, https://torproject.nexiom.net, , , http://torproject.nexiom.net, https://torproject.nexiom.net/dist, , , Wed Apr 16 16:29:40 2014 MacLemon, MacLemon, AT, Austria, AT, TRUE, FALSE, NO, http://tor-anonymizer.maclemon.at/, https://tor-anonymizer.maclemon.at/, , , http://tor-anonymizer.maclemon.at/dist/, https://tor-anonymizer.maclemon.at/dist/, , , Thu Mar 27 13:13:23 2014 -Tor Fan, Tor Supporter, TR, Turkey, TR, TRUE, FALSE, NO, http://tor.kslt.tk/, , , , http://tor.kslt.tk/dist/, , , , Sun Apr 13 08:04:43 2014 +Tor Fan, Tor Supporter, TR, Turkey, TR, TRUE, FALSE, NO, http://tor.kslt.tk/, , , , http://tor.kslt.tk/dist/, , , , Wed Apr 16 16:29:40 2014 Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, NO, http://tor.externenprüfung-nichtschüler.de/, , , , http://tor.externenprüfung-nichtschüler.de/dist/, , , , -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/, , , Sun Apr 13 08:04:43 2014 -Piratenpartei Bayern, Piratenpartei Bayern, DE, Germany, DE, TRUE, FALSE, NO, http://tormirror.piratenpartei-bayern.de, https://tormirror.piratenpartei-bayern.de, , , http://tormirror.piratenpartei-bayern.de/dist/, http://tormirror.piratenpartei-bayern.de/dist/, , , Sun Apr 13 08:04:43 2014 -Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://tor.hoi-polloi.org, http://tor.hossi-polloiorg, , , http://tor.hoi-polloi.org/dist/, http://tor.hosi-polloi.or/dist/g, , , Tue Apr 8 23:51:05 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://mirror.velcommuta.de/tor/, https://mirror.velcommuta.de/tor/, , , http://mirror.velcommuta.de/tor/dist/, https://mirror.velcommuta.de/tor/dist/, , , Wed Apr 16 16:29:40 2014 +Piratenpartei Bayern, Piratenpartei Bayern, DE, Germany, DE, TRUE, FALSE, NO, http://tormirror.piratenpartei-bayern.de, https://tormirror.piratenpartei-bayern.de, , , http://tormirror.piratenpartei-bayern.de/dist/, http://tormirror.piratenpartei-bayern.de/dist/, , , Wed Apr 16 16:29:40 2014 +Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, TRUE, NO, http://tor.hoi-polloi.org, http://tor.hossi-polloiorg, , , http://tor.hoi-polloi.org/dist/, http://tor.hosi-polloi.or/dist/g, , , Wed Apr 16 16:29:40 2014 Tor Fan, Tor Supporter, DE, Germany, DE, TRUE, FALSE, NO, http://tor-mirror.snurn.de, , , , http://tor-mirror.snurn.de/dist/, , , , Thu Mar 27 13:13:23 2014 -EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, , , Sun Apr 13 08:04:43 2014 -Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, , , Sun Apr 13 08:04:43 2014 -Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, http://reichster.de/mirrors/torproject.org/, https://reichster.de/mirrors/torproject.org, , , http://reichster.de/mirrors/torproject.org/dist/, https://reichster.de/mirrors/torproject.org/dist/, , , Sun Apr 13 08:04:43 2014 -jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , Sun Apr 13 08:04:43 2014 -tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, http://tor.miglix.eu, https://tor.miglix.eu,,, http://tor.miglix.eu/dist/,https://tor.miglix.eu/dist/, ,, +EFF, EFF, US, United States, US, TRUE, FALSE, NO, https://tor.eff.org, https://tor.eff.org, , , https://tor.eff.org/dist/, https://tor.eff.org/dist/, , , Wed Apr 16 16:29:40 2014 +Tor Fan, Tor Supporter, GR, Greece, GR, TRUE, TRUE, NO, https://tor.void.gr, https://tor.void.gr, , , https://tor.void.gr/dist/, https://tor.void.gr/dist/, , , Wed Apr 16 16:29:40 2014 +Ich Eben, Tor Supporter, DE, Germany, DE, TRUE, TRUE, No, http://reichster.de/mirrors/torproject.org/, https://reichster.de/mirrors/torproject.org, , , http://reichster.de/mirrors/torproject.org/dist/, https://reichster.de/mirrors/torproject.org/dist/, , , Wed Apr 16 16:29:40 2014 +jlgaddis AT gnu DOT org, Evil Routers, US, United States, US, TRUE, FALSE, No, http://tor1.evilrouters.net/, , , , http://tor1.evilrouters.net/dist/, , , , Wed Apr 16 16:29:40 2014 +tor AT miglix DOT eu, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, NO, http://tor.miglix.eu, https://tor.miglix.eu, , , http://tor.miglix.eu/dist/, https://tor.miglix.eu/dist/, , , Wed Apr 16 16:29:40 2014

1 0

[orbot/master] enable diagnostics and menu option
by n8fr8＠torproject.org 18 Apr '14

18 Apr '14

commit 16f3a53529dfd466a5a4a8c54f7a5835f06d7e7d Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 18 06:22:37 2014 -0400 enable diagnostics and menu option --- AndroidManifest.xml | 12 +----------- src/org/torproject/android/Orbot.java | 5 +++++ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7012833..09e4797 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -68,17 +68,7 @@ </activity> - <activity android:name=".OrbotDiagnosticsActivity" android:label="OrbotDiag" - android:icon="@drawable/ic_launcher" - android:theme="@style/Theme.AppCompat" - android:exported="true" - android:taskAffinity="org.torproject.android.OrbotDiagnosticsActivity" - > - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - </activity> + <activity android:name=".OrbotDiagnosticsActivity" android:label="OrbotDiag"/> <activity android:name=".wizard.LotsaText" android:exported="false"/> <activity android:name=".wizard.Permissions" android:exported="false"/> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 601b98e..2fa5f01 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -381,6 +381,11 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } + else if (item.getItemId() == R.id.menu_diag) + { + startActivity(new Intent(getBaseContext(), OrbotDiagnosticsActivity.class)); + + } else if (item.getItemId() == R.id.menu_about) { showAbout();

1 0

[orbot/master] don't kill Tor anymore; just reconnect to running instance!
by n8fr8＠torproject.org 18 Apr '14

18 Apr '14

commit 1295f5cd244dfed50b7958735ade1292c8fe6a62 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 18 06:25:35 2014 -0400 don't kill Tor anymore; just reconnect to running instance! --- src/org/torproject/android/service/TorService.java | 193 +++++++++----------- .../android/service/TorServiceConstants.java | 2 +- 2 files changed, 87 insertions(+), 108 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 48eb580..976404e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -136,25 +136,22 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { - int procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); - - if (procId != -1) - { - logNotice("Found existing Tor process"); - + + + int procId = initControlConnection(1); + + if (procId != -1) + { + sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); - currentStatus = STATUS_CONNECTING; - - initControlConnection(); - - processSettingsImpl(); + processSettingsImpl(); - currentStatus = STATUS_ON; + currentStatus = STATUS_ON; - return true; - - } + return true; + } + return false; } @@ -302,10 +299,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst setTorProfile(PROFILE_ON); } } - else if (intent == null) + else { - findExistingProc () ; - + findExistingProc(); } @@ -338,14 +334,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (currentStatus == STATUS_CONNECTING) { - boolean isRunning = findExistingProc (); - if (!isRunning) - { try { initTor(); - isRunning = true; } catch (Exception e) { @@ -355,7 +347,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst this.showToolbarNotification(getString(R.string.unable_to_start_tor) + ": " + e.getMessage(), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1, false); Log.d(TAG,"Unable to start Tor: " + e.getMessage(),e); } - } + } else if (currentStatus == STATUS_OFF) { @@ -382,8 +374,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst { currentStatus = STATUS_OFF; - boolean hasRoot = getSharedPrefs(getApplicationContext()).getBoolean("has_root", false); - try { killTorProcess (); @@ -392,11 +382,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst stopForeground(true); currentStatus = STATUS_OFF; - - clearNotifications(); - if (hasRoot) + if (mHasRoot && mEnableTransparentProxy) disableTransparentProxy(); + + clearNotifications(); sendCallbackStatusMessage(getString(R.string.status_disabled)); @@ -472,11 +462,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst conn = null; } - int maxTry = 5; - int currTry = 0; Shell shell = Shell.startShell(); - Toolbox tb = new Toolbox(shell); + + /* + * + int maxTry = 5; + int currTry = 0; while ((procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath())) != -1 && currTry++ < maxTry) { @@ -489,16 +481,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst shell.add(killCommand); killCommand = new SimpleCommand("kill -9 " + procId); shell.add(killCommand); - } + }*/ while ((procId = TorServiceUtils.findProcessId(filePrivoxy.getAbsolutePath())) != -1) { logNotice("Found Privoxy PID=" + procId + " - killing now..."); - SimpleCommand killCommand = new SimpleCommand("toolbox kill -9 " + procId); + SimpleCommand killCommand = new SimpleCommand("toolbox kill " + procId); shell.add(killCommand); - killCommand = new SimpleCommand("kill -9 " + procId); + killCommand = new SimpleCommand("kill " + procId); shell.add(killCommand); } @@ -507,9 +499,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst logNotice("Found ObfsProxy PID=" + procId + " - killing now..."); - SimpleCommand killCommand = new SimpleCommand("toolbox kill -9 " + procId); + SimpleCommand killCommand = new SimpleCommand("toolbox kill " + procId); shell.add(killCommand); - killCommand = new SimpleCommand("kill -9 " + procId); + killCommand = new SimpleCommand("kill " + procId); shell.add(killCommand); } @@ -621,12 +613,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst boolean portsAvail = checkPortsAvailable(); - if (!portsAvail) - { - logNotice("Another app is blocking Tor from starting"); - return; - } - try { initBinaries(); @@ -648,11 +634,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst currentStatus = STATUS_CONNECTING; logNotice(getString(R.string.status_starting_up)); - sendCallbackStatusMessage(getString(R.string.status_starting_up)); - killTorProcess (); - runTorShellCmd(); runPrivoxyShellCmd(); @@ -678,7 +661,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (Exception e) { - logException ("Tor socket is not available",e); + logException ("Tor socket " + port + " is not available",e); return false; } } @@ -763,8 +746,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst mTransProxy.clearTransparentProxyingAll(this); - clearNotifications(); - return true; } @@ -775,9 +756,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getAbsolutePath(); - // if (ENABLE_DEBUG_LOG) - // torrcPath = new File(appBinHome, TORRCDIAG_ASSET_KEY).getAbsolutePath(); - boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); if (transProxyTethering) @@ -792,20 +770,15 @@ public class TorService extends Service implements TorServiceConstants, TorConst sendCallbackStatusMessage(getString(R.string.status_starting_up)); //start Tor in the background - ArrayList<String> alEnv = new ArrayList<String>(); - alEnv.add("HOME=" + appBinHome.getAbsolutePath()); - Shell shell = Shell.startShell(alEnv,appBinHome.getAbsolutePath()); + Shell shell = Shell.startShell(); SimpleCommand cmdTor = new SimpleCommand(fileTor.getAbsolutePath() + " DataDirectory " + appCacheHome.getAbsolutePath() + " -f " + torrcPath + " &"); shell.add(cmdTor); - //wait a few seconds Thread.sleep(torRetryWaitTimeMS); - + //now try to connect - procId = initControlConnection (); + procId = initControlConnection (3); - shell.close(); - if (procId == -1) { @@ -877,64 +850,70 @@ public class TorService extends Service implements TorServiceConstants, TorConst return null; }*/ - private int initControlConnection () throws Exception, RuntimeException + private synchronized int initControlConnection (int maxAttempts) throws Exception, RuntimeException { - int maxAttempts = 5; int i = 0; - while (conn == null && i++ < maxAttempts) + if (conn != null) { - try + String torProcId = conn.getInfo("process/pid"); + return Integer.parseInt(torProcId); + } + else + { + + while (conn == null && i++ < maxAttempts) { - logNotice( "Connecting to control port: " + TOR_CONTROL_PORT); - - torConnSocket = new Socket(IP_LOCALHOST, TOR_CONTROL_PORT); - conn = TorControlConnection.getConnection(torConnSocket); - - - logNotice( "SUCCESS connected to control port"); - - File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); - - if (fileCookie.exists()) - { - byte[] cookie = new byte[(int)fileCookie.length()]; - DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); - fis.read(cookie); - fis.close(); - conn.authenticate(cookie); - - logNotice( "SUCCESS - authenticated to control port"); - - sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); + try + { + logNotice( "Connecting to control port: " + TOR_CONTROL_PORT); + + torConnSocket = new Socket(IP_LOCALHOST, TOR_CONTROL_PORT); + conn = TorControlConnection.getConnection(torConnSocket); - addEventHandler(); + logNotice( "SUCCESS connected to control port"); - - - String torProcId = conn.getInfo("process/pid"); + File fileCookie = new File(appCacheHome, TOR_CONTROL_COOKIE); - return Integer.parseInt(torProcId); + if (fileCookie.exists()) + { + byte[] cookie = new byte[(int)fileCookie.length()]; + DataInputStream fis = new DataInputStream(new FileInputStream(fileCookie)); + fis.read(cookie); + fis.close(); + conn.authenticate(cookie); + + logNotice( "SUCCESS - authenticated to control port"); + + sendCallbackStatusMessage(getString(R.string.tor_process_starting) + ' ' + getString(R.string.tor_process_complete)); + + addEventHandler(); + + - } - else - { - logNotice ("Tor authentication cookie does not exist yet; trying again..."); - } - } - catch (Exception ce) - { - conn = null; - logNotice( "Error connecting to Tor local control port: " + ce.getLocalizedMessage()); - - Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); + String torProcId = conn.getInfo("process/pid"); + + return Integer.parseInt(torProcId); + + } + else + { + logNotice ("Tor authentication cookie does not exist yet; trying again..."); + } + } + catch (Exception ce) + { + conn = null; + logNotice( "Error connecting to Tor local control port: " + ce.getLocalizedMessage()); + + Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); + } + + sendCallbackStatusMessage(getString(R.string.tor_process_waiting)); + Thread.sleep(3000); + } - - sendCallbackStatusMessage(getString(R.string.tor_process_waiting)); - Thread.sleep(3000); - - } - + } return -1; diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 29686f9..0b22b90 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -77,7 +77,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.21-openssl1.0.1g-if7"; + public static final String BINARY_TOR_VERSION = "0.2.4.21-openssl1.0.1g-if8"; public static final String BINARY_PRIVOXY_VERSION = "3.0.12"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INSTALLED";

1 0

[orbot/master] back to BETA: 13.0.7-BETA-1
by n8fr8＠torproject.org 18 Apr '14

18 Apr '14

commit 2e0639b25696f486a21f4484324207b301a1169a Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 18 06:28:20 2014 -0400 back to BETA: 13.0.7-BETA-1 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 09e4797..81e6406 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="13.0.6-RC-4a" - android:versionCode="84" + android:versionName="13.0.7-BETA-1" + android:versionCode="86" android:installLocation="auto" >

1 0

[orbot/master] moved diagnotics to menu option (not launcher)
by n8fr8＠torproject.org 18 Apr '14

18 Apr '14

commit 4aa3cd6ea2ed43f76894d06d779640239f0dc0b0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Apr 18 06:22:10 2014 -0400 moved diagnotics to menu option (not launcher) --- res/menu/main.xml | 8 +++ res/raw/torrcdiag | 2 +- .../android/OrbotDiagnosticsActivity.java | 72 ++++++-------------- 3 files changed, 31 insertions(+), 51 deletions(-) diff --git a/res/menu/main.xml b/res/menu/main.xml index 4cbee84..df929ab 100755 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -72,6 +72,14 @@ yourapp:showAsAction="ifRoom" /> + + + <item android:id="@+id/menu_diag" + android:title="Test Mode" + android:icon="@drawable/ic_menu_check" + yourapp:showAsAction="never" + + /> </menu> <!-- diff --git a/res/raw/torrcdiag b/res/raw/torrcdiag index 5463e29..2edd200 100644 --- a/res/raw/torrcdiag +++ b/res/raw/torrcdiag @@ -3,7 +3,7 @@ SOCKSListenAddress 127.0.0.1 SafeSocks 0 TestSocks 1 WarnUnsafeSocks 1 -Log debug stdout +Log info stdout ControlListenAddress 127.0.0.1 ControlPort 9051 CookieAuthentication 1 diff --git a/src/org/torproject/android/OrbotDiagnosticsActivity.java b/src/org/torproject/android/OrbotDiagnosticsActivity.java index f36d4c6..db7ab21 100644 --- a/src/org/torproject/android/OrbotDiagnosticsActivity.java +++ b/src/org/torproject/android/OrbotDiagnosticsActivity.java @@ -34,6 +34,7 @@ public class OrbotDiagnosticsActivity extends Activity { private TextView mTextView = null; private final static String TAG = "OrbotDiag"; private StringBuffer log = new StringBuffer(); + Process mProcess; @Override protected void onCreate(Bundle savedInstanceState) { @@ -64,17 +65,22 @@ public class OrbotDiagnosticsActivity extends Activity { protected void onDestroy() { super.onDestroy(); + + } + + private void stopTor () + { File appBinHome = this.getDir("bin", Context.MODE_PRIVATE); File fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY); - - try { - killAllTor (fileTor); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + + if (mProcess != null) + mProcess.destroy(); + + } + + @Override protected void onResume() { @@ -102,40 +108,6 @@ public class OrbotDiagnosticsActivity extends Activity { runTorTest(); } - private void killAllTor (File fileTor) throws IOException - { - try - { - int maxTry = 5; - int currTry = 0; - - Shell shell = Shell.startShell(); - int procId; - - while ((procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath())) != -1 && currTry++ < maxTry) - { - - log ("Found existing orphan Tor process; Trying to shutdown now (device restart may be needed)..."); - log("Found Tor PID=" + procId + " - attempt to shutdown now..."); - - SimpleCommand killCommand = new SimpleCommand("toolbox kill -9 " + procId); - shell.add(killCommand); - killCommand.waitForFinish(); - log ("kill output: " + killCommand.getExitCode() + "; " + killCommand.getOutput()); - killCommand = new SimpleCommand("kill -9 " + procId); - shell.add(killCommand); - killCommand.waitForFinish(); - log ("kill output: " + killCommand.getExitCode() + "; " + killCommand.getOutput()); - } - } - catch (Exception e) - { - log("error killing Tor: " + e.getLocalizedMessage()); - Log.d(TAG, "error killing Tor", e); - } - - } - private void runTorTest () { try @@ -145,8 +117,7 @@ public class OrbotDiagnosticsActivity extends Activity { File fileTor= new File(appBinHome, TorServiceConstants.TOR_ASSET_KEY); enableBinExec (fileTor, appBinHome); - killAllTor (fileTor); - + InputStream is = getResources().openRawResource(R.raw.torrcdiag); File fileTorrc = new File(appBinHome, TorServiceConstants.TORRC_ASSET_KEY + "diag"); TorResourceInstaller.streamToFile(is,fileTorrc, false, false); @@ -163,20 +134,20 @@ public class OrbotDiagnosticsActivity extends Activity { log ("Executing command> " + cmd); - Process process = Runtime.getRuntime().exec(cmd); + mProcess = Runtime.getRuntime().exec(cmd); - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream())); + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(mProcess.getInputStream())); StreamGobbler sg = new StreamGobbler(); sg.reader = bufferedReader; - sg.process = process; + sg.process = mProcess; new Thread(sg).start(); - if (process.getErrorStream() != null) + if (mProcess.getErrorStream() != null) { - bufferedReader = new BufferedReader(new InputStreamReader(process.getErrorStream())); + bufferedReader = new BufferedReader(new InputStreamReader(mProcess.getErrorStream())); sg = new StreamGobbler(); sg.reader = bufferedReader; - sg.process = process; + sg.process = mProcess; new Thread(sg).start(); } @@ -209,7 +180,8 @@ public class OrbotDiagnosticsActivity extends Activity { Log.d(TAG, "error reading line",e); } - log("Tor exit code=" + process.exitValue() + ";"); + //log("Tor exit code=" + process.exitValue() + ";"); + } }

1 0