- tor-commits - lists.torproject.org

[obfsproxy/master] Fix first log line.
by nickm＠torproject.org 11 Feb '12

11 Feb '12

commit fe50f9c7557719e4a7f31514e9f4e26bf84c13aa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Feb 11 11:07:05 2012 +0100 Fix first log line. The idea was to add a newline before the log line to separate runs. But that doesn't work so well with timestamps and log severity written before the actual log message. Taking out the newline. --- src/util.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util.c b/src/util.c index 9a86ad2..f2089df 100644 --- a/src/util.c +++ b/src/util.c @@ -450,7 +450,7 @@ log_set_method(int method, const char *filename) } logging_method = method; - log_info("\nStarting."); + log_info("Starting."); return 0; }

1 0

r25402: {website} osx 64bit obfs tbb in place (website/trunk/projects/en)
by Roger Dingledine 11 Feb '12

11 Feb '12

Author: arma Date: 2012-02-11 15:12:18 +0000 (Sat, 11 Feb 2012) New Revision: 25402 Modified: website/trunk/projects/en/obfsproxy.wml Log: osx 64bit obfs tbb in place Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-11 14:05:12 UTC (rev 25401) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-11 15:12:18 UTC (rev 25402) @@ -78,6 +78,14 @@ <p> Or try the + <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Obfsproxy Tor Browser Bundle for OSX 64-bit</a> + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or + <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_osx.tar.gz">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_osx.tar.gz.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_osx.torrent">torrent</a>), <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_osx.tar.gz">mirror 2</a> (<a href="http://mit.edu/arma/Public/obfsprxy_64bit_osx.tar.gz.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_64bit_osx.torrent">torrent</a>). + </p> + + <p> + Or try the <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Obfsproxy Tor Browser Bundle for Linux 32-bit</a> (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or

1 0

[ooni-probe/master] Fix up @torify decorator by making it a descriptor
by art＠torproject.org 11 Feb '12

11 Feb '12

commit 78e3bdd22288eed3ac5431f23060cb3b74f5f901 Author: Arturo Filastò <hellais(a)gmail.com> Date: Sat Feb 11 15:18:20 2012 +0100 Fix up @torify decorator by making it a descriptor --- refactor/ooni-probe.conf | 1 + refactor/plugoo.py | 28 ++++++++++++++++++---------- refactor/tests/bridget.py | 12 +++++++++++- 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/refactor/ooni-probe.conf b/refactor/ooni-probe.conf index 2e22961..e74b241 100644 --- a/refactor/ooni-probe.conf +++ b/refactor/ooni-probe.conf @@ -9,6 +9,7 @@ assetdir = assets/ testdir = tests/ loglevel = DEBUG +proxyaddress = 127.0.0.1:9050 # These are configurations specific to the tests that should be # run by ooni-probe diff --git a/refactor/plugoo.py b/refactor/plugoo.py index 20b418d..49b3e16 100644 --- a/refactor/plugoo.py +++ b/refactor/plugoo.py @@ -315,19 +315,27 @@ class Plugoo(): job.kill() jobs = [] -def torify(socksaddr, modules=None): +class torify(object): """This is the torify decorator. It should be used to decorate functions that should use to for connecting to the interwebz. The suggary syntax is the following: - @torify("127.0.0.1:9050", [urllib2]) + @torify([urllib2]) def myfunction(): f = urllib2.urlopen('https://torproject.org/') + remember to set the proxyaddress in the config file. """ - def decorator(target): - host, port = socksaddr.split(":") - socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, host, int(port)) - # Wrap the modules into socks - for module in modules: - socks.wrapmodule(module) - return target - return decorator + def __init__(self, f): + print f + self.f = f + + def __get__(self, instance, owner): + self.modules = instance.modules + def decorator(*args): + print instance.config.main.proxyaddress + host, port = instance.config.main.proxyaddress.split(":") + socks.setdefaultproxy(socks.PROXY_TYPE_SOCKS5, host, int(port)) + # Wrap the modules into socks + for module in self.modules: + socks.wrapmodule(module) + return self.f(instance, *args) + return decorator diff --git a/refactor/tests/bridget.py b/refactor/tests/bridget.py index 2f6df2c..5ad16c0 100644 --- a/refactor/tests/bridget.py +++ b/refactor/tests/bridget.py @@ -23,7 +23,8 @@ import plugoo import gevent from gevent import socket import fcntl -from plugoo import Plugoo, Asset +from plugoo import Plugoo, Asset, torify +import urllib2 try: from TorCtl import TorCtl @@ -38,6 +39,8 @@ class BridgeT(Plugoo): # This is the timeout value after which # we will give up timeout = 20 + # These are the modules that should be torified + modules = [urllib2] def writetorrc(self, bridge): # register Tor to an ephemeral port @@ -81,11 +84,18 @@ usemicrodescriptors 0 ret[cfield[0]] = ' '.join(cfield[1:]) return ret + @torify + def download_file(self): + f = urllib2.urlopen('http://check.torproject.org') + print f.readlines() + + def connect(self, bridge, timeout=None): if not timeout: if self.config.tests.tor_bridges_timeout: self.timeout = self.config.tests.tor_bridges_timeout timeout = self.timeout + self.download_file() torrc, tordir, controlport = self.writetorrc(bridge) cmd = ["tor", "-f", torrc]

1 0

r25401: {website} tell people not to make a media splash out of these and also (website/trunk/projects/en)
by Roger Dingledine 11 Feb '12

11 Feb '12

Author: arma Date: 2012-02-11 14:05:12 +0000 (Sat, 11 Feb 2012) New Revision: 25401 Modified: website/trunk/projects/en/obfsproxy.wml Log: tell people not to make a media splash out of these and also put up the obfstbb 32-bit linux links Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-11 13:16:13 UTC (rev 25400) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-11 14:05:12 UTC (rev 25401) @@ -54,6 +54,12 @@ <h2><a class="anchor" href="#download">Download Obfsproxy Tor Browser Bundle</a></h2> <p> + <b>Please spread the news of these bundles to the right people, + but please don't make a big media splash out of them — we need + them to remain available and working for people in censored areas.</b> + </p> + + <p> We've made an experimental <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Obfsproxy Tor Browser Bundle for Windows</a> (<a @@ -72,6 +78,14 @@ <p> Or try the + <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Obfsproxy Tor Browser Bundle for Linux 32-bit</a> + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or + <a href="http://sebastianhahn.net/stuff/obfsprxy_32bit_linux.tar.gz">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_32bit_linux.tar.gz.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_32bit_linux.torrent">torrent</a>), <a href=" http://mit.edu/arma/Public/obfsprxy_32bit_linux.tar.gz">mirror 2</a> (<a href="http://mit.edu/arma/Public/obfsprxy_32bit_linux.tar.gz.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_32bit_linux.torrent">torrent</a>). + </p> + + <p> + Or try the <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Obfsproxy Tor Browser Bundle for Linux 64-bit</a> (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or

1 0

r25400: {website} the mirrors have torrents too (website/trunk/projects/en)
by Roger Dingledine 11 Feb '12

11 Feb '12

Author: arma Date: 2012-02-11 13:16:13 +0000 (Sat, 11 Feb 2012) New Revision: 25400 Modified: website/trunk/projects/en/obfsproxy.wml Log: the mirrors have torrents too Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-11 13:06:53 UTC (rev 25399) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-11 13:16:13 UTC (rev 25400) @@ -62,18 +62,20 @@ href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>) that currently works in all censored countries with no config changes. See also <a - href="http://sebastianhahn.net/stuff/obfsprxy.exe">mirror 1</a> and - <a href="http://sebastianhahn.net/stuff/obfsprxy.exe.asc">sig</a>, + href="http://sebastianhahn.net/stuff/obfsprxy.exe">mirror 1</a> + (<a href="http://sebastianhahn.net/stuff/obfsprxy.exe.asc">sig</a>, + <a href="http://sebastianhahn.net/stuff/obfsprxy.torrent">torrent</a>) and <a href="http://mit.edu/arma/Public/obfsprxy.exe">mirror 2</a> - and <a href="http://mit.edu/arma/Public/obfsprxy.exe.asc">sig</a>. + (<a href="http://mit.edu/arma/Public/obfsprxy.exe.asc">sig</a>, + <a href="http://mit.edu/arma/Public/obfsprxy.torrent">torrent</a>). </p> <p> Or try the <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Obfsproxy Tor Browser Bundle for Linux 64-bit</a> (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) - (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>) - (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz">mirror 1</a> and <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz.asc">sig</a>, <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz">mirror 2</a> and <a href="http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz.asc">sig</a>). + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>), or + <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz">mirror 1</a> (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz.asc">sig</a>, <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.torrent">torrent</a>), <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz">mirror 2</a> (<a href="http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz.asc">sig</a>, <a href="http://mit.edu/arma/Public/obfsprxy_64bit_linux.torrent">torrent</a>). </p> <h2><a class="anchor" href="#instructions">Installation Instructions</a></h2>

1 0

r25399: {website} link to the Obfsproxy component in trac (website/trunk/projects/en)
by Roger Dingledine 11 Feb '12

11 Feb '12

Author: arma Date: 2012-02-11 13:06:53 +0000 (Sat, 11 Feb 2012) New Revision: 25399 Modified: website/trunk/projects/en/obfsproxy.wml Log: link to the Obfsproxy component in trac Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-11 13:05:59 UTC (rev 25398) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-11 13:06:53 UTC (rev 25399) @@ -46,7 +46,7 @@ <p> Please open a <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">ticket</a> + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">ticket</a> on our bug tracker for any bugs you find or features you would like to see added in future releases. </p>

1 0

r25398: {website} link to sigs on mirrors too (website/trunk/projects/en)
by Roger Dingledine 11 Feb '12

11 Feb '12

Author: arma Date: 2012-02-11 13:05:59 +0000 (Sat, 11 Feb 2012) New Revision: 25398 Modified: website/trunk/projects/en/obfsproxy.wml Log: link to sigs on mirrors too Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-11 12:59:58 UTC (rev 25397) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-11 13:05:59 UTC (rev 25398) @@ -61,9 +61,11 @@ (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>) that currently works in all censored countries with no config - changes. Here are <a - href="http://sebastianhahn.net/stuff/obfsprxy.exe">some</a> <a - href="http://mit.edu/arma/Public/obfsprxy.exe">mirrors</a>. + changes. See also <a + href="http://sebastianhahn.net/stuff/obfsprxy.exe">mirror 1</a> and + <a href="http://sebastianhahn.net/stuff/obfsprxy.exe.asc">sig</a>, + and <a href="http://mit.edu/arma/Public/obfsprxy.exe">mirror 2</a> + and <a href="http://mit.edu/arma/Public/obfsprxy.exe.asc">sig</a>. </p> <p> @@ -71,7 +73,7 @@ <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Obfsproxy Tor Browser Bundle for Linux 64-bit</a> (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>) - (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz">mirror 1</a>, <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz">mirror 2</a>). + (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz">mirror 1</a> and <a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz.asc">sig</a>, <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz">mirror 2</a> and <a href="http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz.asc">sig</a>). </p> <h2><a class="anchor" href="#instructions">Installation Instructions</a></h2>

1 0

r25397: {website} make the instructions link be a section, since it looks like (website/trunk/projects/en)
by Roger Dingledine 11 Feb '12

11 Feb '12

Author: arma Date: 2012-02-11 12:59:58 +0000 (Sat, 11 Feb 2012) New Revision: 25397 Modified: website/trunk/projects/en/obfsproxy.wml Log: make the instructions link be a section, since it looks like one Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-11 12:56:38 UTC (rev 25396) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-11 12:59:58 UTC (rev 25397) @@ -41,10 +41,16 @@ Even though obfsproxy is a separate application, completely independent from tor, it speaks to tor using an <a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/180-pluggabl…">internal - protocol</a> in an attempt minimize necessary end-user - configuration. + protocol</a> to minimize necessary end-user configuration. </p> + <p> + Please open a <a + href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">ticket</a> + on our bug tracker for any bugs you find or features you would + like to see added in future releases. + </p> + <h2><a class="anchor" href="#download">Download Obfsproxy Tor Browser Bundle</a></h2> <p> @@ -68,14 +74,13 @@ (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz">mirror 1</a>, <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz">mirror 2</a>). </p> - <h2><a class="anchor" href="<page projects/obfsproxy-instructions>#instructions">Installation Instructions</a></h2> + <h2><a class="anchor" href="#instructions">Installation Instructions</a></h2> - <p> - Please open a <a - href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">ticket</a> - on our bug tracker for any bugs you find or features you would - like to see added in future releases. - </p> + <p>To set up an obfsproxy bridge, or to build + it from source, see the separate <a href="<page + projects/obfsproxy-instructions>#instructions">Obfsproxy Installation + Instructions</a> page. + </p> </div>

1 0

r25396: {website} there's a 64-bit obfs tbb now (thanks sebastian!) (website/trunk/projects/en)
by Roger Dingledine 11 Feb '12

11 Feb '12

Author: arma Date: 2012-02-11 12:56:38 +0000 (Sat, 11 Feb 2012) New Revision: 25396 Modified: website/trunk/projects/en/obfsproxy.wml Log: there's a 64-bit obfs tbb now (thanks sebastian!) Modified: website/trunk/projects/en/obfsproxy.wml =================================================================== --- website/trunk/projects/en/obfsproxy.wml 2012-02-11 10:53:50 UTC (rev 25395) +++ website/trunk/projects/en/obfsproxy.wml 2012-02-11 12:56:38 UTC (rev 25396) @@ -45,9 +45,10 @@ configuration. </p> - <h2><a class="anchor" href="#download">Download Obfsproxy Tor Browser Bundle for Windows</a></h2> + <h2><a class="anchor" href="#download">Download Obfsproxy Tor Browser Bundle</a></h2> - <p>We've made an experimental <a + <p> + We've made an experimental <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Obfsproxy Tor Browser Bundle for Windows</a> (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) @@ -56,8 +57,17 @@ that currently works in all censored countries with no config changes. Here are <a href="http://sebastianhahn.net/stuff/obfsprxy.exe">some</a> <a - href="http://mit.edu/arma/Public/obfsprxy.exe">mirrors</a>.</p> + href="http://mit.edu/arma/Public/obfsprxy.exe">mirrors</a>. + </p> + <p> + Or try the + <a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">Obfsproxy Tor Browser Bundle for Linux 64-bit</a> + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">signature</a>) + (<a href="https://www.torproject.org/dist/obfsproxy/tor-obfsproxy-browser-bundle-2.3.…">torrent</a>) + (<a href="http://sebastianhahn.net/stuff/obfsprxy_64bit_linux.tar.gz">mirror 1</a>, <a href=" http://mit.edu/arma/Public/obfsprxy_64bit_linux.tar.gz">mirror 2</a>). + </p> + <h2><a class="anchor" href="<page projects/obfsproxy-instructions>#instructions">Installation Instructions</a></h2> <p>

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 11 Feb '12

11 Feb '12

commit 3764c1e558fe2b472db43a9bd1fd0e45f145fd85 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Feb 11 11:45:29 2012 +0000 Update translations for vidalia_help_completed --- tr/index.po | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/tr/index.po b/tr/index.po new file mode 100644 index 0000000..00c03d1 --- /dev/null +++ b/tr/index.po @@ -0,0 +1,56 @@ +# +# Translators: +# Deniz <>, 2012. +# runasand <runa.sandvik(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: 2010-06-26 16:59+0200\n" +"PO-Revision-Date: 2012-02-11 11:30+0000\n" +"Last-Translator: Deniz <>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: tr\n" +"Plural-Forms: nplurals=1; plural=0\n" + +#. type: Content of: <html><body><h1> +#: en/index.html:16 +msgid "Vidalia Help" +msgstr "Vidalia Yardım" + +#. type: Content of: <html><body><p> +#: en/index.html:20 +msgid "" +"Select a help topic from the tree on the left or click on the Search button " +"above the list of topics to search through all available help topics." +msgstr "" +"Soldaki ağaçtan bir yardım konusu seçin ya da konuların üstündeki Arama " +"düğmesine tıklayıp bütün mevcut konular içinde arama yapın." + +#. type: Content of: <html><body><p> +#: en/index.html:25 +msgid "" +"You can use the <i>Find</i> button on the toolbar above to search within a " +"particular help topic." +msgstr "" +"Yukarıdaki araç çubuğundaki <i>Bul</i> düğmesini bir konunun içinde aramak " +"için kullanabilirsiniz." + +#. type: Content of: <html><body><p> +#: en/index.html:30 +msgid "The <i>Home</i> button above will bring you back to this home page." +msgstr "Yukarıdaki <i>Ev</i> düğmesi sizi bu sayfaya geri döndürecek." + +#. type: Content of: <html><body><p> +#: en/index.html:34 +msgid "" +"See the <a href=\"links.html\">Helpful Links</a> topic for some places you " +"can visit to find additional help and information about Vidalia and Tor." +msgstr "" +"<a href=\"links.html\">Yardımcı Linkler</a> konusunda Vidalia ve Tor " +"hakkında ek bilgi ve yardım bulabilirsiniz." + +

1 0