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

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 05 Jan '14

05 Jan '14

commit e1dc2c904a528461ccd0fc5c62923e29e8c2805f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 5 14:45:12 2014 +0000 Update translations for vidalia --- fr_CA/vidalia_fr_CA.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fr_CA/vidalia_fr_CA.po b/fr_CA/vidalia_fr_CA.po index 7812551..21f1d49 100644 --- a/fr_CA/vidalia_fr_CA.po +++ b/fr_CA/vidalia_fr_CA.po @@ -5,7 +5,7 @@ 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:52+0000\n" -"PO-Revision-Date: 2014-01-02 17:00+0000\n" +"PO-Revision-Date: 2014-01-05 14:40+0000\n" "Last-Translator: Phoul <colin(a)torproject.org>\n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n" "MIME-Version: 1.0\n" @@ -1761,7 +1761,7 @@ msgstr "" msgctxt "MainWindow" msgid "Connecting to the Tor network" -msgstr "" +msgstr "Connexion au réseau Tor" msgctxt "MainWindow" msgid "Establishing a Tor circuit" @@ -2397,7 +2397,7 @@ msgstr "" msgctxt "MessageLog" msgid "Tor Status" -msgstr "" +msgstr "État de Tor" msgctxt "MessageLog" msgid "Advanced"

1 0

r26523: {website} add new mirror in Germany. (website/trunk/include)
by Andrew Lewman 05 Jan '14

05 Jan '14

Author: phobos Date: 2014-01-05 13:52:34 +0000 (Sun, 05 Jan 2014) New Revision: 26523 Modified: website/trunk/include/tor-mirrors.csv Log: add new mirror in Germany. Modified: website/trunk/include/tor-mirrors.csv =================================================================== --- website/trunk/include/tor-mirrors.csv 2014-01-05 01:57:37 UTC (rev 26522) +++ website/trunk/include/tor-mirrors.csv 2014-01-05 13:52:34 UTC (rev 26523) @@ -73,3 +73,4 @@ 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/, Thu Jan 2 14:33:19 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/, , , Thu Jan 2 14:33:19 2014 tor(a)les.net, tor(a)les.net, CA, Canada, CA, TRUE, FALSE, NO, http://tor.les.net/, , , , http://tor.les.net/dist, , , , Thu Jan 2 14:33:19 2014 +Tor Fan,PW,DE,Germany,DE,TRUE,TRUE,NO,http://tor.pw.is/,,,,http://tor.pw.is/dist/,,,,

1 0

[translation/tsum] Update translations for tsum
by translation＠torproject.org 05 Jan '14

05 Jan '14

commit 783f2adbbdc80908bf953c0d4166526f5884682f Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jan 5 06:45:08 2014 +0000 Update translations for tsum --- uk/short-user-manual_uk_noimg.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uk/short-user-manual_uk_noimg.xhtml b/uk/short-user-manual_uk_noimg.xhtml index 2e03054..f41be3f 100644 --- a/uk/short-user-manual_uk_noimg.xhtml +++ b/uk/short-user-manual_uk_noimg.xhtml @@ -12,7 +12,7 @@ <p>The image above illustrates a user browsing to different websites over Tor. The green monitors represent relays in the Tor network, while the three keys represent the layers of encryption between the user and each 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> + <h2 id="how-to-download-tor">Як завантажити 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>

1 0

r26522: {website} patch from ticket 10556 for press page. (website/trunk/press/en)
by Andrew Lewman 05 Jan '14

05 Jan '14

Author: phobos Date: 2014-01-05 01:57:37 +0000 (Sun, 05 Jan 2014) New Revision: 26522 Modified: website/trunk/press/en/press.wml Log: patch from ticket 10556 for press page. Modified: website/trunk/press/en/press.wml =================================================================== --- website/trunk/press/en/press.wml 2014-01-04 17:10:55 UTC (rev 26521) +++ website/trunk/press/en/press.wml 2014-01-05 01:57:37 UTC (rev 26522) @@ -25,14 +25,250 @@ <table width="100%" cellpadding="3" cellspacing="0"> -<thead style="background-color: #e5e5e5;"> +<thead style=""> <tr> <th width="15%">Date</th> <th width="15%">Publication</th> <th>Topic</th> </tr> </thead> +<tr style="background-color: #e5e5e5;"> +<td>2013 Dec 16</td> +<td>PBS</td> +<td><a href="http://www.pbs.org/mediashift/2013/12/freedom-of-the-press-foundation-steps…">Freedom of the Press Foundation Steps Up Encryption Efforts for Journalists</a></td> +</tr> <tr> +<td>2013 Dec 5</td> +<td>Nieman Journalisim Lab</td> +<td><a href="http://www.niemanlab.org/2013/12/91274/">Freedom of the Press Foundation wants to help build secure communication tools for journalists</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Dec 2</td> +<td>EFF</td> +<td><a href="https://www.eff.org/deeplinks/2013/12/open-letter-urging-universities-encou…">An Open Letter Urging Universities To Encourage Conversation About Online Privacy</a></td> +</tr> +<tr> +<td>2013 Nov 26</td> +<td>TechRepublic</td> +<td><a href="http://www.techrepublic.com/blog/linux-and-open-source/get-a-grip-on-tor-wi…">Get a grip on TOR with Vidalia</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Nov 20</td> +<td>PBS</td> +<td><a href="http://www.pbs.org/idealab/2013/11/getting-to-know-tor-the-most-popular-ano…">Getting to Know Tor, the Most Popular Anonymity Tool in the World</a></td> +</tr> +<tr> +<td>2013 Nov 10</td> +<td>Politiken.dk</td> +<td><a href="http://politiken.dk/indland/ECE2127879/fakta-the-tor-project/">FAKTA: The Tor Project</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Nov 5</td> +<td>The Guardian</td> +<td><a href="http://www.theguardian.com/technology/2013/nov/05/tor-beginners-guide-nsa-b…">What is Tor? A beginner's guide to the privacy tool</a></td> +</tr> +<tr> +<td>2013 Oct 25</td> +<td>MIT Technology Review</td> +<td><a href="http://www.technologyreview.com/news/520141/anonymity-network-tor-needs-a-t…">Anonymity Network Tor Needs a Tune-up to Protect Users from Surveillance</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Oct 23</td> +<td>Tom's Guide</td> +<td><a href="http://www.tomsguide.com/us/what-is-tor-faq,news-17754.html">What Is Tor? Answers to Frequently Asked Questions</a></td> +</tr> +<tr> +<td>2013 Oct 18</td> +<td>Forbes</td> +<td><a href="http://www.forbes.com/sites/rajsabhlok/2013/10/18/taking-stock-of-tor-top-5…">Taking Stock Of Tor: Top 5 Tips For Using The Onion Router</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Oct 10</td> +<td>VentureBeat</td> +<td><a href="http://venturebeat.com/2013/10/10/torsearch-launches-to-be-the-google-of-th…">TorSearch launches to be the Google of the hidden Internet</a></td> +</tr> +<tr> +<td>2013 Oct 8</td> +<td>InformationWeek</td> +<td><a href="http://www.informationweek.com/traffic-management/nsa-battles-tor-9-facts/d…">NSA Battles Tor: 9 Facts</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Oct 8</td> +<td>The Next Web</td> +<td><a href="http://thenextweb.com/insider/2013/10/08/what-is-tor-and-why-does-it-matter/">What is Tor and why does it matter?</a></td> +</tr> +<tr> +<td>2013 Oct 7</td> +<td>Ars Technica</td> +<td><a href="http://arstechnica.com/security/2013/10/how-the-nsa-might-use-hotmail-or-ya…">How the NSA might use Hotmail, Yahoo or other cookies to identify Tor users</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Oct 7</td> +<td>Infosecurity</td> +<td><a href="http://www.infosecurity-magazine.com/view/34898/how-does-law-enforcement-su…">How Does Law Enforcement 'Subvert' Tor?</a></td> +</tr> +<tr> +<td>2013 Oct 4</td> +<td>Washington Post</td> +<td><a href="http://www.washingtonpost.com/blogs/the-switch/wp/2013/10/04/everything-you…">Everything you need to know about the NSA and Tor in one FAQ</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Oct 4</td> +<td>eWeek</td> +<td><a href="http://www.eweek.com/security/snowden-leaks-show-nsa-targets-tor.html/">Snowden Leaks Show NSA Targets Tor</a></td> +</tr> +<tr> +<td>2013 Oct 4</td> +<td>The Guardian</td> +<td><a href="http://www.theguardian.com/world/2013/oct/04/tor-attacks-nsa-users-online-a…">Attacking Tor: how the NSA targets users' online anonymity</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Oct 4</td> +<td>TIME</td> +<td><a href="http://techland.time.com/2013/10/04/docs-reveal-nsa-campaign-against-anonym…">Docs Reveal NSA Campaign Against Anonymous Tor Network</a></td> +</tr> +<tr> +<td>2013 Oct 4</td> +<td>ITProPortal</td> +<td><a href="http://www.itproportal.com/2013/10/04/nsa-and-gchq-repeatedly-tried-infiltr…">NSA and GCHQ repeatedly tried to infiltrate Tor, documents reveal</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Oct 4</td> +<td>InfoWorld</td> +<td><a href="http://www.infoworld.com/t/cringely/the-tor-teardown-brought-you-goats-gira…">The Tor teardown, brought to you by goats, giraffes, and Thor's hammer</a></td> +</tr> +<tr> +<td>2013 Oct 4</td> +<td>Computerworld</td> +<td><a href="http://www.computerworld.com/s/article/9242992/Report_NSA_has_little_succes…">Report: NSA has little success cracking Tor</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Oct 4</td> +<td>Ars Technica</td> +<td><a href="http://arstechnica.com/security/2013/10/nsa-repeatedly-tries-to-unpeel-tor-…">NSA repeatedly tries to unpeel Tor anonymity and spy on users, memos show</a></td> +</tr> +<tr> +<td>2013 Oct 4</td> +<td>CNET</td> +<td><a href="http://news.cnet.com/8301-13578_3-57606133-38/nsa-sought-to-unmask-users-of…">NSA sought to unmask users of Net-privacy tool Tor, says report</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Sep 16</td> +<td>InformationWeek</td> +<td><a href="http://www.informationweek.com/security/risk-management/fbi-admits-to-tor-s…">FBI Admits To Tor Server Takeover</a></td> +</tr> +<tr> +<td>2013 Sep 16</td> +<td>Techworld</td> +<td><a href="http://news.techworld.com/security/3468988/mevade-botnet-miscalculated-effe…">Mevade botnet miscalculated effect on Tor network, says Damballa</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Sep 14</td> +<td>Gizmodo</td> +<td><a href="http://www.gizmodo.com.au/2013/09/the-fbi-just-admitted-to-hacking-into-the…">FBI Admits To Hacking Into The Tor Network</a></td> +</tr> +<tr> +<td>2013 Sep 13</td> +<td>Wired</td> +<td><a href="http://www.wired.com/threatlevel/2013/09/freedom-hosting-fbi/">FBI Admits It Controlled Tor Servers Behind Mass Malware Attack</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Sep 11</td> +<td>Infosecurity</td> +<td><a href="http://www.infosecurity-magazine.com/view/34453/massive-botnet-is-behind-to…">Massive Botnet is Behind Tor Usage Spike</a></td> +</tr> +<tr> +<td>2013 Sep 11</td> +<td>MIT Technology Review</td> +<td><a href="http://www.technologyreview.com/view/519186/security-flaw-shows-tor-anonymi…">Security Flaw Shows Tor Anonymity Network Dominated by Botnet Command and Control Traffic</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Sep 11</td> +<td>Tom's Guide</td> +<td><a href="http://www.tomsguide.com/us/tor-encryption-cracked-nsa,news-17530.html">Is Tor's Anonymous Internet Still Secure?</a></td> +</tr> +<tr> +<td>2013 Sep 9</td> +<td>TechWeek Europe</td> +<td><a href="http://www.techweekeurope.co.uk/news/mevade-botnet-tor-network-126497">Tor Network Spike Caused By Botnet</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Sep 5</td> +<td>Gizmodo</td> +<td><a href="http://gizmodo.com/the-anonymous-internet-is-under-attack-1257343241">The Anonymous Internet Is Under Attack</a></td> +</tr> +<tr> +<td>2013 Sep 4</td> +<td>Stuff.co.nz</td> +<td><a href="http://www.stuff.co.nz/technology/digital-living/9120947/Is-Tor-right-for-y…">Is Tor right for you?</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Sep 3</td> +<td>PC Advisor</td> +<td><a href="http://www.pcadvisor.co.uk/news/security/3466718/tor-traffic-doubles-in-a-w…">Tor traffic doubles in a week to reach highest ever level</a></td> +</tr> +<tr> +<td>2013 Aug 29</td> +<td>RT</td> +<td><a href="http://rt.com/usa/tor-membership-doubled-nsa-137/">Tor anonymity network membership has doubled since NSA leak</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Aug 6</td> +<td>BBC</td> +<td><a href="http://www.bbc.co.uk/news/technology-23587620">Users of hidden net advised to ditch Windows</a></td> +</tr> +<tr> +<td>2013 Aug 6</td> +<td>ZDNet</td> +<td><a href="http://www.zdnet.com/tor-users-advised-to-switch-away-from-windows-after-ma…">Tor users advised to 'switch away from Windows' after malware attack</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Aug 5</td> +<td>NBC</td> +<td><a href="http://www.nbcnews.com/technology/how-anonymous-tor-users-compromised-child…">How anonymous? Tor users compromised in child porn takedown</a></td> +</tr> +<tr> +<td>2013 Aug 5</td> +<td>Wired</td> +<td><a href="http://www.wired.com/threatlevel/2013/08/freedom-hosting/">Feds Are Suspects in New Malware That Attacks Tor Anonymity</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Aug 5</td> +<td>Naked Security</td> +<td><a href="http://nakedsecurity.sophos.com/2013/08/05/freedom-hosting-arrest-and-taked…">Freedom Hosting arrest and takedown linked to Tor privacy compromise</a></td> +</tr> +<tr> +<td>2013 Jul 18</td> +<td>Huffington Post</td> +<td><a href="http://www.huffingtonpost.com/2013/07/18/tor-snowden_n_3610370.html">Meet Tor, The Military-Made Privacy Network That Counts Edward Snowden As A Fan</a></td> +</td> +<tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Jul 18</td> +<td>Gizmodo</td> +<td><a href="http://gizmodo.com/the-technology-you-need-to-protect-against-mass-surveil-…">The Technology You Need to Protect Against Mass Surveillance</a></td> +</tr> +<tr> <td>2013 Jul 01</td> <td>Slice of MIT</td> <td><a href="http://alum.mit.edu/pages/sliceofmit/2013/07/01/after-prism-asking-how-much…">After PRISM, Is Too Much Anonymity Possible?</a></td> @@ -46,24 +282,74 @@ <tr> <td>2013 Jun 26</td> <td>Reason.com</td> -<td><a href="http://reason.com/reasontv/2013/06/26/surf-without-surveillance-tors-karen-…">Reason Interviews Karen Reilly of The Tor Project Regarding Online Privacy</a></td> +<td><a href="http://reason.com/reasontv/2013/06/26/surf-without-surveillance-tors-karen-…">Surf Without Surveillance: Tor's Karen Reilly</a></td> </tr> <tr style="background-color: #e5e5e5;"> +<td>2013 Jun 22</td> +<td>TribLIVE</td> +<td><a href="http://triblive.com/news/allegheny/4191790-74/tor-network-government">Protesters, criminals get around government censors using secret Web network</a></td> +</tr> +<tr> +<td>2013 Jun 22</td> +<td>TribLIVE</td> +<td><a href="http://triblive.com/news/allegheny/4191788-74/tor-computer-drugs">Hidden Web Tor helps average users and criminals avoid government snooping</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> <td>2013 Jun 21</td> <td>Fast Company</td> <td><a href="http://www.fastcompany.com/3013346/nsa-cramping-your-style-use-these-easy-e…">NSA cramping your style? Use these easy encryption solutions</a></td> </tr> <tr> +<td>2013 Jun 19</td> +<td>Help Net Security</td> +<td><a href="http://www.net-security.org/secworld.php?id=15098">Facebook once again accessible via Tor</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Jun 18</td> +<td>The Register</td> +<td><a href="http://www.theregister.co.uk/2013/06/18/facebook_blocks_tor_traffic_over_se…">Tor users locked out of Facebook after wave of dodgy traffic</a></td> +</tr> +<tr> +<td>2013 Jun 18</td> +<td>TechWeek Europe</td> +<td><a href="http://www.techweekeurope.co.uk/news/facebook-bans-tor-anonymity-119413">Facebook Blocks Tor Users After Heavy Malicious Activity</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> <td>2013 Jun 14</td> <td>The Salt Lake Tribune</td> <td><a href="http://www.sltrib.com/sltrib/world/56463680-68/privacy-data-nsa-disadvantag…">Ideas for keeping your data safe from spying</a></td> </tr> +<tr> +<td>2013 Jun 13</td> +<td>Boston Globe</td> +<td><a href="http://www.bostonglobe.com/business/2013/06/12/imperfect-privacy-better-tha…">How to keep data away from prying eyes</a></td> +</tr> <tr style="background-color: #e5e5e5;"> +<td>2013 Jun 12</td> +<td>Washington Post</td> +<td><a href="http://www.washingtonpost.com/business/technology/secrecy-focused-web-servi…">Secrecy-focused Web services find a mainstream audience</a></td> +</tr> +<tr> <td>2013 Jun 11</td> <td>Reflex (Czech)</td> <td><a href="http://www.reflex.cz/clanek/zpravy/50756/soukromi-na-internetu-uz-neexistuj…">Privacy on the Internet already exists. But there's still Tor</a></td> </tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Jun 10</td> +<td>Washington Post</td> +<td><a href="http://www.washingtonpost.com/blogs/wonkblog/wp/2013/06/10/five-ways-to-sto…">Five ways to stop the NSA from spying on you</a></td> +</tr> <tr> +<td>2013 Jun 8</td> +<td>ZDNet</td> +<td><a href="http://www.zdnet.com/ask-a-hacker-top-four-anti-surveillance-apps-700001656…">Ask a hacker: Top four anti-surveillance apps</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Jun 8</td> +<td>The Hindu</td> +<td><a href="http://www.thehindu.com/sci-tech/technology/internet/cryptography-as-a-mean…">Cryptography as a means to counter Internet censorship</a></td> +</tr> +<tr> <td>2013 Apr 23</td> <td>The Verge</td> <td><a

1 0

[stem/master] Defaulting to provide less verbose test output
by atagar＠torproject.org 04 Jan '14

04 Jan '14

commit 6f696e98c155434d6ac95806052eb634d36e1e8e Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 15:14:31 2014 -0800 Defaulting to provide less verbose test output Our test output is pretty sweet, but as we've added more tests it's gotten to be pretty overwhelming. This is especially troublesome for the RUN_ALL target which our jenkins test use. Dropping output on individual tests unless there's a failure. Instead, we now just print the test modules and their runtime. Users can get the more verbose output by including '--verbose' in their test run. --- run_tests.py | 44 +++++++++++++++++++++++++++++++++++--------- test/settings.cfg | 1 + 2 files changed, 36 insertions(+), 9 deletions(-) diff --git a/run_tests.py b/run_tests.py index 9559311..664df35 100755 --- a/run_tests.py +++ b/run_tests.py @@ -25,7 +25,7 @@ import test.output import test.runner import test.util -from test.output import STATUS, SUCCESS, ERROR, println +from test.output import STATUS, SUCCESS, ERROR, NO_NL, println from test.util import STEM_BASE, Target, Task # Our default arguments. The _get_args() function provides a named tuple of @@ -50,11 +50,12 @@ ARGS = { 'tor_path': 'tor', 'run_targets': [Target.RUN_OPEN], 'attribute_targets': [], + 'verbose': False, 'print_help': False, } -OPT = "auit:l:h" -OPT_EXPANDED = ["all", "unit", "integ", "python3", "clean", "targets=", "test=", "log=", "tor=", "help"] +OPT = "auit:l:vh" +OPT_EXPANDED = ["all", "unit", "integ", "python3", "clean", "targets=", "test=", "log=", "tor=", "verbose", "help"] CONFIG = stem.util.conf.config_dict("test", { "target.torrc": {}, @@ -212,7 +213,7 @@ def main(): error_tracker.set_category("UNIT TEST") for test_class in test.util.get_unit_tests(args.test_prefix): - run_result = _run_test(test_class, output_filters, logging_buffer) + run_result = _run_test(args, test_class, output_filters, logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) println() @@ -248,7 +249,7 @@ def main(): owner = integ_runner.get_tor_controller(True) # controller to own our main Tor process for test_class in test.util.get_integ_tests(args.test_prefix): - run_result = _run_test(test_class, output_filters, logging_buffer) + run_result = _run_test(args, test_class, output_filters, logging_buffer) skipped_tests += len(getattr(run_result, 'skipped', [])) if owner: @@ -384,6 +385,8 @@ def _get_args(argv): args['logging_runlevel'] = arg elif opt in ("--tor"): args['tor_path'] = arg + elif opt in ("-v", "--verbose"): + args['verbose'] = True elif opt in ("-h", "--help"): args['print_help'] = True @@ -416,15 +419,38 @@ def _print_static_issues(static_check_issues): println() -def _run_test(test_class, output_filters, logging_buffer): - test.output.print_divider(test_class.__module__) +def _run_test(args, test_class, output_filters, logging_buffer): + start_time = time.time() + + if args.verbose: + test.output.print_divider(test_class.__module__) + else: + label = test_class.__module__ + + if label.startswith('test.unit.'): + label = label[10:] + elif label.startswith('test.integ.'): + label = label[11:] + + label = " %s..." % label + label = "%-54s" % label + + println(label, STATUS, NO_NL) + suite = unittest.TestLoader().loadTestsFromTestCase(test_class) test_results = StringIO.StringIO() run_result = unittest.TextTestRunner(test_results, verbosity=2).run(suite) - sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) - println() + if args.verbose: + sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) + println() + elif not run_result.failures: + println(" success (%0.2fs)" % (time.time() - start_time), SUCCESS) + else: + println(" failed (%0.2fs)" % (time.time() - start_time), ERROR) + sys.stdout.write(test.output.apply_filters(test_results.getvalue(), *output_filters)) + test.output.print_logging(logging_buffer) return run_result diff --git a/test/settings.cfg b/test/settings.cfg index 6fd436a..e78ddb4 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -41,6 +41,7 @@ msg.help | -l, --log RUNLEVEL includes logging output with test results, runlevels: | TRACE, DEBUG, INFO, NOTICE, WARN, ERROR | --tor PATH custom tor binary to run testing against +| -v, --verbose provides additional test output | -h, --help presents this help | | Examples:

1 0

[stem/master] Moving static checks to the start
by atagar＠torproject.org 04 Jan '14

04 Jan '14

commit eaa7a9253ba8d8955a6d4ee911269bf94ed4f2aa Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 12:14:17 2014 -0800 Moving static checks to the start Rearranging our test run so the static checks (pyflakes and pep8) occure at the start and are listed among the initialization tasks. This makes it clearer that they're running and the runtime dedicated to them. It also gets rid of a silent pause at the end of the test run I've always disliked. --- run_tests.py | 60 ++++++++++++++++++++++++++++++++++++----------------- test/settings.cfg | 1 - test/util.py | 22 +++++++++++++------- 3 files changed, 56 insertions(+), 27 deletions(-) diff --git a/run_tests.py b/run_tests.py index 0d0e6d0..b0b3171 100755 --- a/run_tests.py +++ b/run_tests.py @@ -87,6 +87,22 @@ version 0.8.0 or later... https://pypi.python.org/pypi/mock/ """ +PYFLAKES_TASK = Task( + "running pyflakes", + test.util.get_pyflakes_issues, + args = (SRC_PATHS,), + is_required = False, + print_result = False, +) + +PEP8_TASK = Task( + "running pep8", + test.util.get_stylistic_issues, + args = (SRC_PATHS,), + is_required = False, + print_result = False, +) + def main(): start_time = time.time() @@ -134,6 +150,15 @@ def main(): sys.exit(1) + pyflakes_task, pep8_task = None, None + + if not stem.prereq.is_python_3(): + if test.util.is_pyflakes_available(): + pyflakes_task = PYFLAKES_TASK + + if test.util.is_pep8_available(): + pep8_task = PEP8_TASK + test.util.run_tasks( "INITIALISING", Task("checking stem version", test.util.check_stem_version), @@ -144,6 +169,8 @@ def main(): Task("checking pep8 version", test.util.check_pep8_version), Task("checking for orphaned .pyc files", test.util.clean_orphaned_pyc, (SRC_PATHS,)), Task("checking for unused tests", test.util.check_for_unused_tests, ((os.path.join(STEM_BASE, 'test'),),)), + pyflakes_task, + pep8_task, ) if args.run_python3 and sys.version_info[0] != 3: @@ -262,7 +289,19 @@ def main(): println() if not stem.prereq.is_python_3(): - _print_static_issues(args) + static_check_issues = {} + + if pyflakes_task and pyflakes_task.is_successful: + static_check_issues.update(pyflakes_task.result) + elif not test.util.is_pyflakes_available(): + println("Static error checking requires pyflakes. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n", ERROR) + + if pep8_task and pep8_task.is_successful: + static_check_issues.update(pep8_task.result) + elif not test.util.is_pep8_available(): + println("Style checks require pep8. Please install it from...\n http://pypi.python.org/pypi/pep8\n", ERROR) + + _print_static_issues(static_check_issues) runtime_label = "(%i seconds)" % (time.time() - start_time) @@ -354,24 +393,7 @@ def _get_args(argv): return Args(**args) -def _print_static_issues(args): - static_check_issues = {} - - # If we're doing some sort of testing (unit or integ) and pyflakes is - # available then use it. Its static checks are pretty quick so there's not - # much overhead in including it with all tests. - - if args.run_unit or args.run_integ: - if test.util.is_pyflakes_available(): - static_check_issues.update(test.util.get_pyflakes_issues(SRC_PATHS)) - else: - println("Static error checking requires pyflakes. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n", ERROR) - - if test.util.is_pep8_available(): - static_check_issues.update(test.util.get_stylistic_issues(SRC_PATHS)) - else: - println("Style checks require pep8. Please install it from...\n http://pypi.python.org/pypi/pep8\n", ERROR) - +def _print_static_issues(static_check_issues): if static_check_issues: println("STATIC CHECKS", STATUS) diff --git a/test/settings.cfg b/test/settings.cfg index 0515476..6fd436a 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -35,7 +35,6 @@ msg.help | -a, --all runs unit, integ, and style checks (same as '-uis') | -u, --unit runs unit tests | -i, --integ runs integration tests -| -s, --style runs style checker | -t, --target TARGET comma separated list of extra targets for integ tests | --test TEST_NAME only run tests modules matching the given name prefix | --python3 runs tests against a 2to3 conversion of the codebase diff --git a/test/util.py b/test/util.py index a889b92..d510d6f 100644 --- a/test/util.py +++ b/test/util.py @@ -554,6 +554,9 @@ def run_tasks(category, *tasks): test.output.print_divider(category, True) for task in tasks: + if task is None: + continue + task.run() if task.is_required and task.error: @@ -576,15 +579,19 @@ class Task(object): message or list of strings for its results. """ - def __init__(self, label, runner, args = None, is_required = True): + def __init__(self, label, runner, args = None, is_required = True, print_result = True): super(Task, self).__init__() self.label = label self.runner = runner self.args = args self.is_required = is_required + self.print_result = print_result self.error = None + self.is_successful = False + self.result = None + def run(self): println(" %s..." % self.label, STATUS, NO_NL) @@ -593,19 +600,20 @@ class Task(object): try: if self.args: - result = self.runner(*self.args) + self.result = self.runner(*self.args) else: - result = self.runner() + self.result = self.runner() + self.is_successful = True output_msg = "done" - if isinstance(result, str): - output_msg = result + if self.print_result and isinstance(self.result, str): + output_msg = self.result println(output_msg, STATUS) - if isinstance(result, (list, tuple)): - for line in result: + if self.print_result and isinstance(self.result, (list, tuple)): + for line in self.result: println(" %s" % line, STATUS) except Exception as exc: output_msg = str(exc)

1 0

[stem/master] Checking for pep8.BaseReport
by atagar＠torproject.org 04 Jan '14

04 Jan '14

commit 68979148f1e09b7bca22bde876524029f419d1e5 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 12:21:42 2014 -0800 Checking for pep8.BaseReport Our jenkins tests are also failing because they have the pep8 module, but it lacks the BaseReport. Checking for that as well. --- run_tests.py | 4 ++-- test/util.py | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/run_tests.py b/run_tests.py index b0b3171..9559311 100755 --- a/run_tests.py +++ b/run_tests.py @@ -294,12 +294,12 @@ def main(): if pyflakes_task and pyflakes_task.is_successful: static_check_issues.update(pyflakes_task.result) elif not test.util.is_pyflakes_available(): - println("Static error checking requires pyflakes. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n", ERROR) + println("Static error checking requires pyflakes version 0.7.3 or later. Please install it from ...\n http://pypi.python.org/pypi/pyflakes\n", ERROR) if pep8_task and pep8_task.is_successful: static_check_issues.update(pep8_task.result) elif not test.util.is_pep8_available(): - println("Style checks require pep8. Please install it from...\n http://pypi.python.org/pypi/pep8\n", ERROR) + println("Style checks require pep8 version 1.4.2 or later. Please install it from...\n http://pypi.python.org/pypi/pep8\n", ERROR) _print_static_issues(static_check_issues) diff --git a/test/util.py b/test/util.py index d510d6f..cfa0b95 100644 --- a/test/util.py +++ b/test/util.py @@ -182,6 +182,10 @@ def is_pep8_available(): try: import pep8 + + if not hasattr(pep8, 'BaseReport'): + raise ImportError() + return True except ImportError: return False

1 0

[stem/master] Checking for the pyflakes modules we use
by atagar＠torproject.org 04 Jan '14

04 Jan '14

commit 32aadbc7f7918d5c9f47a748a288fad16ce5ca69 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jan 4 11:44:51 2014 -0800 Checking for the pyflakes modules we use Presently our jenkins tests are failing since the system has pyflakes version 0.5 which evidently doesn't have the pyflakes.api module... https://trac.torproject.org/10539 Checking explicitly for the modules we use when determining if pyflakes is avaialable. --- test/util.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/util.py b/test/util.py index 295f883..a889b92 100644 --- a/test/util.py +++ b/test/util.py @@ -166,7 +166,8 @@ def is_pyflakes_available(): """ try: - import pyflakes + import pyflakes.api + import pyflakes.reporter return True except ImportError: return False

1 0

r26521: {website} Update obfsproxy instructions now that 0.2.4.x is not experi (website/trunk/projects/en)
by George Kadianakis 04 Jan '14

04 Jan '14

Author: asn Date: 2014-01-04 17:10:55 +0000 (Sat, 04 Jan 2014) New Revision: 26521 Modified: website/trunk/projects/en/obfsproxy-debian-instructions.wml website/trunk/projects/en/obfsproxy-instructions.wml Log: Update obfsproxy instructions now that 0.2.4.x is not experimental anymore. Modified: website/trunk/projects/en/obfsproxy-debian-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-debian-instructions.wml 2014-01-03 06:22:40 UTC (rev 26520) +++ website/trunk/projects/en/obfsproxy-debian-instructions.wml 2014-01-04 17:10:55 UTC (rev 26521) @@ -34,11 +34,11 @@ recommend you to upgrade to the Python version! </p> - <h3>Step 0: Move to the development version of Tor</h3> + <h3>Step 0: Install a recent version of Tor (>= 0.2.4.1)</h3> <br> <p> - Add the <a href="<page docs/debian>#development">development Tor + Add the <a href="<page docs/debian>#ubuntu">official Tor APT repository</a> and run the specified commands to install <code>tor</code> and <code>deb.torproject.org-keyring</code>. You need <em>Tor 0.2.4.x</em> because it knows how to automatically report your obfsproxy address to <a Modified: website/trunk/projects/en/obfsproxy-instructions.wml =================================================================== --- website/trunk/projects/en/obfsproxy-instructions.wml 2014-01-03 06:22:40 UTC (rev 26520) +++ website/trunk/projects/en/obfsproxy-instructions.wml 2014-01-04 17:10:55 UTC (rev 26521) @@ -41,7 +41,7 @@ <p> You will also need a recent version of Tor (>= 0.2.4.1). We recommend you use - <a href="<page docs/debian>#development">Tor's experimental repositories for Debian/Ubuntu</a> + <a href="<page docs/debian>#ubuntu">Tor's repositories for Debian/Ubuntu</a> or <a href="https://gitweb.torproject.org/tor.git">install Tor from git</a>. </p>

1 0

[ooni-probe/master] Include the GeoIP data files as part of the source distribution
by art＠torproject.org 04 Jan '14

04 Jan '14

commit 6c3accabfe4c7f465afc02593d46bab4b29026a2 Author: Arturo Filastò <art(a)fuffa.org> Date: Fri Jan 3 16:05:19 2014 +0100 Include the GeoIP data files as part of the source distribution * Install the geoip data files to /usr/share/geoip --- MANIFEST.in | 7 ++-- data/ooniprobe.conf.sample | 4 +-- requirements.txt | 4 +-- setup.py | 77 ++++++++++++++++++++++++++++++++++++++------ 4 files changed, 76 insertions(+), 16 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index adcc182..92586f8 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,7 @@ include README.md ChangeLog.md requirements.txt -recursive-include data/ui/app * recursive-include data/decks * -recursive-include data/inputs * -include data/Makefile +include data/inputs/ +include data/GeoIP.dat +include data/GeoIPASNum.dat +include data/GeoLiteCity.dat include data/ooniprobe.conf.sample diff --git a/data/ooniprobe.conf.sample b/data/ooniprobe.conf.sample index 83c1ebc..8a4e0f7 100644 --- a/data/ooniprobe.conf.sample +++ b/data/ooniprobe.conf.sample @@ -21,7 +21,7 @@ reports: pcap: null collector: 'httpo://nkvphnp3p6agi5qq.onion' advanced: - geoip_data_dir: /usr/share/ooni/ + geoip_data_dir: /usr/share/geoip debug: false # enable if auto detection fails #tor_binary: /usr/sbin/tor @@ -46,7 +46,7 @@ advanced: # How many reports to perform concurrently reporting_concurrency: 15 # Specify here a custom data_dir path - data_dir: /usr/share/ooni/ + data_dir: /usr/share/ooni oonid_api_port: 8042 tor: #socks_port: 8801 diff --git a/requirements.txt b/requirements.txt index 5fb1ff9..638b33b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,8 +5,8 @@ docutils>=0.9.1 ipaddr>=2.1.10 pyOpenSSL>=0.13 # XXX fix this once the following issue is resolved: https://github.com/appliedsec/pygeoip/issues/56 -https://github.com/appliedsec/pygeoip/archive/master.zip -#pygeoip>=0.3.1 +https://github.com/appliedsec/pygeoip/archive/master.zip#egg=pygeoip-0.3.1 +pygeoip>=0.3.1 txtorcon>=0.7 txsocksx>=0.0.2 Pyrex>=0.9.8.6 diff --git a/setup.py b/setup.py index 8eccd4e..f761f30 100644 --- a/setup.py +++ b/setup.py @@ -2,41 +2,101 @@ #-*- coding: utf-8 -*- from ooni import __version__ +import urllib2 import os +import gzip from os.path import join as pj import sys from setuptools import setup -dependency_links = [ - 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe' -] +def download_geoip_files(): + urls = [ + 'http://www.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz', + 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat…', + 'http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz' + ] + for url in urls: + target_gz_file = pj('data', os.path.basename(url)) + target_file = target_gz_file.replace('.gz', '') + + if os.path.isfile(target_file): + print "%s already exists. Skipping." % target_file + continue + + print "Downloading %s" % url + response = urllib2.urlopen(url) + + with open(target_gz_file, 'w+') as f: + f.write(response.read()) + + with open(target_file, 'w+') as f: + gf = gzip.open(target_gz_file, 'rb') + f.write(gf.read()) + gf.close() + + os.unlink(target_gz_file) + +download_geoip_files() usr_share_path = '/usr/share/ooni' # If this is true then it means we are in a virtualenv +# therefore we should not place our data files inside /usr/share/ooni, but +# place them inside the virtual env system prefix. if hasattr(sys, 'real_prefix'): - usr_share_path = pj(sys.prefix, 'share', 'ooni') + usr_share_path = os.path.abspath(pj(sys.prefix, 'share', 'ooni')) + if not os.path.isdir(usr_share_path): + os.makedirs(usr_share_path) with open(pj('data', 'ooniprobe.conf.sample.new'), 'w+') as w: with open(pj('data', 'ooniprobe.conf.sample')) as f: for line in f: if line.startswith(' data_dir: /usr/share/ooni'): w.write(' data_dir: %s\n' % usr_share_path) + elif line.startswith(' geoip_data_dir: /usr/share/'): + w.write(' geoip_data_dir: %s\n' % usr_share_path) else: w.write(line) os.rename(pj('data', 'ooniprobe.conf.sample.new'), pj('data', 'ooniprobe.conf.sample')) -data_files = [] + data_files = [( + usr_share_path + '/', + [ + 'data/GeoIP.dat', + 'data/GeoIPASNum.dat', + 'data/GeoLiteCity.dat' + ] + )] +else: + data_files = [( + '/usr/share/geoip/', + [ + 'data/GeoIP.dat', + 'data/GeoIPASNum.dat', + 'data/GeoLiteCity.dat' + ] + )] + for root, dirs, file_names in os.walk('data/'): files = [] for file_name in file_names: - if not file_name.endswith('.pyc'): - files.append(pj(root, file_name)) + if file_name.endswith('.pyc'): + continue + elif file_name.endswith('.dat') and \ + file_name.startswith('Geo'): + continue + files.append(pj(root, file_name)) data_files.append([pj(usr_share_path, root.replace('data/', '')), files]) install_requires = [] +dependency_links = [ + 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe' +] with open('requirements.txt') as f: for line in f: - if line.startswith("#") or line.startswith('http'): + if line.startswith("#"): + continue + if line.startswith('https'): + dependency_links.append(line) continue install_requires.append(line) @@ -54,7 +114,6 @@ setup( 'ooni.nettests.blocking', 'ooni.nettests.third_party', 'ooni.templates', 'ooni.tests', 'ooni.utils'], - scripts=["bin/ooniprobe"], dependency_links=dependency_links, install_requires=install_requires

1 0