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

[torspec/master] Split "Server behavior" section into smaller sections.
by nickm＠torproject.org 07 Sep '13

07 Sep '13

commit fe6614657d384b15a0386b89d654bb75738e856a Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 12 13:00:12 2013 +0300 Split "Server behavior" section into smaller sections. --- pt-spec.txt | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/pt-spec.txt b/pt-spec.txt index 4cefcfe..2cc02bd 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -139,29 +139,33 @@ Server behavior then Tor will launch the megaproxy binary twice: once with the option --foo and once with the option --bar. - The address that a managed proxy will use to bind can be configured with: - ServerTransportListenAddr <method> <address:port> + Specify bind address - For example, a valid configuration would be: - ServerTransportPlugin obfs2,obfs3,stegotorus exec /usr/bin/obfsproxy --managed - ServerTransportListenAddr obfs2 0.0.0.0:4200 - ServerTransportListenAddr stegotorus 98.23.4.45:6559 + The address that a managed proxy will use to bind can be configured with: + ServerTransportListenAddr <method> <address:port> - If no ServerTransportListenAddr is specified and it's the first time - that Tor encounters that transport, Tor will instruct the managed - proxy to bind to a random TCP port on 0.0.0.0. If Tor has seen the - trasport before, it will instruct the managed proxy to bind to the - same TCP port that the transport used last time. + For example, a valid configuration would be: + ServerTransportPlugin obfs2,obfs3,stegotorus exec /usr/bin/obfsproxy --managed + ServerTransportListenAddr obfs2 0.0.0.0:4200 + ServerTransportListenAddr stegotorus 98.23.4.45:6559 - Further configuration parameters (like the k=v values passed to - client-transports using the Bridge line) can be passed to - server-transports using the ServerTransportOptions option. + If no ServerTransportListenAddr is specified and it's the first time + that Tor encounters that transport, Tor will instruct the managed + proxy to bind to a random TCP port on 0.0.0.0. If Tor has seen the + trasport before, it will instruct the managed proxy to bind to the + same TCP port that the transport used last time. - The format of the ServerTransportOptions line is: - ServerTransportOptions <method> <k=v> ... + Specify additional configuration parameters - For example, a valid instance of this line would be: - ServerTransportOptions trebuchet secret=nou cache=/tmp/cache + Further configuration parameters (like the k=v values passed to + client-transports using the Bridge line) can be passed to + server-transports using the ServerTransportOptions option. + + The format of the ServerTransportOptions line is: + ServerTransportOptions <method> <k=v> ... + + For example, a valid instance of this line would be: + ServerTransportOptions trebuchet secret=nou cache=/tmp/cache Managed proxy interface

1 0

[torspec/master] Merge branch 'bug8929_take2_squashed'
by nickm＠torproject.org 07 Sep '13

07 Sep '13

commit f6bfc2d4c12526c369b046ce87fbd4793d898383 Merge: 14f3c67 fe66146 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sat Sep 7 13:44:49 2013 -0400 Merge branch 'bug8929_take2_squashed' pt-spec.txt | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-)

1 0

[torspec/master] Specify how to pass configuration parameters to server transports.
by nickm＠torproject.org 07 Sep '13

07 Sep '13

commit 178c4cc058c5ce5c0bc07ee0fb76f0ea6ea03d14 Author: George Kadianakis <desnacked(a)riseup.net> Date: Wed Jun 12 12:59:35 2013 +0300 Specify how to pass configuration parameters to server transports. Also, add an example of the SOCKS parameters. --- pt-spec.txt | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/pt-spec.txt b/pt-spec.txt index b61e7c2..4cefcfe 100644 --- a/pt-spec.txt +++ b/pt-spec.txt @@ -37,6 +37,8 @@ Specifications: Client behavior password fields of the request, splitting them across the fields as necessary. If a key or value value must contain a semicolon or a backslash, it is escaped with a backslash. + Example of SOCKS parameters encoding: + shared-secret=rahasia;secrets-file=/tmp/blob Method names MUST be C identifiers. That is, method names must begin with a letter or underscore and the rest of the characters can be @@ -151,6 +153,16 @@ Server behavior trasport before, it will instruct the managed proxy to bind to the same TCP port that the transport used last time. + Further configuration parameters (like the k=v values passed to + client-transports using the Bridge line) can be passed to + server-transports using the ServerTransportOptions option. + + The format of the ServerTransportOptions line is: + ServerTransportOptions <method> <k=v> ... + + For example, a valid instance of this line would be: + ServerTransportOptions trebuchet secret=nou cache=/tmp/cache + Managed proxy interface When the Tor client or relay launches a managed proxy, it communicates @@ -221,6 +233,20 @@ Managed proxy interface TOR_PT_AUTH_COOKIE_FILE is optional and might not be present in the environment of the proxy. + "TOR_PT_SERVER_TRANSPORT_OPTIONS" -- A comma seperated list + of <key>:<value> pairs, where <key> is a transport name and + <value> is a k=v string value with options that are to be + passed to the transport. Colons, semicolons, equal signs and + backslashes must be escaped with a backslash. + The TOR_PT_SERVER_TRANSPORT_OPTIONS is optional and might not + be present in the environment of the proxy if no options need + to be passed to transports. + Example: + TOR_PT_SERVER_TRANSPORT_OPTIONS=trebuchet:secret=nou;trebuchet:cache=/tmp/cache;ballista:secret=yes + will pass to 'trebuchet' the arguments "secret=nou" and + "cache=/tmp/cache" and will pass to 'ballista' the argument + "secret=yes". + The transport proxy replies by writing NL-terminated lines to stdout. The line metaformat is

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 07 Sep '13

07 Sep '13

commit 93ef684dd5c7055173246eca284ac286f6d1a3f1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 7 02:46:41 2013 +0000 Update translations for tor-launcher-network-settings_completed --- pt_BR/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd index 561ae45..50ad882 100644 --- a/pt_BR/network-settings.dtd +++ b/pt_BR/network-settings.dtd @@ -44,7 +44,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:"> <!ENTITY torsettings.useBridges.checkbox "Meu Provedor de Serviços Internet (ISP) bloqueia as conexões à rede Tor"> <!ENTITY torsettings.useBridges.label "Insira um ou mais retransmissores de pontes (um por linha)."> -<!ENTITY torsettings.useBridges.placeholder "endereço: porta"> +<!ENTITY torsettings.useBridges.placeholder "endereço:porta OU endereço:porta de transporte"> <!ENTITY torsettings.copyLog "Copiar o Log do Tor na área de transferência"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Retransmissor de Ponte">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 07 Sep '13

07 Sep '13

commit 1c2cfa9d904b90c38d7fd7727479e9fad20dba62 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Sep 7 02:46:37 2013 +0000 Update translations for tor-launcher-network-settings --- pt_BR/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/network-settings.dtd b/pt_BR/network-settings.dtd index 0bfda37..50ad882 100644 --- a/pt_BR/network-settings.dtd +++ b/pt_BR/network-settings.dtd @@ -44,7 +44,7 @@ <!ENTITY torsettings.firewall.allowedPorts "Portas habilitadas:"> <!ENTITY torsettings.useBridges.checkbox "Meu Provedor de Serviços Internet (ISP) bloqueia as conexões à rede Tor"> <!ENTITY torsettings.useBridges.label "Insira um ou mais retransmissores de pontes (um por linha)."> -<!ENTITY torsettings.useBridges.placeholder ""> +<!ENTITY torsettings.useBridges.placeholder "endereço:porta OU endereço:porta de transporte"> <!ENTITY torsettings.copyLog "Copiar o Log do Tor na área de transferência"> <!ENTITY torsettings.bridgeHelpTitle "Ajuda Retransmissor de Ponte">

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 06 Sep '13

06 Sep '13

commit d28336ebd11ee04af1f447dd8a8435b821aa4705 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 6 17:16:17 2013 +0000 Update translations for whisperback_completed --- de/de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/de.po b/de/de.po index 00d8412..170f9fc 100644 --- a/de/de.po +++ b/de/de.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Deletescape, 2013 # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 # pompor95 <pompor(a)web.de>, 2012 # skep <skep(a)riseup.net>, 2012 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-09-01 18:11+0000\n" -"Last-Translator: MarioBaier26 <mario.baier26(a)gmx.de>\n" +"PO-Revision-Date: 2013-09-06 17:10+0000\n" +"Last-Translator: Deletescape\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #: ../whisperBack/whisperback.py:63 #, python-format msgid "Invalid contact email: %s" -msgstr "Ungültige Kontakt-Adresse: %s" +msgstr "Ungültige Kontakt E-Mail-Adresse: %s" #: ../whisperBack/whisperback.py:80 #, python-format

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 06 Sep '13

06 Sep '13

commit 53c3d47930f46c3731320f606d01623bb7600d11 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Sep 6 17:16:04 2013 +0000 Update translations for whisperback --- de/de.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/de/de.po b/de/de.po index 00d8412..170f9fc 100644 --- a/de/de.po +++ b/de/de.po @@ -3,6 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Deletescape, 2013 # MarioBaier26 <mario.baier26(a)gmx.de>, 2013 # pompor95 <pompor(a)web.de>, 2012 # skep <skep(a)riseup.net>, 2012 @@ -12,8 +13,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2013-08-01 15:36+0200\n" -"PO-Revision-Date: 2013-09-01 18:11+0000\n" -"Last-Translator: MarioBaier26 <mario.baier26(a)gmx.de>\n" +"PO-Revision-Date: 2013-09-06 17:10+0000\n" +"Last-Translator: Deletescape\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,7 +26,7 @@ msgstr "" #: ../whisperBack/whisperback.py:63 #, python-format msgid "Invalid contact email: %s" -msgstr "Ungültige Kontakt-Adresse: %s" +msgstr "Ungültige Kontakt E-Mail-Adresse: %s" #: ../whisperBack/whisperback.py:80 #, python-format

1 0

[torbrowser/master] Merge branch 'maint-2.4'. closes #9677
by erinn＠torproject.org 06 Sep '13

06 Sep '13

commit 5f85da93668d2ac533b2103e772d5996f94ef0b2 Merge: 6cbbe16 e040fd7 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 6 18:09:07 2013 +0200 Merge branch 'maint-2.4'. closes #9677 build-scripts/recommended-versions | 3 +++ 1 file changed, 3 insertions(+)

1 0

[torbrowser/maint-2.4] add 2.4.17-beta-1 to recommended-versions. closes #9677
by erinn＠torproject.org 06 Sep '13

06 Sep '13

commit e040fd78ac6c9c21183ddf3a5f6b2bedf6c0306b Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 6 18:08:18 2013 +0200 add 2.4.17-beta-1 to recommended-versions. closes #9677 --- build-scripts/recommended-versions | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 50e2fdd..e96296d 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -8,6 +8,9 @@ "2.4.16-beta-1-MacOS", "2.4.16-beta-1-Windows", "2.4.16-beta-1-Linux", +"2.4.17-beta-1-MacOS", +"2.4.17-beta-1-Windows", +"2.4.17-beta-1-Linux", "3.0-alpha-3-Linux", "3.0-alpha-3-MacOS", "3.0-alpha-3-Windows"

1 0

[torbrowser/master] add 2.4.17-beta-1 to recommended-versions. closes #9677
by erinn＠torproject.org 06 Sep '13

06 Sep '13

commit e040fd78ac6c9c21183ddf3a5f6b2bedf6c0306b Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Sep 6 18:08:18 2013 +0200 add 2.4.17-beta-1 to recommended-versions. closes #9677 --- build-scripts/recommended-versions | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index 50e2fdd..e96296d 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -8,6 +8,9 @@ "2.4.16-beta-1-MacOS", "2.4.16-beta-1-Windows", "2.4.16-beta-1-Linux", +"2.4.17-beta-1-MacOS", +"2.4.17-beta-1-Windows", +"2.4.17-beta-1-Linux", "3.0-alpha-3-Linux", "3.0-alpha-3-MacOS", "3.0-alpha-3-Windows"

1 0