- tor-commits - lists.torproject.org

[torspec/master] Cleared up example. Fixed two small errors.
by arma＠torproject.org 16 Apr '11

16 Apr '11

commit 71609c11e48086a341e9248b7bc8cd30bd08878b Author: George Kadianakis <desnacked(a)gmail.com> Date: Tue Apr 12 22:02:57 2011 +0200 Cleared up example. Fixed two small errors. --- proposals/180-pluggable-transport.txt | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index 5e9e5b1..f51a9ff 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -145,7 +145,7 @@ Specifications: Client behavior bridge method address:port [[keyid=]id-fingerprint] [k=v] [k=v] [k=v] To connect to such a bridge, the Tor program needs to know which - local SOCKS proxy will support the transport called "method". It + SOCKS proxy will support the transport called "method". It then connects to this proxy, and asks it to connect to address:port. If [id-fingerprint] is provided, Tor should expect the public identity key on the TLS connection to match the digest @@ -156,8 +156,7 @@ Specifications: Client behavior as necessary. If a key or value value must contain a semicolon or a backslash, it is escaped with a backslash. - The "id-fingerprint" field is always provided in a field named - "keyid", if it was given. Method names must be C identifiers. + Method names must be C identifiers. For reference, the old bridge format was bridge address[:port] [id-fingerprint] @@ -168,11 +167,11 @@ Specifications: Client behavior optionally include whitespace in the old format, whitespace in the id-fingerprint is not permitted in the new format. - Example: if the bridge line is "bridge trebuchet www.example.com:3333 - rocks=20 height=5.6m" AND if the Tor client knows that the - 'trebuchet' method is provided by a SOCKS5 proxy on - 127.0.0.1:19999, the client should connect to that proxy, ask it to - connect to www.example.com, and provide the string + Example: if the bridge line is "bridge trebuchet www.example.com:3333 + keyid=09F911029D74E35BD84156C5635688C009F909F9 rocks=20 height=5.6m" + AND if the Tor client knows that the 'trebuchet' method is supported, + the client should connect to the proxy that provides the 'trebuchet' + method, ask it to connect to www.example.com, and provide the string "rocks=20;height=5.6m" as the username, the password, or split across the username and password.

1 0

[torspec/master] Merge remote-tracking branch 'asn/gitorious'
by arma＠torproject.org 16 Apr '11

16 Apr '11

commit a8219b9406daa19b97ceb7e9975365659c805cc3 Merge: 0f11e4f 71609c1 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Apr 16 19:22:03 2011 -0400 Merge remote-tracking branch 'asn/gitorious' proposals/180-pluggable-transport.txt | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-)

1 0

r24643: {} Delete pl_PL/ because we have pl/ (website/trunk/getinvolved)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 20:56:02 +0000 (Sat, 16 Apr 2011) New Revision: 24643 Removed: website/trunk/getinvolved/pl_PL/ Log: Delete pl_PL/ because we have pl/

1 0

r24642: {} Delete pl_PL/ because we already have pl/ (website/trunk/projects)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 20:55:15 +0000 (Sat, 16 Apr 2011) New Revision: 24642 Removed: website/trunk/projects/pl_PL/ Log: Delete pl_PL/ because we already have pl/

1 0

r24641: {} German translation of sidenav.wmi for projects/ (by Sacro) (in website/trunk/projects: . de)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 20:54:55 +0000 (Sat, 16 Apr 2011) New Revision: 24641 Added: website/trunk/projects/de/ website/trunk/projects/de/sidenav.wmi Log: German translation of sidenav.wmi for projects/ (by Sacro) Added: website/trunk/projects/de/sidenav.wmi =================================================================== --- website/trunk/projects/de/sidenav.wmi (rev 0) +++ website/trunk/projects/de/sidenav.wmi 2011-04-16 20:54:55 UTC (rev 24641) @@ -0,0 +1,56 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /projects pages +# and is the input for include/side.wmi + +# fields: +# +# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the +# page because at build-time it is used to determine what view of the +# navigation menu to generate +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'projects/projects', + 'txt' => 'Software & Services', + 'subelements' => [ + {'url' => 'torbutton/index', + 'txt' => 'TorButton', + }, + {'url' => 'projects/torbrowser', + 'txt' => 'Tor-Browser-Paket', + }, + {'url' => 'projects/vidalia', + 'txt' => 'Vidalia', + }, + {'url' => 'projects/arm', + 'txt' => 'Arm', + }, + {'url' => 'https://guardianproject.info/apps/orbot/', + 'txt' => 'Orbot', + }, + {'url' => 'https://tails.boum.org/', + 'txt' => 'Tails', + }, + {'url' => 'http://torstatus.blutmagie.de/', + 'txt' => 'TorStatus', + }, + {'url' => 'https://metrics.torproject.org/', + 'txt' => 'Messdaten Portal', + } + ] + }]; +:> +

1 0

r24640: {} Delete pl_PL/ because we already have pl/ (website/trunk/torbutton)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 20:54:05 +0000 (Sat, 16 Apr 2011) New Revision: 24640 Removed: website/trunk/torbutton/pl_PL/ Log: Delete pl_PL/ because we already have pl/

1 0

r24639: {} German translation of sidenav.wmi for torbutton/ (by Sacro) (in website/trunk/torbutton: . de)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 20:53:47 +0000 (Sat, 16 Apr 2011) New Revision: 24639 Added: website/trunk/torbutton/de/ website/trunk/torbutton/de/sidenav.wmi Log: German translation of sidenav.wmi for torbutton/ (by Sacro) Added: website/trunk/torbutton/de/sidenav.wmi =================================================================== --- website/trunk/torbutton/de/sidenav.wmi (rev 0) +++ website/trunk/torbutton/de/sidenav.wmi 2011-04-16 20:53:47 UTC (rev 24639) @@ -0,0 +1,37 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /torbutton pages +# and is the input for include/side.wmi + +# fields: +# +# name - the $WML_SRC_BASENAME of the file. It should uniquely identify the +# page because at build-time it is used to determine what view of the +# navigation menu to generate +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'torbutton/index', + 'txt' => 'Torbutton', + 'subelements' => [ + {'url' => 'torbutton/torbutton-options', + 'txt' => 'Torbutton Optionen', + }, + {'url' => 'torbutton/torbutton-faq', + 'txt' => 'Torbutton FAQ', + }] + }] +:> +

1 0

r24638: {} German translation of info.wmi for press/ (by Sacro) (website/trunk/press/de)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 19:26:14 +0000 (Sat, 16 Apr 2011) New Revision: 24638 Added: website/trunk/press/de/info.wmi Log: German translation of info.wmi for press/ (by Sacro) Added: website/trunk/press/de/info.wmi =================================================================== --- website/trunk/press/de/info.wmi (rev 0) +++ website/trunk/press/de/info.wmi 2011-04-16 19:26:14 UTC (rev 24638) @@ -0,0 +1,18 @@ +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 2-medium +#!/usr/bin/env wml +<div class="img-shadow"> + <div class="infoblock"> + <h2 class="media">Presse-Kontakt</h2> + <p> + <b>Andrew Lewman</b><br> + Verantwortlicher Direktor<br> + execdir(a)torproject.org<br> + +1-406-356-6475<br> + </p> + </div> +  +</div> + +

1 0

r24637: {} Deleting pl_PL/ because we already have pl/ (website/trunk/press)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 19:25:13 +0000 (Sat, 16 Apr 2011) New Revision: 24637 Removed: website/trunk/press/pl_PL/ Log: Deleting pl_PL/ because we already have pl/

1 0

r24636: {} German translation of sidenav.wmi for press/ (by Sacro) (in website/trunk/press: . de)
by Runa Sandvik 16 Apr '11

16 Apr '11

Author: runa Date: 2011-04-16 19:24:45 +0000 (Sat, 16 Apr 2011) New Revision: 24636 Added: website/trunk/press/de/ website/trunk/press/de/sidenav.wmi Log: German translation of sidenav.wmi for press/ (by Sacro) Added: website/trunk/press/de/sidenav.wmi =================================================================== --- website/trunk/press/de/sidenav.wmi (rev 0) +++ website/trunk/press/de/sidenav.wmi 2011-04-16 19:24:45 UTC (rev 24636) @@ -0,0 +1,33 @@ +#!/usr/bin/wml + +## translation metadata +# Revision: $Revision$ +# Translation-Priority: 2-medium + +# this structure defines the side nav bar for the /press pages +# and is the input for include/side.wmi + +# fields: +# +# url - the path to the wml page, as used the the <page> tag. This tag ensures +# that links will point to the current language if supported, and alternately +# the english version +# +# txt - the link text to be displayed. Different translations will +# need to supply alternate txt + +<: + my $sidenav; + $sidenav = [ + {'url' => 'press/press', + 'txt' => 'Presseveröffentlichungen', + }, + {'url' => 'press/inthemedia', + 'txt' => 'Tor in den Medien', + }, + {'url' => 'https://blog.torproject.org/', + 'txt' => 'Tor Blog', + }, + ]; +:> +

1 0