tor-commits
Threads by month
- ----- 2025 -----
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
August 2012
- 19 participants
- 901 discussions
commit 4b2d6bc5a44b7577afb6f32012d8981cd84a364d
Author: Translation commit bot <translation(a)torproject.org>
Date: Mon Aug 20 07:15:07 2012 +0000
Update translations for tsum
---
id/short-user-manual_id_noimg.xhtml | 132 +++++++++++++++++++++++++++++++++++
1 files changed, 132 insertions(+), 0 deletions(-)
diff --git a/id/short-user-manual_id_noimg.xhtml b/id/short-user-manual_id_noimg.xhtml
new file mode 100644
index 0000000..93c4c4a
--- /dev/null
+++ b/id/short-user-manual_id_noimg.xhtml
@@ -0,0 +1,132 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <title/>
+ </head>
+ <body>
+ <h1 id="the-short-user-manual">Petunjuk pengunaan singkat</h1>
+ <p>Petunjuk pengunaan ini mengandung informasi mengenai cara untuk mengunduh Tor, bagaimana menggunakannya, dan apa yang harus dilakukan ketika Tor tidak bisa terhubung dengan jaringan. jika Anda tidak dapat menemukan jawaban atas pertanyaan anda dalam dokumen ini, email ke help(a)rt.torproject.org.</p>
+ <p>Harap diingat bahwa kami hanya menyediakan bantuan berdasarkan kesukarelaan, dan kami menerima banyak email setiap hari. Anda tidak perlu khawatir jika kami tidak bisa membalas email Anda secara langsung.</p>
+ <h2 id="how-tor-works">Bagaimana Tor bekerja
+</h2>
+ <p>Tor adalah sebuah jaringan dari terowongan virtual yang memperbolehkan Anda untuk meningkatkan privacy Anda dan keamanan dalam internet. Tor bekerja dengan mengirimkan traffic melalui tiga server yang acak (dikenal sebagai relay) di dalam jaringan Tor, sebelum traffic itu dikirimkan ke internet publik.</p>
+ <p>iatas mengilustrasikan seorang pengguna berselancar ke situs-situs yang beragam melalui Tor. Layar hijau merepresentasikan relay dalam jaringan Tor, sementara tiga kunci merepresentasikan lapisan enkripsi diantara pengguna dan setiap relay.</p>
+ <p>Tor will anonymize the origin of your traffic, and it will encrypt everything between you and the Tor network. Tor will also encrypt your traffic inside the Tor network, but it cannot encrypt your traffic between the Tor network and its final destination.</p>
+ <p>If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. <strong>https</strong>://torproject.org/, not <strong>http</strong>://torproject.org/).</p>
+ <h2 id="how-to-download-tor">How to download Tor</h2>
+ <p>The bundle we recommend to most users is the <a href="https://www.torproject.org/projects/torbrowser.html">Tor Browser Bundle</a>. This bundle contains a browser preconfigured to safely browse the Internet through Tor, and requires no installation. You download the bundle, extract the archive, and start Tor.</p>
+ <p>There are two different ways to get hold of the Tor software. You can either browse to the <a href="https://www.torproject.org/">Tor Project website</a> and download it there, or you can use GetTor, the email autoresponder.</p>
+ <h3 id="how-to-get-tor-via-email">How to get Tor via email</h3>
+ <p>To receive the English Tor Browser Bundle for Windows, send an email to gettor(a)torproject.org with <strong>windows</strong> in the body of the message. You can leave the subject blank.</p>
+ <p>You can also request the Tor Browser Bundle for Mac OS X (write <strong>macos-i386</strong>), and Linux (write <strong>linux-i386</strong> for 32-bit systems or <strong>linux-x86_64</strong> for 64-bit systems).</p>
+ <p>If you want a translated version of Tor, write <strong>help</strong> instead. You will then receive an email with instructions and a list of available languages.</p>
+ <p><strong>Note</strong>: The Tor Browser Bundles for Linux and Mac OS X are rather large, and you will not be able to receive any of these bundles with a Gmail, Hotmail or Yahoo account. If you cannot receive the bundle you want, send an email to help(a)rt.torproject.org and we will give you a list of website mirrors to use.</p>
+ <h3 id="tor-for-smartphones">Tor for smartphones</h3>
+ <p>You can get Tor on your Android device by installing the package named <em>Orbot</em>. For information about how to download and install Orbot, please see the <a href="https://www.torproject.org/docs/android.html.en">Tor Project website</a>.</p>
+ <p>We also have experimental packages for <a href="https://www.torproject.org/docs/N900.html.en">Nokia Maemo/N900</a> and <a href="http://sid77.slackware.it/ios/">Apple iOS</a>.</p>
+ <h3 id="how-to-verify-that-you-have-the-right-version">How to verify that you have the right version</h3>
+ <p>Before running the Tor Browser Bundle, you should make sure that you have the right version.</p>
+ <p>The software you receive is accompanied by a file with the same name as the bundle and the extension <strong>.asc</strong>. This .asc file is a GPG signature, and will allow you to verify the file you've downloaded is exactly the one that we intended you to get.</p>
+ <p>Before you can verify the signature, you will have to download and install GnuPG:</p>
+ <p><strong>Windows</strong>: <a href="http://gpg4win.org/download.html">http://gpg4win.org/download.html</a><br/><strong>Mac OS X</strong>: <a href="http://www.gpgtools.org/">http://www.gpgtools.org/</a><br/><strong>Linux</strong>: Most Linux distributions come with GnuPG preinstalled.</p>
+ <p>Please note that you may need to edit the paths and the commands used below to get it to work on your system.</p>
+ <p>Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import Erinn's key, run:</p>
+ <pre>
+ <code>gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659
+</code>
+ </pre>
+ <p>After importing the key, verify that the fingerprint is correct:</p>
+ <pre>
+ <code>gpg --fingerprint 0x63FEE659
+</code>
+ </pre>
+ <p>You should see:</p>
+ <pre>
+ <code>pub 2048R/63FEE659 2003-10-16
+ Key fingerprint = 8738 A680 B84B 3031 A630 F2DB 416F 0610 63FE E659
+uid Erinn Clark <erinn(a)torproject.org>
+uid Erinn Clark <erinn(a)debian.org>
+uid Erinn Clark <erinn(a)double-helix.org>
+sub 2048R/EB399FD7 2003-10-16
+</code>
+ </pre>
+ <p>To verify the signature of the package you downloaded, run the following command:</p>
+ <pre>
+ <code>gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe
+</code>
+ </pre>
+ <p>The output should say <em>"Good signature"</em>. A bad signature means that the file may have been tampered with. If you see a bad signature, send details about where you downloaded the package from, how you verified the signature, and the output from GnuPG in an email to help(a)rt.torproject.org.</p>
+ <p>Once you have verified the signature and seen the <em>"Good signature"</em> output, go ahead and extract the package archive. You should then see a directory similar to <strong>tor-browser_en-US</strong>. Inside that directory is another directory called <strong>Docs</strong>, which contains a file called <strong>changelog</strong>. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename.</p>
+ <h3 id="how-to-use-the-tor-browser-bundle">How to use the Tor Browser Bundle</h3>
+ <p>After downloading the Tor Browser Bundle, extract the package onto your desktop or a USB stick. You should have a directory containing a few files. One of the files is an executable called "Start Tor Browser" (or "start-tor-browser", depending on your operating system).</p>
+ <p>When you start the Tor Browser Bundle, you will first see Vidalia start up and connect you to the Tor network. After that, you will see a browser confirming that you are now using Tor. This is done by displaying <a href="https://check.torproject.org/">https://check.torproject.org/</a>. You can now browse the Internet through Tor.</p>
+ <p>
+ <em>Please note that it is important that you use the browser that comes with the bundle, and not your own browser.</em>
+ </p>
+ <h3 id="what-to-do-when-tor-does-not-connect">What to do when Tor does not connect</h3>
+ <p>Some users will notice that Vidalia gets stuck when trying to connect to the Tor network. If this happens, make sure that you are connected to the Internet. If you need to connect to a proxy server, see <em>How to use an open proxy</em> below.</p>
+ <p>If your normal Internet connection is working, but Tor still can't connect to the network, try the following; open the Vidalia control panel, click on <em>Message Log</em> and select the <em>Advanced</em> tab. It may be that Tor won't connect because:</p>
+ <p><strong>Your system clock is off</strong>: Make sure that the date and time on your system is correct, and restart Tor. You may need to synchronize your system clock with an Internet time server.</p>
+ <p><strong>You are behind a restrictive firewall</strong>: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on <em>Settings</em> and <em>Network</em>, and tick the box that says <em>My firewall only lets me connect to certain ports</em>.</p>
+ <p><strong>Your anti-virus program is blocking Tor</strong>: Make sure that your anti-virus program is not preventing Tor from making network connections.</p>
+ <p>If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with <strong>Tor bridges</strong>, hidden relays that aren't as easy to block.</p>
+ <p>If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file.</p>
+ <h3 id="how-to-find-a-bridge">How to find a bridge</h3>
+ <p>To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write <strong>get bridges</strong> in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address.</p>
+ <p>Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often.</p>
+ <h3 id="how-to-use-a-bridge">How to use a bridge</h3>
+ <p>Once you have a set of bridges to use, open the Vidalia control panel, click on <em>Settings</em>, <em>Network</em> and tick the box that says <em>My ISP blocks connections to the Tor network</em>. Enter the bridges in the box below, hit <em>OK</em> and start Tor again.</p>
+ <h3 id="how-to-use-an-open-proxy">How to use an open proxy</h3>
+ <p>If using a bridge does not work, try configuring Tor to use any HTTPS or SOCKS proxy to get access to the Tor network. This means even if Tor is blocked by your local network, open proxies can be safely used to connect to the Tor Network and on to the uncensored Internet.</p>
+ <p>The steps below assume you have a functional Tor/Vidalia configuration, and you have found a list of HTTPS, SOCKS4, or SOCKS5 proxies.</p>
+ <ol style="list-style-type: decimal">
+ <li>Open the Vidalia control panel, click on <em>Settings</em>.</li>
+ <li>Click <em>Network</em>. Select <em>I use a proxy to access the Internet</em>.</li>
+ <li>On the <em>Address</em> line, enter the open proxy address. This can be a hostname or an IP Address.</li>
+ <li>Enter the port for the proxy.</li>
+ <li>Generally, you do not need a username and password. If you do, enter the information in the proper fields.</li>
+ <li>Choose the <em>Type</em> of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5.</li>
+ <li>Push the <em>OK</em> button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network.</li>
+ </ol>
+ <h2 id="frequently-asked-questions">Frequently Asked Questions</h2>
+ <p>This section will answer some of the most common questions. If your question is not mentioned here, please send an email to help(a)rt.torproject.org.</p>
+ <h3 id="unable-to-extract-the-archive">Unable to extract the archive</h3>
+ <p>If you are using Windows and find that you cannot extract the archive, download and install <a href="http://www.7-zip.org/">7-Zip</a>.</p>
+ <p>If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions:</p>
+ <h4 id="windows-xp">Windows XP</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>My Computer</em></li>
+ <li>Click on <em>Tools</em> and choose <em>Folder Options...</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-vista">Windows Vista</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h4 id="windows-7">Windows 7</h4>
+ <ol style="list-style-type: decimal">
+ <li>Open <em>Computer</em></li>
+ <li>Click on <em>Organize</em> and choose <em>Folder and search options</em> in the menu</li>
+ <li>Click on the <em>View</em> tab</li>
+ <li>Uncheck <em>Hide extensions for known file types</em> and click <em>OK</em></li>
+ </ol>
+ <h3 id="vidalia-asks-for-a-password">Vidalia asks for a password</h3>
+ <p>You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems:</p>
+ <p><strong>You are already running Vidalia and Tor</strong>: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one.</p>
+ <p><strong>Vidalia crashed, but left Tor running</strong>: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor.</p>
+ <p>For more information, see the <a href="https://torproject.org/docs/faq.html#VidaliaPassword">FAQ</a> on the Tor Project website.</p>
+ <h3 id="flash-does-not-work">Flash does not work</h3>
+ <p>For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity.</p>
+ <p>Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the <a href="https://www.youtube.com/html5">HTML5 trial</a> on the YouTube website before you can use the HTML5 player.</p>
+ <p>Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle.</p>
+ <p>Please see the <a href="https://www.torproject.org/torbutton/torbutton-faq.html#noflash">Torbutton FAQ</a> for more information.</p>
+ <h3 id="i-want-to-use-another-browser">I want to use another browser</h3>
+ <p>For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks.</p>
+ <h3 id="why-tor-is-slow">Why Tor is slow</h3>
+ <p>Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world!</p>
+ </body>
+</html>
1
0
commit e0f2eb157a8acfebf223780d1b1d520e6144e583
Author: Karsten Loesing <karsten.loesing(a)gmx.net>
Date: Mon Aug 20 08:53:41 2012 +0200
Update footers.
---
templates/index.html | 5 ++++-
templates/result.html | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/templates/index.html b/templates/index.html
index 6d22666..14e5866 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -137,7 +137,10 @@
<hr>
<footer>
- <p>© Torproject</p>
+ The Tor Project - 2012<br>
+ <a href="https://gitweb.torproject.org/compass.git">Source code</a> -
+ <a href="https://trac.torproject.org/projects/tor/newticket?component=Compass">Report a bug</a> -
+ <a href="mailto:tor-assistants@lists.torproject.org">Contact</a>
</footer>
</div> <!-- /container -->
diff --git a/templates/result.html b/templates/result.html
index 563a504..c3c9c44 100644
--- a/templates/result.html
+++ b/templates/result.html
@@ -101,7 +101,10 @@
<hr>
<footer>
- <p>© Torproject</p>
+ The Tor Project - 2012<br>
+ <a href="https://gitweb.torproject.org/compass.git">Source code</a> -
+ <a href="https://trac.torproject.org/projects/tor/newticket?component=Compass">Report a bug</a> -
+ <a href="mailto:tor-assistants@lists.torproject.org">Contact</a>
</footer>
</div> <!-- /container -->
1
0
[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 20 Aug '12
by translation＠torproject.org 20 Aug '12
20 Aug '12
commit 090ea53745a6d759e4e7839e2c558b111e02a034
Author: Translation commit bot <translation(a)torproject.org>
Date: Mon Aug 20 06:45:30 2012 +0000
Update translations for whisperback
---
es/es.po | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/es/es.po b/es/es.po
index cdf804c..9108676 100644
--- a/es/es.po
+++ b/es/es.po
@@ -3,14 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
+# <andolsa(a)gmail.com>, 2012.
# <itacronayu(a)hotmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2012-02-16 22:33+0100\n"
-"PO-Revision-Date: 2012-08-16 09:20+0000\n"
-"Last-Translator: cronayu <itacronayu(a)hotmail.com>\n"
+"PO-Revision-Date: 2012-08-20 06:31+0000\n"
+"Last-Translator: tio <andolsa(a)gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/torproject/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -158,7 +159,7 @@ msgstr "Enviar feedback en un correo encriptado"
#: ../whisperBack/gui.py:405
msgid "Copyright © 2009-2012 Tails developpers (tails(a)boum.org)"
-msgstr ""
+msgstr "Derechos Reservados © 2009-2012 Programadores Tails (tails(a)boum.org)"
#: ../whisperBack/gui.py:406
msgid "Tails developers <tails(a)boum.org>"
@@ -183,7 +184,7 @@ msgstr "Descripcion del error"
#: ../data/whisperback.ui.h:3
msgid "Copyright © 2009-2012 tails(a)boum.org"
-msgstr ""
+msgstr "Derechos Reservados © 2009-2012 tails(a)boum.org"
#: ../data/whisperback.ui.h:4
msgid "Help"
1
0
commit 380ccece4bc5663b74122e25c85da6bf7ec0376c
Author: Translation commit bot <translation(a)torproject.org>
Date: Mon Aug 20 06:45:07 2012 +0000
Update translations for tsum
---
es_AR/short-user-manual_es_AR_noimg.xhtml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/es_AR/short-user-manual_es_AR_noimg.xhtml b/es_AR/short-user-manual_es_AR_noimg.xhtml
index 649e71c..915fca9 100644
--- a/es_AR/short-user-manual_es_AR_noimg.xhtml
+++ b/es_AR/short-user-manual_es_AR_noimg.xhtml
@@ -4,8 +4,8 @@
<title/>
</head>
<body>
- <h1 id="the-short-user-manual">The Short User Manual</h1>
- <p>This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email help(a)rt.torproject.org.</p>
+ <h1 id="the-short-user-manual">El Manual del Usuario Breve</h1>
+ <p>El presente manual del usuario contiene información sobre cómo bajar Tor, cómo usarlo y qué hacer si Tor no puede conectarse a la red. Si Usted no puede encontrar la respuesta a su pregunta en este documento, envíe un email a help(a)rt.torproject.org.</p>
<p>Please note that we are providing support on a voluntary basis, and we get a lot of emails every single day. There is no need to worry if we don't get back to you straight away.</p>
<h2 id="how-tor-works">How Tor works</h2>
<p>Tor is a network of virtual tunnels that allows you to improve your privacy and security on the Internet. Tor works by sending your traffic through three random servers (also known as <em>relays</em>) in the Tor network, before the traffic is sent out onto the public Internet.</p>
1
0
commit 9596c8211868cdb6aea9b884a4c18ed1c76c276d
Author: Sathyanarayanan Gunasekaran <gsathya.ceg(a)gmail.com>
Date: Sun Aug 19 16:15:30 2012 +0530
Fix links to atlas
The shortened fingerprint broke the links to atlas.
The truncation is down in the jinja2 template and
not in app.py
---
app.py | 2 +-
templates/result.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app.py b/app.py
index 1179b97..2c60a01 100644
--- a/app.py
+++ b/app.py
@@ -69,7 +69,7 @@ def parse(output_string, grouping=False, sort_key=None):
result.p_middle = values[3]
result.p_exit = values[4]
result.nick = values[5]
- result.fp = values[6][:8]
+ result.fp = values[6]
result.exit = values[7]
result.guard = values[8]
result.cc = values[9]
diff --git a/templates/result.html b/templates/result.html
index b9421fd..563a504 100644
--- a/templates/result.html
+++ b/templates/result.html
@@ -83,7 +83,7 @@
<td>{{ result.fp }}</td>
{% else %}
<td><a href="https://atlas.torproject.org/#details/{{
- result.fp }}">{{ result.fp }}</a></td>
+ result.fp }}">{{ result.fp[:8] }}</a></td>
{% endif %}
<td>{{ result.exit }}</td>
<td>{{ result.guard }}</td>
1
0
r25759: {website} Remove Ernie link, because it doesn't exist anymore and beca (website/trunk/getinvolved/en)
by Karsten Loesing 20 Aug '12
by Karsten Loesing 20 Aug '12
20 Aug '12
Author: kloesing
Date: 2012-08-20 06:12:23 +0000 (Mon, 20 Aug 2012)
New Revision: 25759
Modified:
website/trunk/getinvolved/en/research.wml
Log:
Remove Ernie link, because it doesn't exist anymore and because we don't provide any other database code for researchers to perform analyses.
Modified: website/trunk/getinvolved/en/research.wml
===================================================================
--- website/trunk/getinvolved/en/research.wml 2012-08-17 17:08:41 UTC (rev 25758)
+++ website/trunk/getinvolved/en/research.wml 2012-08-20 06:12:23 UTC (rev 25759)
@@ -33,10 +33,7 @@
what traffic exits the network, etc. We are also developing
tools to process these huge data archives and come up with
<a href="https://metrics.torproject.org/graphs.html">useful
-statistics</a>. For example, we provide a <a
-href="https://gitweb.torproject.org//ernie.git?a=blob_plain;f=doc/manual.pdf">tool
-called Ernie</a> that can import relay descriptors into a local database
-to perform analyses. Let us know what other information you'd like to
+statistics</a>. Let us know what other information you'd like to
see, and we can work with you to help make sure it gets collected
<a href="https://metrics.torproject.org/papers/wecsr10.pdf">safely</a>
and robustly.
1
0
commit 994860da43b2488de8a64d449ec2b01addb1ea4f
Author: Arturo Filastò <hellais(a)torproject.org>
Date: Sun Aug 19 15:52:46 2012 -0700
Make improvements to the classifier
---
ooni/plugins/domclass.py | 54 ++++++++++++++++++++++++++++-----------------
1 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/ooni/plugins/domclass.py b/ooni/plugins/domclass.py
index 5c9b6fb..31e2e41 100644
--- a/ooni/plugins/domclass.py
+++ b/ooni/plugins/domclass.py
@@ -17,6 +17,7 @@ class domclassArgs(usage.Options):
['fileb', 'b', None, 'Corpus file'],
['asset', 'a', None, 'URL List'],
['resume', 'r', 0, 'Resume at this index']]
+
alltags = ['A', 'ABBR', 'ACRONYM', 'ADDRESS', 'APPLET', 'AREA', 'B', 'BASE',
'BASEFONT', 'BD', 'BIG', 'BLOCKQUOTE', 'BODY', 'BR', 'BUTTON', 'CAPTION',
'CENTER', 'CITE', 'CODE', 'COL', 'COLGROUP', 'DD', 'DEL', 'DFN', 'DIR', 'DIV',
@@ -38,12 +39,10 @@ commontags = ['A', 'B', 'BLOCKQUOTE', 'BODY', 'BR', 'BUTTON', 'CAPTION',
'STRIKE', 'STRONG', 'STYLE', 'SUB', 'SUP', 'TABLE', 'TBODY', 'TD',
'TEXTAREA', 'TFOOT', 'TH', 'THEAD', 'TITLE', 'TR', 'TT', 'U', 'UL']
-thetags = ['A',
- 'DIV',
- 'FRAME', 'H1', 'H2',
- 'H3', 'H4', 'IFRAME ', 'INPUT', 'LABEL','LI', 'P', 'SCRIPT', 'SPAN',
- 'STYLE',
- 'TR']
+thetags = ['A', 'DIV', 'FRAME', 'H1', 'H2',
+ 'H3', 'H4', 'IFRAME ', 'INPUT',
+ 'LABEL','LI', 'P', 'SCRIPT', 'SPAN',
+ 'STYLE', 'TR']
def compute_matrix(dataset):
import itertools
@@ -65,15 +64,26 @@ def compute_matrix(dataset):
y = len(thetags)
matrix[x,y] += 1
+
+ for x in xrange(len(thetags) + 1):
+ possibilities = 0
+ for y in matrix[x]:
+ possibilities += y
+
+ for i in xrange(len(matrix[x])):
+ if possibilities != 0:
+ matrix[x][i] = matrix[x][i]/possibilities
+
ret['matrix'] = matrix
ret['eigen'] = numpy.linalg.eigvals(matrix)
return ret
-def readDOM(fn):
+def readDOM(content=None, filename=None):
from bs4 import BeautifulSoup
- #f = open(fn)
- #content = ''.join(f.readlines())
- content = fn
+ if filename:
+ f = open(filename)
+ content = ''.join(f.readlines())
+
dom = BeautifulSoup(content)
couples = []
for x in dom.findAll():
@@ -90,17 +100,19 @@ class domclassTest(HTTPTest):
options = domclassArgs
blocking = False
+ tool = True
+
def runTool(self):
import yaml, numpy
- site_a = readDOM(self.local_options['file'])
- site_b = readDOM(self.local_options['fileb'])
+ site_a = readDOM(filename=self.local_options['file'])
+ site_b = readDOM(filename=self.local_options['fileb'])
a = compute_matrix(site_a)
- self.result['eigenvalues'] = str(a['eigen'])
- self.result['matrix'] = str(a['matrix'])
- self.result['content'] = data[:200]
+ self.result['eigenvalues'] = a['eigen']
+ #self.result['matrix'] = str(a['matrix']
+ #self.result['content'] = data[:200]
b = compute_matrix(site_b)
- print "A: %s" % a
- print "B: %s" % b
+ #print "A: %s" % a
+ #print "B: %s" % b
correlation = numpy.vdot(a['eigen'],b['eigen'])
correlation /= numpy.linalg.norm(a['eigen'])*numpy.linalg.norm(b['eigen'])
correlation = (correlation + 1)/2
@@ -116,17 +128,17 @@ class domclassTest(HTTPTest):
self.result['eigenvalues'] = None
self.result['matrix'] = None
else:
- self.result['eigenvalues'] = str(a['eigen'])
- self.result['matrix'] = str(a['matrix'])
+ self.result['eigenvalues'] = a['eigen']
+ #self.result['matrix'] = str(a['matrix'])
#self.result['content'] = data[:200]
#b = compute_matrix(site_b)
print "A: %s" % a
- return a
+ return a['eigen']
#print "B: %s" % b
#correlation = numpy.vdot(a['eigen'],b['eigen'])
#correlation /= numpy.linalg.norm(a['eigen'])*numpy.linalg.norm(b['eigen'])
#correlation = (correlation + 1)/2
- # print "Corelation: %s" % correlation
+ #print "Corelation: %s" % correlation
# We need to instantiate it otherwise getPlugins does not detect it
# XXX Find a way to load plugins without instantiating them.
1
0
19 Aug '12
commit 190e24e5c3239322900c63f8a864b375cdd6320e
Author: Arturo Filastò <hellais(a)torproject.org>
Date: Sun Aug 19 15:53:09 2012 -0700
Import censorship list from greatfire
---
ooni/assets/greatfire.lst | 2100 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 2100 insertions(+), 0 deletions(-)
diff --git a/ooni/assets/greatfire.lst b/ooni/assets/greatfire.lst
new file mode 100644
index 0000000..30c2a96
--- /dev/null
+++ b/ooni/assets/greatfire.lst
@@ -0,0 +1,2100 @@
+http://www.new.facebook.com
+http://www.facebook.com
+http://facebook.com
+http://m.facebook.com
+http://sites.google.com
+http://login.facebook.com
+http://spreadsheets.google.com
+http://apps.facebook.com
+http://facebook.com
+http://picasaweb.google.com
+http://www.facebook.com
+http://api.facebook.com
+http://zh-cn.facebook.com
+http://plus.google.com
+http://encrypted.google.com
+http://plusone.google.com
+http://plusone.google.com
+http://google.com
+http://sites.google.com
+http://feedproxy.google.com
+http://www.docs.google.com
+http://profiles.google.com
+http://m.facebook.com
+http://encrypted.google.com
+http://code.google.com
+http://spreadsheets.google.com
+http://drive.google.com
+http://www.picasaweb.google.com
+http://groups.google.com
+http://spreadsheets4.google.com
+http://fr-fr.facebook.com
+http://talkgadget.google.com
+http://docs.google.com
+http://www.plus.google.com
+http://plus.google.com
+http://tw.youtube.com
+http://youtube.com
+http://www.youtube.com
+http://www.youtube.com
+http://hk.youtube.com
+http://youtube.com
+http://accounts.youtube.com
+http://hk.rd.yahoo.com
+http://meme.yahoo.com
+http://tw.yahoo.com
+http://hk.news.yahoo.com
+http://tw.myblog.yahoo.com
+http://tw.news.yahoo.com
+http://video.yahoo.com
+http://pulse.yahoo.com
+http://es.video.yahoo.com
+http://hk.yahoo.com
+http://en.mobile.wikipedia.org
+http://zh.m.wikipedia.org
+http://twitter.com
+http://eccomi.qzone.qq.com
+http://twitter.com
+http://www.twitter.com
+http://www.twitter.com
+http://dev.twitter.com
+http://search.twitter.com
+http://esbensportfolio.blogspot.com
+http://tf2spreadshet.blogspot.com
+http://downmerng.blogspot.com
+http://historyanarchy.blogspot.com
+http://charlesmok.blogspot.com
+http://www.stratosphera-nrb.blogspot.com
+http://veryverylong.blogspot.com
+http://indeterminacy.blogspot.com
+http://spritthevirus.blogspot.com
+http://hric-newsbrief.blogspot.com
+http://basketbawful.blogspot.com
+http://www.fademi.blogspot.com
+http://wuxiao0715.blogspot.com
+http://dramatisinterruptus.blogspot.com
+http://martinsmithdesign.blogspot.com
+http://www.geezericious.blogspot.com
+http://hungryballerina.blogspot.com
+http://www.malaysianchiks.blogspot.com
+http://transranyf.blogspot.com
+http://spaceman100-thesuperblog.blogspot.com
+http://unreadbits.blogspot.com
+http://hqlenglish.blogspot.com
+http://newsabeta.blogspot.com
+http://www.google.blogspot.com
+http://www.tibetnewsonline.blogspot.com
+http://sopravivalitalia.blogspot.com
+http://perfectpeacellc.blogspot.com
+http://www.taikotime.blogspot.com
+http://www.arielefraimashbel.blogspot.com
+http://ukiahcoachbrown.blogspot.com
+http://www.transranyf.blogspot.com
+http://unreadnits.blogspot.com
+http://adornoskies.blogspot.com
+http://freedomforegyptians.blogspot.com
+http://www.nickdael.blogspot.com
+http://postcardsfromrichard.blogspot.com
+http://pennedscripts.blogspot.com
+http://helloloverr.blogspot.com
+http://american-sleepingdragon.blogspot.com
+http://postcardsfromrichard.blogspot.com
+http://pennedscripts.blogspot.com
+http://spritthevirus.blogspot.com
+http://froggyflix.blogspot.com
+http://www.varadhjain.blogspot.com
+http://ukiahcoachbrown.blogspot.com
+http://charlesmok.blogspot.com
+http://amdoamonk.blogspot.com
+http://historyanarchy.blogspot.com
+http://ajithfanswing.blogspot.com
+http://freedomforegyptians.blogspot.com
+http://www.spaceman100-thesuperblog.blogspot.com
+http://helloloverr.blogspot.com
+http://amongstsaintsandsailors.blogspot.com
+http://hric-newsbrief.blogspot.com
+http://wuxiao0715.blogspot.com
+http://taiwanmatters.blogspot.com
+http://www.tibetnewsonline.blogspot.com
+http://www.happening24X7.blogspot.com
+http://dramatisinterruptus.blogspot.com
+http://perfectpeacellc.blogspot.com
+http://google.blogspot.com
+http://cittadeglignomi.blogspot.com
+http://arielefraimashbel.blogspot.com
+http://evolutionguide.blogspot.com
+http://unreadbits.blogspot.com
+http://sopravivalitalia.blogspot.com
+http://www.raceboy24.blogspot.com
+http://pfge-pfge.blogspot.com
+http://www.evolutionguide.blogspot.com
+http://unreadnits.blogspot.com
+http://www.cajuncardon.blogspot.com
+http://owpandprojectdirect.blogspot.com
+http://www.blogspot.com
+http://codeslut.blogspot.com
+http://www.panfletoliberal.blogspot.com
+http://michaelturton.blogspot.com
+http://raceboy24.blogspot.com
+http://generatorblog.blogspot.com
+http://gustavoguillenzulia.blogspot.com
+http://manyouyinli.blogspot.com
+http://sruv-pitbulls.blogspot.com
+http://www.stratosphera-nrb.blogspot.com
+http://www.ukiahcoachbrown.blogspot.com
+http://www.ncbcr.blogspot.com
+http://blogspot.com
+http://trangridiculous.blogspot.com
+http://le-rubrique.blogspot.com
+http://roxy-angel.blogspot.com
+http://bettermyths.blogspot.com
+http://inexplorados.blogspot.com
+http://thoughtthemes.blogspot.com
+http://blakelychinatrip.blogspot.com
+http://zhangxin1989.blogspot.com
+http://kangdiy.blogspot.com
+http://henacg.blogspot.com
+http://oldvirginiablog.blogspot.com
+http://imperturbable-music.blogspot.com
+http://ang-newswire.blogspot.com
+http://yuhaotech.blogspot.com
+http://tokyobikepolo.blogspot.com
+http://virtuasapiens.blogspot.com
+http://hldpn.blogspot.com
+http://blogs.yahoo.co.jp
+http://picasaweb.google.com.hk
+http://www.wordpress.com
+http://abcdefg.wordpress.com
+http://astimegoesbyinchina.wordpress.com
+http://www.wordpress.com
+http://thechinesedream.wordpress.com
+http://xinchina.wordpress.com
+http://theworldofguava.wordpress.com
+http://wuxiao0715.wordpress.com
+http://wordpress.com
+http://www.annishan2011.wordpress.com
+http://publichealthinchina.wordpress.com
+http://teflandlouise.wordpress.com
+http://uabinchina2011.wordpress.com
+http://nfolamp.wordpress.com
+http://smurfswillbefree.wordpress.com
+http://storiesfromtheceiling.wordpress.com
+http://culturalexposure.wordpress.com
+http://bullrunnings.wordpress.com
+http://radiofreechina.wordpress.com
+http://stephenmooredesign.wordpress.com
+http://fromcanadatofinland.wordpress.com
+http://www.richardjangus.wordpress.com
+http://underthejacaranda.wordpress.com
+http://www.quhelan.wordpress.com
+http://sinologica.wordpress.com
+http://wuxiao0715.wordpress.com
+http://indonesiastoriesdotcom.wordpress.com
+http://martianchronicles.wordpress.com
+http://livefromgaza.wordpress.com
+http://foureverfamily.wordpress.com
+http://abc.wordpress.com
+http://fashiontech.wordpress.com
+http://sample.wordpress.com
+http://zh.wordpress.com
+http://lemasabachthani.wordpress.com
+http://hmetro.com.my
+http://www.blogcatalog.com
+http://cbs.ntu.edu.tw
+http://thisav.com
+http://blogcatalog.com
+http://tapuz.co.il
+http://www.identi.ca
+http://shifeike.blog125.fc2blog.net
+http://boysfood.com
+http://kaufmich.com
+http://elnuevoherald.com
+http://sinembargo.mx
+http://8591.com.tw
+http://rapgenius.com
+http://ticketmonster.co.kr
+http://hotfrog.jp
+http://oddschecker.com
+http://danawa.com
+http://www.stickam.com
+http://identi.ca
+http://vtc.vn
+http://blog.co.uk
+http://nsgalleries.com
+http://tweetdeck.com
+http://crutchfield.com
+http://hotpornshow.com
+http://jagranjosh.com
+http://reviewcentre.com
+http://stickam.com
+http://tek-tips.com
+http://www.hotpornshow.com
+http://jumptags.com
+http://wizaz.pl
+http://hotel-urbano.com
+http://destructoid.com
+http://maturetube.com
+http://5i01.com
+http://he.net
+http://bbs-tw.com
+http://ray-ban.com
+http://viddler.com
+http://ccbs.ntu.edu.tw
+http://cnsnews.com
+http://transunion.com
+http://lulzimg.com
+http://foum.hkgolden.com
+http://newspaperdirect.com
+http://creaders.net
+http://orgasmof.ru
+http://potterybarnkids.com
+http://hack371.com
+http://virustotal.com
+http://forum.hkgolden.com
+http://mymodernmet.com
+http://kmtlbb.com
+http://siol.net
+http://meiyingie.com
+http://socialsecurity.gov
+http://network54.com
+http://gotovim-doma.ru
+http://cheaperthandirt.com
+http://hotgoo.com
+http://www.worldjournal.com
+http://lamoda.ru
+http://information.com
+http://savevid.com
+http://tsekouratoi.gr
+http://www.viddler.com
+http://wowtv.co.kr
+http://movies.com
+http://www.dateinasia.com
+http://pornaccess.com
+http://www.creaders.net
+http://hkgolden.com
+http://forum5.hkgolden.com
+http://24smile.org
+http://www.he.net
+http://savings.com
+http://dreamamateurs.com
+http://carscoop.blogspot.com
+http://girlfriendvideos.com
+http://worldjournal.com
+http://anneahira.com
+http://ftvgirls.com
+http://artnudegalleries.com
+http://mobawaba.com
+http://gadaadmongol.com
+http://busuk.org
+http://lawyers.com
+http://www.network54.com
+http://kabeldeutschland.de
+http://privet.ru
+http://sitetrail.com
+http://www.mingpao.com
+http://hyundai.com
+http://woopie.jp
+http://jetpack.wordpress.com
+http://westelm.com
+http://oursogo.com
+http://mysoftplace.com
+http://shangqu.info
+http://newplaynow.com
+http://jaidefinichon.com
+http://tommy.com
+http://trendhunter.com
+http://kansascity.com
+http://tomshw.it
+http://pacopacomama.com
+http://newplaysite.com
+http://meemessa.com
+http://mlbtraderumors.com
+http://el5antuario.org
+http://shemale-porn-galls.com
+http://bergfiles.com
+http://ratedporntube.com
+http://chanel.com
+http://chirpme.com
+http://zomobo.net
+http://blogdeizquierda.com
+http://sarkarinaukriblog.com
+http://php.su
+http://subscribe.wordpress.com
+http://signup.wordpress.com
+http://rfa.org
+http://upworthy.com
+http://klmty.net
+http://cfun.ir
+http://momovideo.net
+http://videobox.com
+http://ggsoku.com
+http://shoppingdaisy.com
+http://sannas.jp
+http://pornstarnetwork.com
+http://flashkhor.com
+http://parsonline.net
+http://huyandex.com
+http://akhbarelyom.org.eg
+http://cplusplus.com
+http://passion.com
+http://sbt.com.br
+http://remax.com
+http://korabia.com
+http://levante-emv.com
+http://mingpao.com
+http://sexpixbox.com
+http://jjgirls.com
+http://anyap.info
+http://gossip9.com
+http://googlewebmastercentral.blogspot.com
+http://kiwi.kz
+http://xxxaporn.com
+http://youtu.be
+http://tubegals.com
+http://preloved.co.uk
+http://basicscan.com
+http://kerala.gov.in
+http://fin24.com
+http://alrakoba.net
+http://travelandleisure.com
+http://hugoboss.com
+http://google.com.pa
+http://skybet.com
+http://tah.jp
+http://info.51.ca
+http://blog.51.ca
+http://saveyoutube.com
+http://manatelugumovies.net
+http://img.ly
+http://www.1pondo.tv
+http://gpil.org
+http://fora.pl
+http://homemade-voyeur.com
+http://thisdaylive.com
+http://fotopages.com
+http://ekra2.com
+http://youversion.com
+http://1pondo.tv
+http://funpic.de
+http://eg.ru
+http://jobkorea.co.kr
+http://Www.youversion.com
+http://google.is
+http://wwitv.com
+http://yidio.com
+http://lifehacker.ru
+http://lunarpages.com
+http://bbs.51.ca
+http://theoutnet.com
+http://www.livestation.com
+http://www.img.ly
+http://yyv.co
+http://chrispederick.com
+http://sharenxs.com
+http://www.wikileaks.org
+http://wikileaks.org
+http://dxlive.com
+http://amateursexy.net
+http://www.baidu.jp
+http://vertvonlinegratis.org
+http://taiwannation.50webs.com
+http://photographyblog.com
+http://fscstore.com
+http://whoismind.com
+http://www.jjgirls.com
+http://dancingbear.com
+http://ipicture.ru
+http://livestation.com
+http://articlerich.com
+http://jossandmain.com
+http://www.yidio.com
+http://jp-sex.com
+http://insidefacebook.com
+http://bet.hkjc.com
+http://foodandwine.com
+http://wordle.net
+http://scrippsnetworks.com
+http://baidu.jp
+http://bustnow.com
+http://lefora.com
+http://store.valvesoftware.com
+http://kpo-faq.blogspot.com
+http://www.sex141.com
+http://wazzub.com
+http://kingstone.com.tw
+http://hostingbulk.com
+http://smile-adult.com
+http://zend2.com
+http://hotfrog.in
+http://errotica-archives.com
+http://server8.kproxy.com
+http://drupal.ru
+http://www.kingstone.com.tw
+http://twilightsex.com
+http://bt.no
+http://qualityhealth.com
+http://ping.fm
+http://cwer.ru
+http://www.spike.com
+http://secretchina.com
+http://shanbara.jp
+http://www.ugo.com
+http://www.xxx.com
+http://server15.kproxy.com
+http://dotnetperls.com
+http://sexandsubmission.com
+http://hautetfort.com
+http://www.sexandsubmission.com
+http://tiavastube.com
+http://git-scm.com
+http://pagemodo.com
+http://stadt-bremerhaven.de
+http://blog.rockmelt.com
+http://gagnons-argent.com
+http://wealth2xtreme.com
+http://forum.baby-kingdom.com
+http://googleblog.blogspot.com
+http://fleshbot.com
+http://videobam.com
+http://21sextury.com
+http://sakuralive.com
+http://asredas.com
+http://www.18qt.com
+http://expekt.com
+http://hkbisi.com
+http://www.nexttv.com.tw
+http://porlaputa.com
+http://jkforum.net
+http://henhaoji.com
+http://anobii.com
+http://www.torproject.org
+http://torproject.org
+http://proxy.org
+http://sexinsex.net
+http://trendsmap.com
+http://ntdtv.com
+http://www.sexinsex.net
+http://nexttv.com.tw
+http://www.popyard.com
+http://www.ntdtv.com
+http://media.ntdtv.com
+http://www.pussy.org
+http://79.133.201.84.nyud.net
+http://temasektimes.wordpress.com
+http://chinanews.blog.ntdtv.com
+http://tunnel.shellmix.com.nyud.net
+http://powerapple.com
+http://popyard.com
+http://globalvoicesonline.org
+http://codereview.chromium.org
+http://feedbox.com
+http://rthk.org.hk
+http://blog.iphone-dev.org
+http://www.saveyoutube.com
+http://www.rthk.org.hk
+http://zh.globalvoicesonline.org
+http://www.globalvoicesonline.org
+http://www.taipei.gov.tw
+http://www.footytube.com
+http://twttr.com
+http://fr.globalvoicesonline.org
+http://yorkbbs.ca
+http://bbs.powerapple.com
+http://www.steves-digicams.com
+http://pleated-jeans.com
+http://forum.yorkbbs.ca
+http://lalulalu.com
+http://www.lalulalu.com
+http://page2rss.com
+http://virb.com
+http://iask.ca
+http://www.fileflyer.com
+http://tw.jiepang.com
+http://youtube-nocookie.com
+http://blog.sparrowmailapp.com
+http://www.islamhouse.com
+http://hellotxt.com
+http://toronto.iask.ca
+http://blog.path.com
+http://www.youtube-nocookie.com
+http://www.rthk.hk
+http://www.boxun.com
+http://www.wuala.com
+http://dumblittleman.com
+http://s20.youmaker.com
+http://westca.com
+http://www.huaren.us
+http://mysinablog.com
+http://rthk.hk
+http://hk.jiepang.com
+http://content.wuala.com
+http://www.sevenload.com
+http://news.boxun.com
+http://moviefap.com
+http://translate.twttr.com
+http://www.uswebproxy.com
+http://youmaker.com
+http://boxun.com
+http://sevenload.com
+http://htmldog.com
+http://en.favotter.net
+http://aboluowang.com
+http://www.cna.com.tw
+http://cna.com.tw
+http://www.aboluowang.com
+http://www.cn.sevenload.com
+http://im.tv
+http://translate.twttr.com
+http://www.t66y.com
+http://doujin-moe.us
+http://wuala.com
+http://www.minghui.org
+http://www.perfspot.com
+http://www.singtao.com
+http://t66y.com
+http://aisex.com
+http://webupd8.org
+http://www.voy.com
+http://www.megaporn.com
+http://wahas.com
+http://www.fxdd.com
+http://transferbigfiles.com
+http://megaporn.com
+http://enmasse.com
+http://www.openvpn.net
+http://minghui.org
+http://www.91porn.com
+http://tor.eff.org
+http://www.881903.com
+http://tor.updatestar.com
+http://www.wahas.com
+http://67.220.91.30
+http://zh.wikinews.org
+http://www.hrw.org
+http://kwongwah.com.my
+http://strongvpn.com
+http://welide.com
+http://www.strongvpn.com
+http://twitgoo.com
+http://marines.mil
+http://vanpeople.com
+http://scriptlance.com
+http://www.somee.com
+http://strongvpn.com
+http://bbs.skykiwi.com
+http://www.thepiratebay.org
+http://hrw.org
+http://www.theepochtimes.com
+http://ntq.comlu.com
+http://www.want-daily.com
+http://www.jensonusa.com
+http://faststone.org
+http://thepiratebay.org
+http://www.pcdvd.com.tw
+http://thepiratebay.org
+http://lesscss.org
+http://uncyclopedia.info
+http://www.fooooo.com
+http://movieworldsite.com
+http://db.stoptui.site88.net
+http://www.e-sim.org
+http://popyard.org
+http://www.gopetition.com
+http://gopetition.com
+http://amnesty.org
+http://www.amnesty.org
+http://www.es.amnesty.org
+http://kompozer.net
+http://www.popyard.org
+http://e-sim.org
+http://aculo.us
+http://m.tweete.net
+http://www.1688.com.au
+http://www.dopehood.com
+http://rocksoccer.co.cc
+http://www01.ktzhk.com
+http://disp.cc
+http://playpcesor.blogspot.com
+http://sports.now.com
+http://movie.now.com
+http://tweete.net
+http://www.oiktv.com
+http://www.searchtruth.com
+http://bbs.9gal.com
+http://kok2.no-blog.jp
+http://www.viewsonic.com
+http://pornstarclub.com
+http://nonstoptrafficformula.com
+http://oiktv.com
+http://apigee.com
+http://www.doh.gov.tw
+http://pioneer-worker.forums-free.com
+http://fooooo.com
+http://www.fring.com
+http://www.fb.me
+http://www.pornstarclub.com
+http://fring.com
+http://news.now.com
+http://www.now.com
+http://now.com
+http://blog.kowalczyk.info
+http://eic-av.com
+http://www.coolaler.com
+http://coolaler.com
+http://www.onthesamehost.com
+http://picasa-readme.blogspot.com
+http://twbbs.org
+http://twitiq.com
+http://0to255.com
+http://www.dongtaiwang.com
+http://www.moi.gov.tw
+http://dongtaiwang.com
+http://myfreshnet.com
+http://skimtube.com
+http://www.c-spanvideo.org
+http://www.surfagain.com
+http://en.bitcoin.it
+http://webconference.eadgear.com
+http://forum.slime.com.tw
+http://www.trtc.com.tw
+http://marketingsurvivalskills.com
+http://www.myfreshnet.com
+http://nakido.com
+http://wiki.oauth.net
+http://www.cyberghostvpn.com
+http://www.kenyanlist.com
+http://www.voachinese.com
+http://www.nakido.com
+http://turbohide.com
+http://www.sopcast.com
+http://wearn.com
+http://www.wearn.com
+http://cn2.streetvoice.com
+http://graphis.ne.jp
+http://www.porn365.com
+http://sopcast.com
+http://cyberghostvpn.com
+http://cyberghostvpn.com
+http://ahalife.com
+http://list.ly
+http://danlambaovn.blogspot.com
+http://getcloudapp.com
+http://news.singtao.ca
+http://web.pts.org.tw
+http://www.fulltiltpoker.com
+http://c-spanvideo.org
+http://developers.box.net
+http://dl.box.net
+http://www.apigee.com
+http://www.falundafa.org
+http://news.pts.org.tw
+http://twittergadget.com
+http://android-x86.org
+http://www.kaiyuan.de
+http://www.juzp.net
+http://ww.kaiyuan.de
+http://Www.ruero.com
+http://dropshots.com
+http://www.android-x86.org
+http://mingpaonews.com
+http://talk.news.pts.org.tw
+http://www.opendemocracy.net
+http://www.lanecrawford.com
+http://www.insidesearch.blogspot.com
+http://stitcher.com
+http://www.dw-world.de
+http://dw-world.de
+http://www.dotsub.com
+http://scrapetorrent.com
+http://www.anchorfree.com
+http://www.twittergadget.com
+http://tagxedo.com
+http://anchorfree.com
+http://kaiyuan.de
+http://twitthat.com
+http://newtalk.tw
+http://www.xys.org
+http://www.comefromchina.com
+http://alwaysdata.net
+http://np.cpami.gov.tw
+http://bbs.kimy.com.tw
+http://dabr.co.uk
+http://www.wantchinatimes.com
+http://www.moztw.org
+http://www.dabr.co.uk
+http://taiwankiss.com
+http://www.cotweet.com
+http://twbbs.tw
+http://city9x.com
+http://gutteruncensored.com
+http://www.troyhunt.com
+http://cotweet.com
+http://htl.li
+http://forosdz.info
+http://retweetrank.com
+http://www.englishdaily626.com
+http://alwaysdata.com
+http://www.myeasytv.com
+http://junauza.com
+http://comefromchina.com
+http://www.jaiku.com
+http://referer.us
+http://blog.gowalla.com
+http://www.newsblur.com
+http://williamlong.jaiku.com
+http://load.to
+http://www.sinoquebec.com
+http://www.rsf.org
+http://666kb.com
+http://getsmartlinks.com
+http://www.bullogs.com
+http://rsf.org
+http://twimbow.com
+http://zeutch.com
+http://bbs.mychat.to
+http://en.rsf.org
+http://www.soundofhope.org
+http://www.chinadigitaltimes.net
+http://twitoaster.com
+http://www.f3.proxymice.com
+http://chinadigitaltimes.net
+http://gtricks.com
+http://anonymizer.com
+http://dadi360.com
+http://www.letscorp.net
+http://www.wforum.com
+http://www.dadi360.com
+http://tvunetworks.com
+http://mypopescu.com
+http://littlebigdetails.com
+http://sitebro.tw
+http://echofon.com
+http://wforum.com
+http://tradus.in
+http://nexton-net.jp
+http://xys.org
+http://guitarlist.net
+http://www.anonymizer.com
+http://www.palacemoon.com
+http://zhengjian.org
+http://www.made-in-japan.org
+http://www.aolnews.com
+http://www.peacehall.com
+http://presentationzen.com
+http://twibs.com
+http://www.sitebro.tw
+http://palacemoon.com
+http://sharebee.com
+http://www.sharebee.com
+http://www.sex8.cc
+http://tumblr.awflasher.com
+http://www.pin6.com
+http://j.mp
+http://www.e-catworld.com
+http://dvorak.org
+http://renminbao.com
+http://www.e-gold.com
+http://peacehall.com
+http://thechangelog.com
+http://ranwen.com
+http://www.bullogger.com
+http://cocoawithlove.com
+http://www.branch.com
+http://www.pk.com
+http://fsurf.com
+http://www.fsurf.com
+http://tgn.tv
+http://overplay.net
+http://claimfans.com
+http://pk.com
+http://ultrasurf.us
+http://www.webnode.cn
+http://webnode.cn
+http://hkg.westkit.net
+http://asianews.it
+http://www.ultrasurf.us
+http://www.moea.gov.tw
+http://taiwan-sex.com
+http://hwinfo.com
+http://www.peopo.org
+http://www.ironhidegames.com
+http://soundofhope.org
+http://atnext.com
+http://bbs4.2djgame.net
+http://www.iredmail.org
+http://www.amnesty.org.uk
+http://yuming.flnet.org
+http://www.atnext.com
+http://0rz.tw
+http://chinahush.com
+http://www.spotflux.com
+http://www.privatetunnel.com
+http://www.myaudiocast.com
+http://www.eulam.com
+http://welivetogether.com
+http://bullogger.com
+http://www.0rz.tw
+http://democrats.org
+http://www.chinahush.com
+http://suprememastertv.com
+http://www.democrats.org
+http://www.iu45.com
+http://myaudiocast.com
+http://www.ezpeer.com
+http://bookshelfporn.com
+http://ezpeer.com
+http://e-gold.com
+http://pbxes.com
+http://elgoog.im
+http://www.elgoog.im
+http://www.zideo.nl
+http://lsforum.net
+http://twtr2src.ogaoga.org
+http://www.mingpaovan.com
+http://shaunthesheep.com
+http://www.laowaixiaohan.bloguje.cz
+http://sex8.cc
+http://blog.lightbox.com
+http://holz.byethost8.com
+http://jiehua.cz
+http://centurys.net
+http://www.centurys.net
+http://cpj.org
+http://nas.immigration.gov.tw
+http://www.tunnelbear.com
+http://www.shaunthesheep.com
+http://www.oxid.it
+http://www.sanmin.com.tw
+http://www.gov.tw
+http://freegateget.googlepages.com
+http://www.appinonline.com
+http://www.overplay.net
+http://www.overplay.net
+http://anti.anti.cnn.googlepages.com
+http://myboooks.googlepages.com
+http://bbs.ozchinese.com
+http://www.hideipvpn.com
+http://hideipvpn.com
+http://cnd.org
+http://www.cnd.org
+http://blog.summify.com
+http://mpinews.com
+http://storagenewsletter.com
+http://pacificpoker.com
+http://www.mingpaotor.com
+http://www.securitykiss.com
+http://www.pacificpoker.com
+http://appempire.com
+http://laowaixiaohan.bloguje.cz
+http://www.immigration.gov.tw
+http://www.f2.chinoxy.com
+http://i2p2.de
+http://www.i2p2.de
+http://art.twgg.org
+http://chinoxy.com
+http://www.hohosex.com
+http://imageflea.com
+http://freewallpaper4.me
+http://noor.moe.sa
+http://www.facebook.co
+http://tornadoweb.org
+http://www.your-freedom.net
+http://db.tt
+http://www.f1.chinoxy.com
+http://hardtied.com
+http://blog.aegisub.org
+http://facebok.com
+http://alasbarricadas.org
+http://91porn.44.lt
+http://www.choxe.net
+http://www.facebok.com
+http://www.chinoxy.com
+http://blog.dayoneapp.com
+http://www.jiehua.cz
+http://yawningbread.wordpress.com
+http://www.aceros-de-hispania.com
+http://www.kony2012.com
+http://e-info.org.tw
+http://iu45.com
+http://www.huayuworld.org
+http://www.brandibelle.com
+http://info.we.bs
+http://bloodshed.net
+http://www.revengebucks.com
+http://devio.us
+http://forum.my903.com
+http://www.onbux.com
+http://onbux.com
+http://www.marxist.com
+http://kurtmunger.com
+http://www.freedomhouse.org
+http://freedomhouse.org
+http://www.dalailama.com
+http://marxist.com
+http://www.facebook.fr
+http://goldwave.com
+http://zhongguo.ca
+http://yzzk.com
+http://pin6.com
+http://blog.pikchur.com
+http://shenyunperformingarts.org
+http://aniscartujo.com
+http://www.privateinternetaccess.com
+http://2-hand.info
+http://app.heywire.com
+http://privatepaste.com
+http://your-freedom.net
+http://paper-replika.com
+http://hogbaysoftware.com
+http://www.rileyguide.com
+http://www.yzzk.com
+http://sfileydy.com
+http://wiki2.jp
+http://nedproxy.com
+http://www.nedproxy.com
+http://dalailama.com
+http://newcenturynews.com
+http://www.jyzj.waqn.com
+http://jyzj.waqn.com
+http://www.ly.gov.tw
+http://www.piratebay.org
+http://www.rcinet.ca
+http://wenku.com
+http://www.ping.fm
+http://tagwalk.com
+http://singularitys.spaces.live.com
+http://wangyi64.spaces.live.com
+http://yezimary.spaces.live.com
+http://littlefishblueprint.com
+http://edoors.com
+http://surfert.nl
+http://isunaffairs.com
+http://www.sfileydy.com
+http://edmontonchina.cn
+http://www.1kho.com
+http://www.proxpn.com
+http://proxpn.com
+http://www.inmediahk.net
+http://inmediahk.net
+http://www.proxpn.com
+http://twistar.cc
+http://bbsland.com
+http://www.bbsland.com
+http://rileyguide.com
+http://piratebay.org
+http://zhllg.spaces.live.com
+http://chinese.soifind.com
+http://www.2-hand.info
+http://china-green-party.spaces.live.com
+http://hujiachina.spaces.live.com
+http://program-think.spaces.live.com
+http://wenyunchao.spaces.live.com
+http://huajiadi.spaces.live.com
+http://yanghengjun.spaces.live.com
+http://ieemdai.spaces.live.com
+http://www.wenku.com
+http://siyi123123123.spaces.live.com
+http://twitese.spaces.live.com
+http://williamlong.spaces.live.com
+http://bsd10.qnetau.com
+http://www.myupload.dk
+http://www.wisevid.com
+http://portis21.spaces.live.com
+http://zengjinyan.spaces.live.com
+http://cc9007.spaces.live.com
+http://flowerofhappiness.spaces.live.com
+http://chenyehao.spaces.live.com
+http://sublexical.spaces.live.com
+http://gufeng521.spaces.live.com
+http://honeonet.spaces.live.com
+http://www.aiuonline.edu
+http://chrome.blogspot.com
+http://facebook.de
+http://twip.me
+http://1-apple.com.tw
+http://anthonycalzadilla.com
+http://wisevid.com
+http://makemymood.com
+http://embr.in
+http://embr.in
+http://hotpot.hk
+http://linuxreviews.org
+http://cacnw.com
+http://www.tibet.com
+http://www.uan.edu.mx
+http://www.expatshield.com
+http://www.freeproxy.ro
+http://www.facbook.com
+http://www.yacy.net
+http://bfnn.org
+http://www.tweetbackup.com
+http://www.bfnn.org
+http://www.porn2.com
+http://www.anpopo.com
+http://badassjs.com
+http://waffle1999.com
+http://jpopforum.net
+http://www.kcna.co.jp
+http://rcinet.ca
+http://tsctv.net
+http://twiffo.com
+http://tweetbackup.com
+http://twftp.org
+http://etools.ncol.com
+http://4bluestones.biz
+http://geek-art.net
+http://zlib.net
+http://everyday-carry.com
+http://www.sobees.com
+http://www.mofa.gov.tw
+http://www.freenetproject.org
+http://www.bbs.tw789.net
+http://www.greatfirewallofchina.org
+http://koolsolutions.com
+http://www.xbookcn.com
+http://readingtimes.com.tw
+http://www.readingtimes.com.tw
+http://internationalrivers.org
+http://67.220.91.23
+http://kyck.com
+http://www.zqzj.net
+http://tibet.com
+http://www.facebook.de
+http://www.livevideo.com
+http://www.movements.org
+http://www.witopia.net
+http://www.witopia.net
+http://www.president.gov.tw
+http://www.ibvpn.com
+http://stats.wordpress.com
+http://program-think.blogspot.com
+http://www.shareonall.com
+http://www.sim-outhouse.com
+http://ait.org.tw
+http://fimotro.blogspot.com
+http://www.now.com.hk
+http://www.china-proxy.org
+http://xbookcn.com
+http://greatfirewallofchina.org
+http://fileim.com
+http://www.tw789.net
+http://8teenporn.com
+http://tweetwally.com
+http://qkshare.com
+http://bbs.tw789.net
+http://nuexpo.com
+http://www.tsemtulku.com
+http://www.internationalrivers.org
+http://snapbrowse.com
+http://maiio.net
+http://csuchen.de
+http://jingpin.org
+http://twbbs.net.tw
+http://thefacebookproxy.com
+http://bbg.gov
+http://www.pelaut.go.id
+http://witopia.net
+http://www.maiio.net
+http://igfw.net
+http://youtube.com.br
+http://www.chinageeks.org
+http://www.boxpn.com
+http://media.cottagecountrynow.ca
+http://www.myca168.com
+http://chinageeks.org
+http://alestic.com
+http://sorting-algorithms.com
+http://status.twhirl.org
+http://www.ginatv.com
+http://www.bbg.gov
+http://porn2.com
+http://rocmp.org
+http://mangareader.com
+http://www.seeon.tv
+http://photos.dailyme.com
+http://coolloud.org.tw
+http://sobees.com
+http://farxian.com
+http://tsemtulku.com
+http://www.worldpress.com
+http://torstatus.blutmagie.de
+http://www.mnnit.ac.in
+http://mirrorbooks.com
+http://expatshield.com
+http://qidian.ca
+http://drugpolicy.org
+http://www.anonasurf.com
+http://pbwiki.com
+http://boxitvn.blogspot.com
+http://appempire1.com
+http://canyu.org
+http://www.googl.com
+http://www.thepiratebay.com
+http://twitter.jp
+http://favorious.com
+http://vpn-pay.itshidden.com
+http://truveo.com
+http://www.tsctv.net
+http://kenengba.com
+http://internetfreedom.org
+http://naol.ca
+http://www.farxian.com
+http://www.fpmt.org
+http://www.vpn4all.com
+http://mk5000.com
+http://www.phayul.com
+http://phayul.com
+http://ccthere.com
+http://googlevideo.com
+http://www.itshidden.com
+http://www.wujieliulan.com
+http://twiyia.com
+http://www.taiwandaily.net
+http://www.powerpointninja.com
+http://www.twbbs.net.tw
+http://www.brookemarks.com
+http://www.techinterview.org
+http://zonaeuropa.com
+http://www.canyu.org
+http://www.webrush.net
+http://www.mckaywei.com
+http://web2project.net
+http://www.civicparty.hk
+http://mademoisellerobot.com
+http://tibet.net
+http://xijie.wordpress.com
+http://www.kenengba.com
+http://x1949x.com
+http://www.zonaeuropa.com
+http://anonasurf.com
+http://www.asiaharvest.org
+http://www.naol.ca
+http://wujieliulan.com
+http://yx51.net
+http://mobileways.de
+http://www.ccthere.com
+http://techlifeweb.com
+http://cn.fmnnow.com
+http://www.supervpn.net
+http://www.googlevideo.com
+http://www.expressvpn.com
+http://www.autospec.co.za
+http://www.truveo.com
+http://areca-backup.org
+http://www.vpnreactor.com
+http://www.duping.net
+http://zarias.com
+http://www.ned.org
+http://www.mk5000.com
+http://mckaywei.com
+http://www.boxpn.com
+http://www.cryptocloud.com
+http://civicparty.hk
+http://kenengba.com
+http://www.tibet.net
+http://brandonhutchinson.com
+http://www.expressvpn.com
+http://duping.net
+http://www.kenengba.com
+http://triangulationblog.com
+http://myca168.com
+http://radiofreechina.wordpress.com
+http://stephenmooredesign.wordpress.com
+http://abc.wordpress.com
+http://teflandlouise.wordpress.com
+http://fromcanadatofinland.wordpress.com
+http://fashiontech.wordpress.com
+http://www.richardjangus.wordpress.com
+http://beijingnaarhongkong.wordpress.com
+http://sample.wordpress.com
+http://caiting666.wordpress.com
+http://anyname.wordpress.com
+http://whotolduthat.wordpress.com
+http://rfaunplugged.wordpress.com
+http://reinesklareslicht.wordpress.com
+http://afterthestroke.wordpress.com
+http://skittlesinchina.wordpress.com
+http://abcdefg.wordpress.com
+http://zh-sg.wordpress.com
+http://facebookdata.wordpress.com
+http://lancasterleaflets.wordpress.com
+http://markerhunter.wordpress.com
+http://zhenxiang.wordpress.com
+http://imsirius.wordpress.com
+http://tibetnorway.wordpress.com
+http://cenantua.wordpress.com
+http://seotch.wordpress.com
+http://djcadchina.wordpress.com
+http://socialnetworkguru.wordpress.com
+http://quhelan.wordpress.com
+http://maoistrebelnews.wordpress.com
+http://zh.wordpress.com
+http://wordpress.com
+http://mw2mk.wordpress.com
+http://translate.googleusercontent.com
+http://webcache.googleusercontent.com
+http://lh4.googleusercontent.com
+http://webcache.googleusercontent.com
+http://winqual.microsoft.com
+http://my.mail.ru
+http://t.co
+http://t.co
+http://www.t.co
+http://www.google.it
+http://www.blogger.com
+http://blogger.com
+http://draft.blogger.com
+http://xhamster.com
+http://www.xhamster.com
+http://imdb.com
+http://www.imdb.com
+http://www.fc2.com
+http://fc2.com
+http://toruyamada.web.fc2.com
+http://kitchenremodelideas.blog138.fc2.com
+http://ninionlytw.web.fc2.com
+http://nijibug.blog131.fc2.com
+http://www.xvideos.com
+http://xvideos.com
+http://paulsumiko.blog46.fc2.com
+http://video.aol.com
+http://aolchannels.aol.com
+http://search.aol.com
+http://geezericious.blogspot.in
+http://evolutionguide.blogspot.in
+http://hqlenglish.blogspot.in
+http://ukiahcoachbrown.blogspot.in
+http://www.thepiratebay.se
+http://thepiratebay.se
+http://thepiratebay.se
+http://cart.godaddy.com
+http://www.netflix.com
+http://signup.netflix.com
+http://www.redtube.com
+http://www.netflix.com
+http://netflix.com
+http://redtube.com
+http://3.bp.blogspot.com
+http://youporn.com
+http://www.youporn.com
+http://dailymotion.com
+http://www.dailymotion.com
+http://4.bp.blogspot.com
+http://2.bp.blogspot.com
+http://xnxx.com
+http://www.badoo.com
+http://badoo.com
+http://www.vimeo.com
+http://tube8.com
+http://vimeo.com
+http://www.vimeo.com
+http://www.tube8.com
+http://email10.secureserver.net
+http://login.secureserver.net
+http://www.secureserver.net
+http://default.secureserver.net
+http://secureserver.net
+http://ip-173-201-135-189.ip.secureserver.net
+http://www.dropbox.com
+http://dl-web.dropbox.com
+http://d.dropbox.com
+http://hk32168.com
+http://www.hemispheregames.com
+http://airvpn.org
+http://www.gourmetgaming.co.uk
+http://askakorean.blogspot.com
+http://08charterbbs.blogspot.com
+http://asiaharvest.org
+http://www.ultravpn.fr
+http://www.ivacy.com
+http://tjholowaychuk.com
+http://mychinamyhome.com
+http://mixx.com
+http://www.mixx.com
+http://open.com.hk
+http://danwei.org
+http://www.hecaitou.net
+http://evhead.com
+http://christianstudy.com
+http://ultravpn.fr
+http://forum.mymaji.com
+http://www.pekingduck.org
+http://www.puretna.com
+http://www.nogomi.com
+http://hecaitou.net
+http://dphk.org
+http://www.hk32168.com
+http://www.smarterdailydeal.com
+http://taiwandaily.net
+http://www.medical-explorer.com
+http://yatsen.gov.tw
+http://tweetymail.com
+http://tvider.com
+http://njuice.com
+http://www.5pic.com
+http://furl.net
+http://dit-inc.us
+http://www.inxian.com
+http://www.youtube.de
+http://airvpn.org
+http://www.twitstat.com
+http://twitstat.com
+http://taiwanyes.ning.com
+http://www.gpass1.com
+http://www.snaptu.com
+http://snaptu.com
+http://tweetree.com
+http://www.open.com.hk
+http://gpass1.com
+http://www.vpnaccounts.com
+http://www.koornk.com
+http://koornk.com
+http://www.mingpaony.com
+http://www.mychinamyhome.com
+http://mash.to
+http://www.proxeasy.com
+http://chevronwp7.com
+http://www.danwei.org
+http://chinaaffairs.org
+http://www.64tianwang.com
+http://www.toodoc.com
+http://tunnel.shellmix.com
+http://savetibet.org
+http://zh.greatfire.org
+http://64tianwang.com
+http://www.allinfa.com
+http://www.cmule.com
+http://tweetboard.com
+http://vpnreactor.com
+http://www.twitturly.com
+http://chaos.e-spacy.com
+http://www.my-private-network.co.uk
+http://www.my-private-network.co.uk
+http://twitturly.com
+http://www.lastwordonnothing.com
+http://www.swissvpn.net
+http://iphonix.fr
+http://zh.greatfire.org
+http://sharecool.org
+http://my-private-network.co.uk
+http://www.greatfire.org
+http://www.greatfire.org
+http://www.online.hk
+http://www.freexinwen.com
+http://alkasir.com
+http://www.chinagfw.org
+http://www.swingasia.com
+http://openleaks.org
+http://www.openleaks.org
+http://salvation.org.hk
+http://blog.jtbworld.com
+http://deibert.citizenlab.org
+http://tsunamivpn.com
+http://www.xxx
+http://test.greatfire.org
+http://allaboutalpha.com
+http://facebook.it
+http://uwants.net
+http://www.superfreevpn.com
+http://www.salvation.org.hk
+http://pekingduck.org
+http://dropbox.com
+http://dl.dropbox.com
+http://zh.uncyclopedia.wikia.com
+http://downloads.sourceforge.net
+http://ultrasurf.en.softonic.com
+http://xwpm.sourceforge.net
+http://sourceforge.net
+http://sourceforge.net
+http://audacity.sourceforge.net
+http://cn.uncyclopedia.wikia.com
+http://foxnews.com
+http://secure.wikimedia.org
+http://www.justbeenpaid.com
+http://secure.wikimedia.org
+http://skype.com
+http://ui.skype.com
+http://fr.myspace.com
+http://www.fbcdn.net
+http://www.myspace.com
+http://fbcdn.net
+http://www.skype.com
+http://viewmorepics.myspace.com
+http://blogs.myspace.com
+http://www.blogs.myspace.com
+http://myspace.com
+http://justbeenpaid.com
+http://adultfriendfinder.com
+http://www.adultfriendfinder.com
+http://slideshare.net
+http://hootsuite.com
+http://www.slideshare.net
+http://www.files.wordpress.com
+http://scribd.com
+http://www.hootsuite.com
+http://allonlinux.free.fr
+http://www.scribd.com
+http://kineox.free.fr
+http://smile-pow13.nicovideo.jp
+http://cam4.com
+http://files.wordpress.com
+http://www.nicovideo.jp
+http://de.cam4.com
+http://nicovideo.jp
+http://www.cam4.com
+http://google.com.ua
+http://imageshack.us
+http://live.nicovideo.jp
+http://isohunt.com
+http://www.isohunt.com
+http://www.imageshack.us
+http://www.xing.com
+http://xing.com
+http://www.hardsextube.com
+http://www.mashable.com
+http://mashable.com
+http://adserverplus.com
+http://hardsextube.com
+http://rutracker.org
+http://evolutionguide.blogspot.co.uk
+http://www.cthulhupodcast.blogspot.co.uk
+http://1234.weebly.com
+http://blackheathbabysitting.weebly.com
+http://easychinese.weebly.com
+http://transferstudent.weebly.com
+http://drtuber.com
+http://www.drtuber.com
+http://zimbio.com
+http://transferstudentcn.weebly.com
+http://www.zimbio.com
+http://hulu.com
+http://www.hulu.com
+http://bet365.com
+http://www.bet365.com
+http://google.cz
+http://www.battle.net
+http://www.gutefrage.net
+http://gutefrage.net
+http://www.twitpic.com
+http://wretch.cc
+http://www.dayaarmongol.ning.com
+http://www.wretch.cc
+http://dayaarmongol.ning.com
+http://twitpic.com
+http://bloomberg.com
+http://www.longlivehhdl.ning.com
+http://www.linkbucks.com
+http://www.bloomberg.com
+http://tmz.com
+http://linkbucks.com
+http://www.multiply.com
+http://miles6k.multiply.com
+http://multiply.com
+http://chinese.engadget.com
+http://taiwanblogs.blogspot.it
+http://www.spankwire.com
+http://goodreads.com
+http://www.goodreads.com
+http://spankwire.com
+http://blog.bitly.com
+http://www.bitly.com
+http://bitly.com
+http://www.newegg.com
+http://888.com
+http://www.888.com
+http://feeds.feedburner.com
+http://123rf.com
+http://nba.com
+http://www.123rf.com
+http://store.nokia.com
+http://pornhublive.com
+http://www.pornhublive.com
+http://www.nba.com
+http://www.macys.com
+http://macys.com
+http://www.pixnet.net
+http://blekko.com
+http://ustream.tv
+http://www.ustream.tv
+http://porntube.com
+http://www.imagevenue.com
+http://imagevenue.com
+http://metacafe.com
+http://www.blogimg.jp
+http://www.metacafe.com
+http://pixnet.net
+http://freakshare.com
+http://www.freakshare.com
+http://posterous.com
+http://www.pornerbros.com
+http://alarabiya.net
+http://www.alarabiya.net
+http://www.justin.tv
+http://www.geocities.jp
+http://partypoker.com
+http://justin.tv
+http://www.partypoker.com
+http://hidemyass.com
+http://7.hidemyass.com
+http://1.hidemyass.com
+http://www.businessweek.com
+http://businessweek.com
+http://paper.li
+http://arielefraimashbel.blogspot.com.ar
+http://blogspot.com.ar
+http://urbandictionary.com
+http://vpn.hidemyass.com
+http://pornerbros.com
+http://blog.udn.com
+http://www.udn.com
+http://alnaddy.com
+http://udn.com
+http://www.yfrog.com
+http://www.hidemyass.com
+http://6.hidemyass.com
+http://goo.gl
+http://a.yfrog.com
+http://kriz-cpec.posterous.com
+http://nimingdepengyou.posterous.com
+http://writer.zoho.com
+http://arielefraimashbel.blogspot.com.au
+http://biocouture.posterous.com
+http://www.paper.li
+http://www.posterous.com
+http://mbc.net
+http://eyny.com
+http://www.empflix.com
+http://www.eyny.com
+http://yfrog.com
+http://nfl.com
+http://city.udn.com
+http://video.udn.com
+http://forum.udn.com
+http://blog.disqus.com
+http://networkedblogs.com
+http://geezericious.blogspot.com.au
+http://newsabeta.blogspot.com.au
+http://freeones.com
+http://blogspot.com.au
+http://www.88db.com
+http://www.delta.com
+http://yobt.com
+http://www.freeones.com
+http://franklin-chow.blogspot.com.au
+http://hqlenglish.blogspot.com.au
+http://www.xvideoslive.com
+http://lci.tf1.fr
+http://extremetube.com
+http://meetcheap.com
+http://pornoxo.com
+http://www.foursquare.com
+http://foursquare.com
+http://fapdu.com
+http://www.lenovo.com
+http://www.wn.com
+http://forum.pchome.com.tw
+http://mypaper.pchome.com.tw
+http://blackhatteam.com
+http://wn.com
+http://www.demonoid.me
+http://demonoid.me
+http://www.networkedblogs.com
+http://www.mobile01.com
+http://mobile01.com
+http://dtiblog.com
+http://www.dtiblog.com
+http://www.pchome.com.tw
+http://blog.pchome.com.tw
+http://news.pchome.com.tw
+http://fandango.com
+http://pchome.com.tw
+http://n.yam.com
+http://asg.to
+http://diigo.com
+http://mymedia.yam.com
+http://screencast.com
+http://news.yam.com
+http://na.leagueoflegends.com
+http://break.com
+http://blog.yam.com
+http://times.hinet.net
+http://livestream.com
+http://www.livestream.com
+http://xa.yimg.com
+http://autotrader.com
+http://comcast.com
+http://www.break.com
+http://real.com
+http://www.diigo.com
+http://www.betfair.com
+http://betfair.com
+http://change.org
+http://www.change.org
+http://www.tunein.com
+http://tunein.com
+http://g.e-hentai.org
+http://chn.chosun.com
+http://www.asg.to
+http://technorati.com
+http://balagana.net
+http://www.panoramio.com
+http://google.com.om
+http://appledaily.com.tw
+http://tigerdirect.com
+http://wwe.com
+http://shopping.com
+http://friendfeed.com
+http://blog.dribbble.com
+http://www.yousendit.com
+http://google.co.ke
+http://www.tigerdirect.com
+http://forum.chinatimes.com
+http://www.tweetmeme.com
+http://yebhi.com
+http://www.technorati.com
+http://tweetmeme.com
+http://blog.chinatimes.com
+http://wikimapia.org
+http://rk.com
+http://tubewolf.com
+http://6park.com
+http://blog.nownews.com
+http://news.chinatimes.com
+http://camera.chinatimes.com
+http://forum.nownews.com
+http://plurk.com
+http://cafepress.com
+http://boardreader.com
+http://torrenthound.com
+http://tala.ir
+http://yobt.tv
+http://www.cafepress.com
+http://www.2shared.com
+http://realitykings.com
+http://2shared.com
+http://www.6park.com
+http://ime.nu
+http://wnd.com
+http://gamestlbb.com
+http://wenxuecity.com
+http://hk.apple.nextmedia.com
+http://www.plurk.com
+http://jamnews.ir
+http://bdnews24.com
+http://forever21.com
+http://elkhabar.com
+http://www.wenxuecity.com
+http://caribbeancom.com
+http://togetter.com
+http://rutube.ru
+http://luntan.zaobao.com
+http://tuite.googlecode.com
+http://spartoo.com
+http://tradus.com
+http://sttlbb.com
+http://naughtyamerica.com
+http://segundamano.es
+http://expressen.se
+http://www.lusongsong.com
+http://gfwinterceptor.googlecode.com
+http://ibibo.com
+http://www.ibibo.com
+http://old.nabble.com
+http://wiley.com
+http://leilao.jp
+http://v8.googlecode.com
+http://www.rutube.ru
+http://forums.wordpress.com
+http://www.efukt.com
+http://gtap.googlecode.com
+http://xmatch.com
+http://efukt.com
+http://fotomac.com.tr
+http://tv.com
+http://boinc.berkeley.edu
+http://binaryoptions24h.com
+http://index.hr
+http://cliphunter.com
+http://en.wordpress.com
+http://ow.ly
+http://blog.xuite.net
+http://www.ow.ly
+http://www.sex.com
+http://livetv.ru
+http://torrentcrazy.com
+http://topsy.com
+http://tiao8.info
+http://pornbb.org
+http://shorouknews.com
+http://sex.com
+http://www.topsy.com
+http://voanews.com
+http://cams.com
+http://www.dw.de
+http://dw.de
+http://myvideo.de
+http://sbnation.com
+http://www.erepublik.com
+http://bbs.sina.com
+http://home.sina.com
+http://rconversation.blogs.com
+http://sina.com
+http://dailynews.sina.com
+http://tweakers.net
+http://www.sina.com
+http://erepublik.com
+http://tokyo-porn-tube.com
+http://www.myvideo.de
+http://veoh.com
+http://discuss.com.hk
+http://support.wordpress.com
+http://babosas.com
+http://googleapis.com
+http://www.ck101.com
+http://www.discuss.com.hk
+http://www.cloudflare.com
+http://uniqlo.com
+http://twipple.jp
+http://wiki.jqueryui.com
+http://ptcbox.com
+http://www.veoh.com
+http://www.yuvutu.com
+http://www.nrk.no
+http://tokyo-tube.com
+http://google.co.ug
+http://eforosh.com
+http://ck101.com
+http://hotelurbano.com.br
+http://yuvutu.com
+http://anonymouse.org
+http://findicons.com
+http://apetube.com
+http://blogspot.fi
+http://gogvo.com
+http://twitterfeed.com
+http://www.mobypicture.com
+http://aukro.cz
+http://www.books.com.tw
+http://nubiles.net
+http://zh.pokerstrategy.com
+http://cn.calameo.com
+http://ebookbrowse.com
+http://bsnl.co.in
+http://avaaz.org
+http://www.plus28.com
+http://elespectador.com
+http://nrk.no
+http://www.avaaz.org
+http://plus28.com
+http://mobypicture.com
+http://www.twitterfeed.com
+http://homemademoviez.com
+http://v-mire.com
+http://www.geocities.co.jp
+http://problogger.net
+http://jagran.com
+http://willhaben.at
+http://tv2.dk
+http://maps.ovi.com
+http://reclameaqui.com.br
+http://store.ovi.com
+http://whatismyip.com
+http://snagajob.com
+http://books.com.tw
+http://bwin.com
+http://izlesene.com
+http://corrieredellosport.it
+http://pizzahut.com
+http://xxxymovies.com
+http://freshxxxtube.com
+http://www.aftenposten.no
+http://mouthshut.com
+http://yammer.com
+http://www5.kinghost.com
+http://twitlonger.com
+http://www.twitlonger.com
+http://forum.tvb.com
+http://pornsake.com
+http://homemadesextube.com
+http://wayfair.com
+http://cuantocabron.com
+http://devshed.com
+http://the-sun.on.cc
+http://gossiplankanews.com
+http://blogspot.co.at
+http://thehun.com
+http://rotoworld.com
+http://video.foxbusiness.com
+http://petsmart.com
+http://badjojo.com
+http://www.hgtv.com
+http://allanalpass.com
+http://gammae.com
+http://frankfinn.in
+http://mysitecost.ru
+http://hgtv.com
+http://aaa.com
+http://twitvid.com
+http://kinghost.com
+http://ht.ly
+http://crackle.com
+http://malaysiakini.com
+http://punyu.com
+http://ssa.gov
+http://lists.debian.org
+http://bloglovin.com
+http://nps.gov
+http://www.bebo.com
+http://www.nps.gov
+http://sportsdirect.com
+http://china.dwnews.com
+http://bravenet.com
+http://perfectworld.com
+http://bebo.com
+http://dickssportinggoods.com
+http://femjoy.com
+http://rubias19.com
+http://bloomingdales.com
+http://mmaaxx.com
+http://www.twitvid.com
+http://indianpornvid.com
+http://potterybarn.com
+http://animecrazy.net
+http://web.ics.purdue.edu
+http://www.blog.de
+http://webshots.com
+http://urbanoutfitters.com
+http://crackberry.com
+http://rg.ru
+http://kajabi.com
+http://calottery.com
+http://www.webshots.com
+http://freeservers.com
+http://commentshk.blogspot.hk
+http://wqw2010.blogspot.hk
+http://www.fakku.net
+http://camfrog.com
+http://royalty7.com
+http://blog.de
+http://blog.roodo.com
+http://www.urbanoutfitters.com
+http://wearehairy.com
+http://fakku.net
+http://libertytimes.com.tw
+http://microworkers.com
+http://supersport.com
+http://www.hotspotshield.com
+http://dwnews.com
+http://teamliquid.net
+http://wickedfire.com
+http://tunisia-sat.com
+http://miami.com
+http://blog.sina.com.tw
+http://bangbros1.com
+http://pandora.tv
+http://videosurf.com
+http://vh1.com
+http://pbase.com
+http://akiba-online.com
+http://politiken.dk
+http://www.pandora.tv
+http://news.sina.com.tw
+http://startpage.com
+http://occ.com.mx
+http://www.camfrog.com
+http://hotspotshield.com
+http://www.libertytimes.com.tw
+http://mitbbs.com
+http://www.animecrazy.net
+http://cosmiq.de
+http://desidime.com
+http://sacbee.com
+http://mforos.com
+http://www.twittercounter.com
+http://www.mitbbs.com
+http://cimbclicks.com.my
+http://www.mefeedia.com
+http://www.pbworks.com
+http://magazines.sina.com.tw
+http://kariyer.net
+http://boots.com
+http://pbworks.com
+http://websiteforever.com
+http://www.chinese.rfi.fr
+http://wikiwiki.jp
+http://idol-blog.com
+http://amakings.com
+http://amino.dk
+http://causes.com
+http://coches.net
+http://rfi.fr
+http://www.rfi.fr
+http://imgsrc.ru
+http://galeon.com
+http://ripoffreport.com
+http://freelotto.com
+http://blip.tv
+http://www.blip.tv
+http://kobobooks.com
+http://derekhsu.homeip.net
+http://bookofsex.com
+http://italia-film.com
+http://pimpandhost.com
+http://arte.tv
+http://mefeedia.com
+http://partycasino.com
+http://governmentjobs.com
+http://stltoday.com
+http://yad2.co.il
+http://www.freelotto.com
+http://pagewash.com
+http://guitarcenter.com
+http://sexfinder.com
+http://elifting.com
+http://joomlaforum.ru
+http://maomaotlbb.com
+http://korben.info
+http://self.com
+http://hdporn.in
+http://tinychat.com
+http://wattpad.com
+http://www.wattpad.com
+http://boyfriendtv.com
+http://via.me
+http://bodisparking.com
+http://www.paltalk.com
+http://paltalk.com
+http://simplyrecipes.com
+http://epochtimes.com
+http://khan.co.kr
+http://www.simplyrecipes.com
+http://goldline.pro
+http://www.alabout.com
+http://www.tinychat.com
+http://gidonline.ru
+http://lexilogos.com
+http://mmtlsf.com
+http://www.epochtimes.com
+http://activerain.com
+http://www.korben.info
+http://moviehuts.com
+http://myfreepaysite.com
+http://mobli.com
+http://gsmspain.com
+http://www.17wtlbb.com
+http://englishtown.com
+http://cn.news.cnyes.com
+http://gamebase.com.tw
+http://www.gamebase.com.tw
+http://ddfcash.com
+http://cl.ly
+http://alabout.com
+http://flalottery.com
+http://gohappy.com.tw
+http://favstar.fm
+http://swtor.com
+http://immi.gov.au
+http://heydouga.com
+http://justunfollow.com
+http://getiton.com
+http://radioshack.com
+http://topic.youthwant.com.tw
+http://anchorfree.net
+http://cakephp.org
+http://forum.sina.com.hk
+http://goibibo.com
+http://www.sugarsync.com
+http://fux.com
+http://onekingslane.com
+http://ghacks.net
+http://definebabe.com
+http://blog.youthwant.com.tw
+http://sport24.co.za
+http://twilog.org
+http://eventful.com
+http://gfrevenge.com
+http://onlinewatchmovies.net
+http://duga.jp
+http://zh.wikisource.org
+http://rghost.ru
+http://hkreporter.com
+http://bigtits.com
+http://ladbrokes.com
+http://mid-day.com
+http://wiki.phonegap.com
+http://internetslang.com
+http://gnc.com
+http://vuku.ru
+http://kporno.com
+http://tro-ma-ktiko.blogspot.com
+http://tadawul.com.sa
+http://mail-archive.com
+http://www.mail-archive.com
+http://xtc-modified.org
+http://aviny.com
+http://mybloggertricks.com
+http://listentoyoutube.com
+http://articlesnatch.com
+http://aukro.ua
+http://burningcamel.com
+http://freepornofreeporn.com
+http://www.zinio.com
+http://weblagu.com
+http://www.sugarsync.com
+http://tvp.pl
+http://1stcngame.com
+http://xtlbb.com
+http://powersearchingwithgoogle.com
+http://www.hegre-art.com
+http://imagecherry.com
+http://assembla.com
+http://career.co.kr
+http://zinio.com
+http://sytes.net
+http://www.ptt.cc
+http://theme.wordpress.com
+http://www.rfa.org
+http://lindaikeji.blogspot.com
+http://wehkamp.nl
+http://sugarsync.com
+http://www.hkreporter.com
+http://key.com
+http://williams-sonoma.com
+http://club.backchina.com
+http://fastlink.sytes.net
+http://www.sytes.net
+http://hotfrog.com
+http://www.hrnm.navy.mil
+http://ch.shvoong.com
+http://browsershots.org
+http://www.backchina.com
+http://codecademy.com
+http://share.youthwant.com.tw
+http://puritanas.com
+http://blinkx.com
+http://www.cam.ac.uk
+http://www.tweetdeck.com
+http://iran-eng.com
+http://green-flowers.net
+http://oszone.net
+http://gq.com
+http://lastfm.es
+http://websurf.ru
+http://tmi.me
+http://dziennik.pl
+http://pantheranetwork.com
+http://newsbusters.org
+http://xuk.ru
+http://www.megavideo.com
+http://allstate.com
+http://megavideo.com
+http://allfacebook.com
+http://www.thisav.com
+http://uberhumor.com
+http://dallasnews.com
+http://dotup.org
+http://www.blinkx.com
+http://evolutionguide.blogspot.co.nz
+http://kjendis.no
+http://backchina.com
+http://hegre-art.com
1
0
[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 19 Aug '12
by translation＠torproject.org 19 Aug '12
19 Aug '12
commit 1fa62f8fba228d91548d05b53e65c493b1d2fcf4
Author: Translation commit bot <translation(a)torproject.org>
Date: Sun Aug 19 16:45:12 2012 +0000
Update translations for vidalia_alpha
---
fa/vidalia_fa.po | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fa/vidalia_fa.po b/fa/vidalia_fa.po
index 8837de4..129fcbf 100644
--- a/fa/vidalia_fa.po
+++ b/fa/vidalia_fa.po
@@ -2,14 +2,15 @@
# Translators:
# Ardeshir <ardeshir(a)redteam.io>, 2012.
# <behravanhamed(a)gmail.com>, 2011.
+# <mohammad(a)azeribalasi.com>, 2012.
# <slander_mo(a)hotmail.com>, 2012.
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
"POT-Creation-Date: 2012-03-21 17:46+0000\n"
-"PO-Revision-Date: 2012-05-07 17:44+0000\n"
-"Last-Translator: Navid Chalangaran <chalangaran(a)gmail.com>\n"
+"PO-Revision-Date: 2012-08-19 16:36+0000\n"
+"Last-Translator: mohammad.s.n <mohammad(a)azeribalasi.com>\n"
"Language-Team: translations(a)vidalia-project.net\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
1
0
19 Aug '12
commit 346cd4e6cd1b028bb5f772b1a0bf15c2b2e12ae3
Author: Arturo Filastò <hellais(a)torproject.org>
Date: Sun Aug 19 00:48:03 2012 -0700
Implement Eigenvector based classifier
This allows creation of databases containing the feature sets of websites to be
monitored for censorship. If we find that the page being loaded does not have
similar eigenvectors to the original page, it is probable that we are in front
of a block page.
---
ooni/plugins/daphn3.py | 2 +-
ooni/plugins/domclass.py | 133 ++++++++++++++++++++++++++++++++++++++++++++++
ooni/protocols/http.py | 7 ++-
3 files changed, 138 insertions(+), 4 deletions(-)
diff --git a/ooni/plugins/daphn3.py b/ooni/plugins/daphn3.py
index 6911623..de3df26 100644
--- a/ooni/plugins/daphn3.py
+++ b/ooni/plugins/daphn3.py
@@ -84,7 +84,7 @@ class daphn3Test(OONITest):
if not self.local_options:
self.end()
return
- #pass
+
self.factory = Daphn3ClientFactory()
self.factory.test = self
diff --git a/ooni/plugins/domclass.py b/ooni/plugins/domclass.py
new file mode 100644
index 0000000..5c9b6fb
--- /dev/null
+++ b/ooni/plugins/domclass.py
@@ -0,0 +1,133 @@
+"""
+This is a self genrated test created by scaffolding.py.
+you will need to fill it up with all your necessities.
+Safe hacking :).
+"""
+from zope.interface import implements
+from twisted.python import usage
+from twisted.plugin import IPlugin
+from ooni.plugoo.tests import ITest, OONITest
+from ooni.plugoo.assets import Asset
+from ooni.utils import log
+from ooni.protocols.http import HTTPTest
+
+class domclassArgs(usage.Options):
+ optParameters = [['output', 'o', None, 'Output to write'],
+ ['file', 'f', None, 'Corpus file'],
+ ['fileb', 'b', None, 'Corpus file'],
+ ['asset', 'a', None, 'URL List'],
+ ['resume', 'r', 0, 'Resume at this index']]
+alltags = ['A', 'ABBR', 'ACRONYM', 'ADDRESS', 'APPLET', 'AREA', 'B', 'BASE',
+ 'BASEFONT', 'BD', 'BIG', 'BLOCKQUOTE', 'BODY', 'BR', 'BUTTON', 'CAPTION',
+ 'CENTER', 'CITE', 'CODE', 'COL', 'COLGROUP', 'DD', 'DEL', 'DFN', 'DIR', 'DIV',
+ 'DL', 'DT', 'E M', 'FIELDSET', 'FONT', 'FORM', 'FRAME', 'FRAMESET', 'H1', 'H2',
+ 'H3', 'H4', 'H5', 'H6', 'HEAD', 'HR', 'HTML', 'I', 'IFRAME ', 'IMG',
+ 'INPUT', 'INS', 'ISINDEX', 'KBD', 'LABEL', 'LEGEND', 'LI', 'LINK', 'MAP',
+ 'MENU', 'META', 'NOFRAMES', 'NOSCRIPT', 'OBJECT', 'OL', 'OPTGROUP', 'OPTION',
+ 'P', 'PARAM', 'PRE', 'Q', 'S', 'SAMP', 'SCRIPT', 'SELECT', 'SMALL', 'SPAN',
+ 'STRIKE', 'STRONG', 'STYLE', 'SUB', 'SUP', 'TABLE', 'TBODY', 'TD',
+ 'TEXTAREA', 'TFOOT', 'TH', 'THEAD', 'TITLE', 'TR', 'TT', 'U', 'UL', 'VAR']
+
+commontags = ['A', 'B', 'BLOCKQUOTE', 'BODY', 'BR', 'BUTTON', 'CAPTION',
+ 'CENTER', 'CITE', 'CODE', 'COL', 'DD', 'DIV',
+ 'DL', 'DT', 'EM', 'FIELDSET', 'FONT', 'FORM', 'FRAME', 'FRAMESET', 'H1', 'H2',
+ 'H3', 'H4', 'H5', 'H6', 'HEAD', 'HR', 'HTML', 'IFRAME ', 'IMG',
+ 'INPUT', 'INS', 'LABEL', 'LEGEND', 'LI', 'LINK', 'MAP',
+ 'MENU', 'META', 'NOFRAMES', 'NOSCRIPT', 'OBJECT', 'OL', 'OPTION',
+ 'P', 'PRE', 'SCRIPT', 'SELECT', 'SMALL', 'SPAN',
+ 'STRIKE', 'STRONG', 'STYLE', 'SUB', 'SUP', 'TABLE', 'TBODY', 'TD',
+ 'TEXTAREA', 'TFOOT', 'TH', 'THEAD', 'TITLE', 'TR', 'TT', 'U', 'UL']
+
+thetags = ['A',
+ 'DIV',
+ 'FRAME', 'H1', 'H2',
+ 'H3', 'H4', 'IFRAME ', 'INPUT', 'LABEL','LI', 'P', 'SCRIPT', 'SPAN',
+ 'STYLE',
+ 'TR']
+
+def compute_matrix(dataset):
+ import itertools
+ import numpy
+ ret = {}
+ matrix = numpy.zeros((len(thetags) + 1, len(thetags) + 1))
+
+ for data in dataset:
+ x = data[0].upper()
+ y = data[1].upper()
+ try:
+ x = thetags.index(x)
+ except:
+ x = len(thetags)
+
+ try:
+ y = thetags.index(y)
+ except:
+ y = len(thetags)
+
+ matrix[x,y] += 1
+ ret['matrix'] = matrix
+ ret['eigen'] = numpy.linalg.eigvals(matrix)
+ return ret
+
+def readDOM(fn):
+ from bs4 import BeautifulSoup
+ #f = open(fn)
+ #content = ''.join(f.readlines())
+ content = fn
+ dom = BeautifulSoup(content)
+ couples = []
+ for x in dom.findAll():
+ couples.append((str(x.parent.name), str(x.name)))
+ #f.close()
+ return couples
+
+class domclassTest(HTTPTest):
+ implements(IPlugin, ITest)
+
+ shortName = "domclass"
+ description = "domclass"
+ requirements = None
+ options = domclassArgs
+ blocking = False
+
+ def runTool(self):
+ import yaml, numpy
+ site_a = readDOM(self.local_options['file'])
+ site_b = readDOM(self.local_options['fileb'])
+ a = compute_matrix(site_a)
+ self.result['eigenvalues'] = str(a['eigen'])
+ self.result['matrix'] = str(a['matrix'])
+ self.result['content'] = data[:200]
+ b = compute_matrix(site_b)
+ print "A: %s" % a
+ print "B: %s" % b
+ correlation = numpy.vdot(a['eigen'],b['eigen'])
+ correlation /= numpy.linalg.norm(a['eigen'])*numpy.linalg.norm(b['eigen'])
+ correlation = (correlation + 1)/2
+ print "Corelation: %s" % correlation
+
+ def processResponseBody(self, data):
+ import yaml, numpy
+ site_a = readDOM(data)
+ #site_b = readDOM(self.local_options['fileb'])
+ a = compute_matrix(site_a)
+
+ if len(data) == 0:
+ self.result['eigenvalues'] = None
+ self.result['matrix'] = None
+ else:
+ self.result['eigenvalues'] = str(a['eigen'])
+ self.result['matrix'] = str(a['matrix'])
+ #self.result['content'] = data[:200]
+ #b = compute_matrix(site_b)
+ print "A: %s" % a
+ return a
+ #print "B: %s" % b
+ #correlation = numpy.vdot(a['eigen'],b['eigen'])
+ #correlation /= numpy.linalg.norm(a['eigen'])*numpy.linalg.norm(b['eigen'])
+ #correlation = (correlation + 1)/2
+ # print "Corelation: %s" % correlation
+
+# We need to instantiate it otherwise getPlugins does not detect it
+# XXX Find a way to load plugins without instantiating them.
+domclass = domclassTest(None, None, None)
diff --git a/ooni/protocols/http.py b/ooni/protocols/http.py
index d5573b3..5254a5c 100644
--- a/ooni/protocols/http.py
+++ b/ooni/protocols/http.py
@@ -51,7 +51,7 @@ class HTTPTest(OONITest):
def _processResponseBody(self, data):
self.response['body'] = data
- self.result['response'] = self.response
+ #self.result['response'] = self.response
self.processResponseBody(data)
def processResponseBody(self, data):
@@ -101,7 +101,7 @@ class HTTPTest(OONITest):
if str(self.response['code']).startswith('3'):
self.processRedirect(response.headers.getRawHeaders('Location')[0])
self.processResponseHeaders(self.response['headers'])
- self.result['response'] = self.response
+ #self.result['response'] = self.response
finished = defer.Deferred()
response.deliverBody(BodyReceiver(finished))
@@ -119,7 +119,8 @@ class HTTPTest(OONITest):
if self.randomize_ua:
self.randomize_useragent()
- self.result['request'] = self.request
+ #self.result['request'] = self.request
+ self.result['url'] = url
return self.agent.request(self.request['method'], self.request['url'],
Headers(self.request['headers']),
self.request['body'])
1
0