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

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 09 Jan '13

09 Jan '13

commit b09212ec02af519dedd06eb63bbb8aaa30f14db5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 9 02:45:45 2013 +0000 Update translations for torcheck_completed --- fr/torcheck.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 2b840af..d2a4e00 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -3,21 +3,22 @@ # # Translators: # arpalord <arpalord(a)gmail.com>, 2012. +# <maijin21(a)gmail.com>, 2013. # skhaen <skhaen(a)gmail.com>, 2011. 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 20:28+PDT\n" -"PO-Revision-Date: 2012-02-22 09:46+0000\n" -"Last-Translator: arpalord <arpalord(a)gmail.com>\n" +"PO-Revision-Date: 2013-01-09 02:27+0000\n" +"Last-Translator: Maijin <maijin21(a)gmail.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "Congratulations. Your browser is configured to use Tor." msgstr "Félicitations. Vous utilisez Tor."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 09 Jan '13

09 Jan '13

commit 829079f6e1e4fae49fe9ceb3e35d5ef345c8def7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 9 02:45:41 2013 +0000 Update translations for torcheck --- fr/torcheck.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fr/torcheck.po b/fr/torcheck.po index 2b840af..d2a4e00 100644 --- a/fr/torcheck.po +++ b/fr/torcheck.po @@ -3,21 +3,22 @@ # # Translators: # arpalord <arpalord(a)gmail.com>, 2012. +# <maijin21(a)gmail.com>, 2013. # skhaen <skhaen(a)gmail.com>, 2011. 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 20:28+PDT\n" -"PO-Revision-Date: 2012-02-22 09:46+0000\n" -"Last-Translator: arpalord <arpalord(a)gmail.com>\n" +"PO-Revision-Date: 2013-01-09 02:27+0000\n" +"Last-Translator: Maijin <maijin21(a)gmail.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Generated-By: pygettext.py 1.5\n" "Language: fr\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" msgid "Congratulations. Your browser is configured to use Tor." msgstr "Félicitations. Vous utilisez Tor."

1 0

[ooni-probe/master] Add ability to specify the Tor data directory from the config file
by art＠torproject.org 08 Jan '13

08 Jan '13

commit 792d094c400214f738e4ec5c7d91bdb5b440a1a7 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 8 21:00:31 2013 +0100 Add ability to specify the Tor data directory from the config file --- ooni/runner.py | 6 ++++++ ooniprobe.conf.sample | 4 ++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index b9deedc..1a7e629 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -528,6 +528,12 @@ def startTor(): tor_config.SocksPort = socks_port config.tor.socks_port = socks_port + if config.tor.data_dir: + if not os.path.exists(config.tor.data_dir): + log.msg("%s does not exist. Creating it." % config.tor.data_dir) + os.makedirs(config.tor.data_dir) + tor_config.DataDirectory = os.path.expanduser(config.tor.data_dir) + tor_config.save() log.debug("Setting control port as %s" % tor_config.ControlPort) diff --git a/ooniprobe.conf.sample b/ooniprobe.conf.sample index ed77dfe..a2f1c5b 100644 --- a/ooniprobe.conf.sample +++ b/ooniprobe.conf.sample @@ -35,4 +35,8 @@ tor: #control_port: 9051 # Specify the absolute path to the Tor bridges to use for testing bridges: bridges.list + # Specify path of the tor datadirectory. + # This should be set to something to avoid having Tor download each time + # the descriptors and consensus data. + data_dir: ~/.tor/

1 0

[ooni-probe/master] Strictly require Twisted 12.2.0.
by art＠torproject.org 08 Jan '13

08 Jan '13

commit 618c7c23ac0295d7f8dbe7aea9e807e2710267e8 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 8 21:00:48 2013 +0100 Strictly require Twisted 12.2.0. This is a temporary fix for issue #28 The problem arises from the fact that we are overriding a private method (_WrappingProtocol that has been removed in 12.3.0). The proper way to fix this would be to get rid of the hack and use a HTTP Connection Pool. --- requirements.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/requirements.txt b/requirements.txt index 633dbe5..2b8aabf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ PyYAML>=3.10 Pygments>=1.5 -Twisted>=12.1.0 +Twisted==12.2.0 argparse>=1.2.1 distribute>=0.6.24 dnspython>=1.10.0

1 0

[ooni-probe/master] Expand the user (~) fragment when creating directory
by art＠torproject.org 08 Jan '13

08 Jan '13

commit 09c94c9f578cf2edd8f22694aebeb8ae0e45d89c Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 8 21:11:20 2013 +0100 Expand the user (~) fragment when creating directory --- ooni/runner.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ooni/runner.py b/ooni/runner.py index 1a7e629..19d7e1f 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -529,10 +529,12 @@ def startTor(): config.tor.socks_port = socks_port if config.tor.data_dir: - if not os.path.exists(config.tor.data_dir): - log.msg("%s does not exist. Creating it." % config.tor.data_dir) - os.makedirs(config.tor.data_dir) - tor_config.DataDirectory = os.path.expanduser(config.tor.data_dir) + data_dir = os.path.expanduser(config.tor.data_dir) + + if not os.path.exists(data_dir): + log.msg("%s does not exist. Creating it." % data_dir) + os.makedirs(data_dir) + tor_config.DataDirectory = data_dir tor_config.save()

1 0

r25993: {website} per 7838, kill tor-doc-web page. (website/trunk/docs/en)
by Andrew Lewman 08 Jan '13

08 Jan '13

Author: phobos Date: 2013-01-08 19:19:29 +0000 (Tue, 08 Jan 2013) New Revision: 25993 Removed: website/trunk/docs/en/tor-doc-web.wml Modified: website/trunk/docs/en/sidenav.wmi Log: per 7838, kill tor-doc-web page. Modified: website/trunk/docs/en/sidenav.wmi =================================================================== --- website/trunk/docs/en/sidenav.wmi 2013-01-08 17:03:14 UTC (rev 25992) +++ website/trunk/docs/en/sidenav.wmi 2013-01-08 19:19:29 UTC (rev 25993) @@ -47,9 +47,6 @@ }, {'url' => 'docs/verifying-signatures', 'txt' => 'Verify our GPG signatures', - }, - {'url' => 'docs/tor-doc-web', - 'txt' => 'Configuring your browser to use Tor', }], }, {'url' => 'docs/manual', Deleted: website/trunk/docs/en/tor-doc-web.wml =================================================================== --- website/trunk/docs/en/tor-doc-web.wml 2013-01-08 17:03:14 UTC (rev 25992) +++ website/trunk/docs/en/tor-doc-web.wml 2013-01-08 19:19:29 UTC (rev 25993) @@ -1,50 +0,0 @@ -## translation metadata -# Revision: $Revision$ -# Translation-Priority: 3-low - -#include "head.wmi" TITLE="Tor: Configuring your browser to use Tor" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page docs/documentation>">Documentation » </a> - <a href="<page docs/tor-doc-web>">Configure Your Browser</a> - </div> - <div id="maincol"> - <h1>Configuring your browser to use Tor</h1> - <br> - - <h2>We strongly encourage you to use the <a href="<page - projects/torbrowser>">Tor Browser Bundle</a> instead of configuring - your own browser for usage with Tor.</h2> - - <br> - - <p>Otherwise, you need to manually configure your browser's proxy - settings.</p> - <p>In Mozilla and Firefox on Windows, this is in Tools - Options - - General - Connection Settings.</p> - <p>In Firefox on OS X, it's Firefox - Preferences - General - - Connection Settings.</p> - <p>In Firefox on Linux, this is in Edit - Preferences - Advanced - - Proxies.</p> - - <img alt="Proxy settings in Firefox" - src="$(IMGROOT)/screenshot-win32-firefox-proxies.jpg"> - - <p>You should fill in "127.0.0.1" and "9050" to point the SOCKS - protocol, as shown here. Then click "OK".</p> - - <hr> - - <p>If you have suggestions for improving this document, please <a - href="<page about/contact>">send them to us</a>. Thanks!</p> - </div> -  - <div id = "sidecol"> -#include "side.wmi" -#include "info.wmi" - </div> -  -</div> - -#include <foot.wmi>

1 0

r25992: {website} fix the android links based on ticket 7838. (website/trunk/download/en)
by Andrew Lewman 08 Jan '13

08 Jan '13

Author: phobos Date: 2013-01-08 17:03:14 +0000 (Tue, 08 Jan 2013) New Revision: 25992 Modified: website/trunk/download/en/download.wml Log: fix the android links based on ticket 7838. Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2013-01-06 23:48:03 UTC (rev 25991) +++ website/trunk/download/en/download.wml 2013-01-08 17:03:14 UTC (rev 25992) @@ -208,12 +208,11 @@  <div class="package" style="padding-top: 13px; border-top: 0px;"> <div class="downloads"> - <a class="button" style="margin-bottom: 5px;" href="../<package-androidbundle-alpha>"><span class="strong">Download</span><span class="normal">Android Bundle</span></a> - <a class="additional" href="<page docs/android>">Installation Instructions</a> + <a class="additional" href="<page docs/android>">Installation Instructions</a> </div> <h2>Android Bundle</h2> - <p>For Android-based phones, tablets, and computers.</p> + <p>Our software is available or Android-based phones, tablets, and computers from the <a href="https://guardianproject.info/">Guardian Project</a> in their <a href= "https://guardianproject.info/2012/03/15/our-new-f-droid-app-repository/">F-Droid Repository</a> or the <a href="https://market.android.com/search?q=guardianproject&so=1&c=apps">Google Play Store</a>.</p> </div>  <div class="package" style="border-bottom: 0px;">

1 0

[ooni-probe/master] Use float, else ceil() is meaningless
by art＠torproject.org 08 Jan '13

08 Jan '13

commit 28861eca47ce03310d75f68cb13ee834335ce7cb Author: aagbsn <aagbsn(a)extc.org> Date: Wed Jan 2 18:07:06 2013 +0000 Use float, else ceil() is meaningless --- ooni/inputunit.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/inputunit.py b/ooni/inputunit.py index 2e80940..fb85d9e 100644 --- a/ooni/inputunit.py +++ b/ooni/inputunit.py @@ -38,7 +38,7 @@ class InputUnitFactory(object): Returns the number of input units in the input unit factory. """ if not self.length: - self.length = ceil(sum(1 for _ in self._inputs)/self.inputUnitSize) + self.length = ceil(float(sum(1 for _ in self._inputs))/self.inputUnitSize) return self.length def next(self):

1 0

[ooni-probe/master] Update version in __init__.py to match tag
by art＠torproject.org 08 Jan '13

08 Jan '13

commit 4da44a72d91da5aa63e499a755bfba0a678528e5 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 8 14:20:25 2013 +0100 Update version in __init__.py to match tag --- ooni/__init__.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 7b5eb5f..5261982 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -11,7 +11,7 @@ from . import templates from . import utils __author__ = "Arturo Filastò" -__version__ = "0.0.8" +__version__ = "0.0.10" __all__ = ['config', 'inputunit', 'kit', 'lib', 'nettest', 'oonicli', 'reporter',

1 0

[ooni-probe/master] Merge branch 'input_unit_length'
by art＠torproject.org 08 Jan '13

08 Jan '13

commit eed85efdec6bea3655cc070cc22ead037ac53971 Merge: 4da44a7 28861ec Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 8 17:57:30 2013 +0100 Merge branch 'input_unit_length' * input_unit_length: Use float, else ceil() is meaningless Round up the inputunit length and do not add one. ooni/inputunit.py | 3 ++- ooni/runner.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)

1 0