July 2011 - tor-commits - lists.torproject.org

[torspec/master] Fixed some errors introduced by the previous commit.
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit c4b8d1f4cc6c3c5af16f0900f90e734f6028d592 Author: George Kadianakis <desnacked(a)gmail.com> Date: Thu Jul 14 00:24:07 2011 +0200 Fixed some errors introduced by the previous commit. * Restored "proxy" in ServerTransportPlugin lines. * Restored TOR_PT_EXTENDED_SERVER_PORT and TOR_PT_ORPORT to their original addr:port form. --- proposals/180-pluggable-transport.txt | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index f6e25b7..9cab75a 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -228,9 +228,9 @@ Server behavior launches. An external server proxy is configured as - ServerTransportPlugin <method> <address:port> <param=val> ... + ServerTransportPlugin <method> proxy <address:port> <param=val> ... as in - "ServerTransportPlugin trebuchet 127.0.0.1:999 rocks=heavy". + "ServerTransportPlugin trebuchet proxy 127.0.0.1:999 rocks=heavy". The param=val pairs and the address are used to make the bridge configuration information that we'll tell users. @@ -283,15 +283,15 @@ Managed proxy interface {Server only} - "TOR_PT_EXTENDED_SERVER_PORT" -- A port (probably on localhost) + "TOR_PT_EXTENDED_SERVER_PORT" -- An addr:port (probably on localhost) that speaks the extended server protocol. (See the "The extended ORPort protocol" section below.) - Example: TOR_PT_EXTENDED_SERVER_PORT=4200 + Example: TOR_PT_EXTENDED_SERVER_PORT=127.0.0.1:4200 "TOR_PT_ORPORT" -- Our regular ORPort in a form suitable for local connections, i.e. connections from the proxy to the ORPort. - Example: TOR_PT_ORPORT=9001 + Example: TOR_PT_ORPORT=127.0.0.1:9001 "TOR_PT_SERVER_BINDADDR" -- The address[:port] on which to listen for client proxy connections. This might be the

1 0

r24906: {website} Re-apply a fixed version of 24904 the tor browser version we (website/trunk/include)
by Sebastian Hahn 14 Jul '11

14 Jul '11

Author: sebastian Date: 2011-07-14 14:37:02 +0000 (Thu, 14 Jul 2011) New Revision: 24906 Modified: website/trunk/include/versions.wmi Log: Re-apply a fixed version of 24904 the tor browser version went to 1.3.25, not 1.3.26 Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-07-14 14:28:20 UTC (rev 24905) +++ website/trunk/include/versions.wmi 2011-07-14 14:37:02 UTC (rev 24906) @@ -2,29 +2,29 @@ <define-tag version-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.29-beta-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.30-rc-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.24</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.25</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.10-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>3.6.17</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.12-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>3.6.19</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -32,22 +32,22 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.11</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.11</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.12</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.12</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.12, zlib-1.2.5, openssl-0.9.8p</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.17</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.19</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.19</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.17</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.22</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.19</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleff4 whitespace=delete>2.2.29-1</define-tag> +<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.30-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.12</define-tag>

1 0

r24905: {website} Revert "bump all package versions for tor 0.2.2.30-rc and ne (website/trunk/include)
by Sebastian Hahn 14 Jul '11

14 Jul '11

Author: sebastian Date: 2011-07-14 14:28:20 +0000 (Thu, 14 Jul 2011) New Revision: 24905 Modified: website/trunk/include/versions.wmi Log: Revert "bump all package versions for tor 0.2.2.30-rc and new firefoxes" This reverts commit 4e8637d47c827a5afba04423c99e062ea9e62532. Looks like the packages have not actually been uploaded. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-07-14 10:48:13 UTC (rev 24904) +++ website/trunk/include/versions.wmi 2011-07-14 14:28:20 UTC (rev 24905) @@ -2,29 +2,29 @@ <define-tag version-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.30-rc-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.29-beta-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.29-beta</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.26</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.24</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.12-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>3.6.19</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.10-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -32,22 +32,22 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.12</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.12</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.11</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.11</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.12, zlib-1.2.5, openssl-0.9.8p</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.19</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.22</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.19</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.19</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.17</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.30-1</define-tag> +<define-tag version-torbrowserbundleff4 whitespace=delete>2.2.29-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.12</define-tag>

1 0

[tor/master] Update HACKING with some more release instructions
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 5580fbb0c481a1f52fcef9e5b65966d5a91446d9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 14 13:03:55 2011 +0200 Update HACKING with some more release instructions --- doc/HACKING | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index feeb05d..9747f22 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -495,7 +495,11 @@ box. By convention, we enter the version in the form "Tor: 0.2.2.23-alpha" (or whatever the version is), and we select the date as the date in the ChangeLog. -11) Wait up to a day or two (for a development release), or until most +11) Forward-port the ChangeLog. + +12) Update the topic in #tor to reflect the new version. + +12) Wait up to a day or two (for a development release), or until most packages are up (for a stable release), and mail the release blurb and changelog to tor-talk or tor-announce.

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit d67b304b20a3dbca9ad3072b33d6e1d54680f220 Merge: e8bfe89 5580fbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 09:51:58 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' doc/HACKING | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Update HACKING with some more release instructions
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 5580fbb0c481a1f52fcef9e5b65966d5a91446d9 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jul 14 13:03:55 2011 +0200 Update HACKING with some more release instructions --- doc/HACKING | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/doc/HACKING b/doc/HACKING index feeb05d..9747f22 100644 --- a/doc/HACKING +++ b/doc/HACKING @@ -495,7 +495,11 @@ box. By convention, we enter the version in the form "Tor: 0.2.2.23-alpha" (or whatever the version is), and we select the date as the date in the ChangeLog. -11) Wait up to a day or two (for a development release), or until most +11) Forward-port the ChangeLog. + +12) Update the topic in #tor to reflect the new version. + +12) Wait up to a day or two (for a development release), or until most packages are up (for a stable release), and mail the release blurb and changelog to tor-talk or tor-announce.

1 0

r24904: {website} bump all package versions for tor 0.2.2.30-rc and new firefo (website/trunk/include)
by Erinn Clark 14 Jul '11

14 Jul '11

Author: erinn Date: 2011-07-14 10:48:13 +0000 (Thu, 14 Jul 2011) New Revision: 24904 Modified: website/trunk/include/versions.wmi Log: bump all package versions for tor 0.2.2.30-rc and new firefoxes Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-07-14 08:29:57 UTC (rev 24903) +++ website/trunk/include/versions.wmi 2011-07-14 10:48:13 UTC (rev 24904) @@ -2,29 +2,29 @@ <define-tag version-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-win32-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-win32-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-win32-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.29-beta-<version-vidalia-stable></define-tag> +<define-tag version-win32-bridge-bundle-alpha whitespace=delete>0.2.2.30-rc-<version-vidalia-stable></define-tag> <define-tag version-osx-x86-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-x86-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-osx-ppc-bundle-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-ppc-bundle-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-osx-x86-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-x86-alpha whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-osx-ppc-stable whitespace=delete>0.2.1.30</define-tag> -<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-osx-ppc-alpha whitespace=delete>0.2.2.30-rc</define-tag> -<define-tag version-torbrowserbundle whitespace=delete>1.3.24</define-tag> +<define-tag version-torbrowserbundle whitespace=delete>1.3.26</define-tag> <define-tag version-torbrowser-tor whitespace=delete>0.2.1.30</define-tag> -<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.10-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> -<define-tag version-torbrowser-firefox whitespace=delete>3.6.17</define-tag> +<define-tag version-torbrowser-tor-components whitespace=delete>libevent-2.0.12-stable, zlib-1.2.5, openssl-1.0.0d</define-tag> +<define-tag version-torbrowser-firefox whitespace=delete>3.6.19</define-tag> <define-tag version-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-torbrowser-pidgin whitespace=delete>2.7.5</define-tag> @@ -32,22 +32,22 @@ <define-tag version-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> <define-tag version-torimbrowserbundle whitespace=delete>1.3.21</define-tag> -<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.11</define-tag> -<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.11</define-tag> -<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> +<define-tag version-torbrowserbundlelinux32 whitespace=delete>1.1.12</define-tag> +<define-tag version-torbrowserbundlelinux64 whitespace=delete>1.1.12</define-tag> +<define-tag version-gnu-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> <define-tag version-gnu-torbrowser-tor-components whitespace=delete>libevent-2.0.12, zlib-1.2.5, openssl-0.9.8p</define-tag> -<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.17</define-tag> +<define-tag version-gnu-torbrowser-firefox whitespace=delete>3.6.19</define-tag> <define-tag version-gnu-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-gnu-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleosx whitespace=delete>1.0.19</define-tag> -<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.29-beta</define-tag> -<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.17</define-tag> +<define-tag version-torbrowserbundleosx whitespace=delete>1.0.22</define-tag> +<define-tag version-osx-torbrowser-tor whitespace=delete>0.2.2.30-rc</define-tag> +<define-tag version-osx-torbrowser-firefox whitespace=delete>3.6.19</define-tag> <define-tag version-osx-torbrowser-torbutton whitespace=delete>1.2.5</define-tag> <define-tag version-osx-torbrowser-polipo whitespace=delete>1.0.4.1</define-tag> <define-tag version-osx-torbrowser-vidalia whitespace=delete>0.2.12</define-tag> -<define-tag version-torbrowserbundleff4 whitespace=delete>2.2.29-1</define-tag> +<define-tag version-torbrowserbundleff5 whitespace=delete>2.2.30-1</define-tag> <define-tag version-vidalia-stable whitespace=delete>0.2.12</define-tag>

1 0

r24903: {website} include both the English and the German video on tor-doc-win (in website/trunk: . docs/de)
by Runa Sandvik 14 Jul '11

14 Jul '11

Author: runa Date: 2011-07-14 08:29:57 +0000 (Thu, 14 Jul 2011) New Revision: 24903 Modified: website/trunk/docs/de/tor-doc-windows.wml website/trunk/po2wml.sh Log: include both the English and the German video on tor-doc-windows.html.de Modified: website/trunk/docs/de/tor-doc-windows.wml =================================================================== --- website/trunk/docs/de/tor-doc-windows.wml 2011-07-14 07:31:20 UTC (rev 24902) +++ website/trunk/docs/de/tor-doc-windows.wml 2011-07-14 08:29:57 UTC (rev 24903) @@ -32,7 +32,7 @@ das in deine Sprache übersetzt ist, kennst, lass es uns wissen!</p> <div class="center"> -<p>Das nachfolgende Video, wurde von <a href="http://www.sempervideo.de/">SemperVideo</a> erstellt.</p> <p><video id="v1" src="https://media.torproject.org/video/2011-install-and-use-tor-de.ogv" autobuffer="true" controls="controls"></video></p> + <p><video id="v1" src="https://media.torproject.org/video/2009-install-and-use-tor.ogv" autobuffer="true" controls="controls"></video></p> <p>Das nachfolgende Video, wurde von SemperVideo erstellt.</p> <p><video id="v1" src="https://media.torproject.org/video/2011-install-and-use-tor-de.ogv" autobuffer="true" controls="controls"></video></p> </div> <hr> <a id="Installation"></a> Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-07-14 07:31:20 UTC (rev 24902) +++ website/trunk/po2wml.sh 2011-07-14 08:29:57 UTC (rev 24903) @@ -322,10 +322,10 @@ if [ $wmlfile = "tor-doc-windows.wml" ] then orig_video=`grep src=\"https:\/\/media.torproject.org\/video\/2009-install-and-use-tor.ogv\" "$wmldir/$subdir/$lang/$wmlfile"` - new_video=`echo "<p>Das nachfolgende Video, wurde von <a href=\"http://www.sempervideo.de/\">SemperVideo</a> erstellt.</p> $orig_video"` + translated_video=`echo "<p>Das nachfolgende Video, wurde von SemperVideo erstellt.</p> <p><video id=\"v1\" src=\"https://media.torproject.org/video/2011-install-and-use-tor-de.ogv\" autobuffer=\"true\" controls=\"controls\"></video></p>"` + new_video=`echo "$orig_video $translated_video"` sed -i "s@$orig_video@$new_video@" "$wmldir/$subdir/$lang/$wmlfile" - sed -i "s@src\=\"https://media.torproject.org/video/2009-install-and-use-tor.ogv\"@src\=\"https://media.torproject.org/video/2011-install-and-use-tor-de.ogv\"@" "$wmldir/$subdir/$lang/$wmlfile" fi fi

1 0

r24902: {website} updated Makefile.common to include pt-br when building the w (website/trunk)
by Runa Sandvik 14 Jul '11

14 Jul '11

Author: runa Date: 2011-07-14 07:31:20 +0000 (Thu, 14 Jul 2011) New Revision: 24902 Modified: website/trunk/Makefile.common Log: updated Makefile.common to include pt-br when building the website Modified: website/trunk/Makefile.common =================================================================== --- website/trunk/Makefile.common 2011-07-14 07:27:46 UTC (rev 24901) +++ website/trunk/Makefile.common 2011-07-14 07:31:20 UTC (rev 24902) @@ -18,7 +18,7 @@ -D STABLETAG=$(STABLETAG) #LANGS=ar bms de en es et fa it fi fr ja ko nl no pl pt ru se tr zh-cn -LANGS=en ar es fr ru pl da it fa de fi vn cy zh-cn pt id nl +LANGS=en ar es fr ru pl da it fa de fi vn cy zh-cn pt pt-br id nl WMLFILES=$(wildcard $(patsubst %, %/*.wml, $(LANGS))) WMIFILES=$(wildcard $(patsubst %, %/*.wmi, $(LANGS)) $(WMLBASE)/include/*.wmi ) @@ -83,6 +83,9 @@ %.html.pt: pt/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ +%.html.pt-br: pt-br/%.wml en/%.wml + lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ + %.html.ru: ru/%.wml en/%.wml lang=`dirname $<` && wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $@ @@ -231,6 +234,13 @@ wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ rm -f $$tmpfile +.deps/%.html.pt-br.d: pt-br/%.wml .deps/.stamp + tmpfile=`mktemp -t tmp.XXXXXXX` \ + lang=`dirname $<` && \ + OUT=`echo $@ | sed -e 's,\.deps/$.*$\.d$$,\1,'` && \ + wml $(WMLOPT) -I $$lang -I $(WMLBASE)/$$lang -D LANG=$$lang $< -o $$OUT --depend | tee $$tmpfile > $@ && \ + sed -e s',$^[^ ]*$:,.deps/\1.d:,' < $$tmpfile >> $@ && \ + rm -f $$tmpfile .deps/%.html.ru.d: ru/%.wml .deps/.stamp tmpfile=`mktemp -t tmp.XXXXXXX` \ lang=`dirname $<` && \

1 0

r24901: {} Remove pt_BR because we now have pt-br (in website/trunk: about/pt_BR pt_BR)
by Runa Sandvik 14 Jul '11

14 Jul '11

Author: runa Date: 2011-07-14 07:27:46 +0000 (Thu, 14 Jul 2011) New Revision: 24901 Removed: website/trunk/about/pt_BR/board.wml website/trunk/about/pt_BR/contact.wml website/trunk/about/pt_BR/sidenav.wmi website/trunk/pt_BR/index.wml website/trunk/pt_BR/navigation.wmi Log: Remove pt_BR because we now have pt-br Deleted: website/trunk/about/pt_BR/board.wml =================================================================== --- website/trunk/about/pt_BR/board.wml 2011-07-14 07:26:18 UTC (rev 24900) +++ website/trunk/about/pt_BR/board.wml 2011-07-14 07:27:46 UTC (rev 24901) @@ -1,106 +0,0 @@ - - - - - -## translation metadata -# Revision: $Revision: 24786 $ -# Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Board of Directors" CHARSET="UTF-8" ANNOUNCE_RSS="yes" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> <a href="<page -about/overview>">Sobre » </a> <a href="<page -about/board>">Diretoria</a> - </div> - <div id="maincol"> - <h1>Diretoria</h1> - <table> - <tr> - <td class="beige"> - <div class="name">Roger Dingledine</div> - <div class="caps">Presidente e Diretor</div> - <p>Desenvolvedor original do Tor junto com Nick Mathewson e Paul Syverson. Um -dos principais pesquisadores na Ã¡rea de comunicações anônimas. Palestrante -frequente em conferências, defendendo e explicando o que é o Tor e o que o -Tor pode fazer. Ajuda a coordenar pesquisas e pesquisadores da academia</p> - </td> - <td> - <div class="name">Meredith Hoban-Dunn</div> - <div class="caps">Presidente do Comite de Auditoria</div> - <p>Meredith é contadora, conselheira e banqueira. Seu papel é nos ajudar com -nossas auditorias corporativas corretamente, fiscalizar fraudes internas, -nos alertar quando nós não fazemos as coisas da forma padrão, e assim por -diante.</p> - </td> - </tr> - <tr> - <td> - <div class="name">Ian Goldberg</div> - <div class="caps">Presidente do Conselho</div> - <p>Especialista em criptografia e privacidade e professor; um dos projetistas -do <a href="http://www.cypherpunks.ca/otr/">Off-the-Record Messaging</a>.</p> - </td> - <td class="beige"> - <div class="name">Andrew Lewman</div> - <div class="caps">Secretário, Tesoureiro e Diretor Executivo</div> - <p>Andrew é o Diretor Executivo, responsável por todas as operações da The Tor -Project, Inc. Suas atividades podem ser vistas em <a -href="http://lewman.is">seu website</a>.</p> - </td> - </tr> - <tr> - <td class="beige"> - <div class="name">Nick Mathewson</div> - <div class="caps">Vice Presidente and Diretor</div> - <p>Nick é um dos desenvolvedores originais do Tor. Ele -é o Arquiteto Chefe da The Tor Project, Inc.</p> - </td> - <td> - <div class="name">Xianghui (Isaac) Mao </div> - <div class="caps">Diretor</div> - <p>Blogueiro Chines e ativista da privacidade. Suas atividades recentes podem -ser vistas em <a href="http://isaacmao.com/">seu website</a>.</p> - </td> - </tr> - <tr> - <td> - <div class="name">Frank Rieger</div> - <div class="caps">Diretor</div> - <p>CTO da <a href="http://www.cryptophone.de/">GSMK Cryptophone</a>.</p> - </td> - <td class="beige"> - <div class="name">Wendy Seltzer</div> - <div class="caps">Diretor</div> - <p>Advogado, professor de Lei Digital e fundador do <a -href="http://chillingeffects.org/">ChillingEffects.org</a>.</p> - </td> - </tr> - <tr> - <td class="beige"> - <div class="name">Rob Thomas</div> - <div class="caps">Diretor</div> - <p>Rob Thomas é o CEO e fundador do Team Cymru, e um - Cymru Fellow. Você pode saber mais sobre Rob no website do <a - href="http://www.team-cymru.org/">Team Cymru</a>.</p> - </td> - </tr> - </table> - -  -</div> - -  -<div id = "sidecol"> - - - #include "side.wmi" -#include "info.wmi" -</div> - - -</div> - - - -#include "foot.wmi" Deleted: website/trunk/about/pt_BR/contact.wml =================================================================== --- website/trunk/about/pt_BR/contact.wml 2011-07-14 07:26:18 UTC (rev 24900) +++ website/trunk/about/pt_BR/contact.wml 2011-07-14 07:27:46 UTC (rev 24901) @@ -1,91 +0,0 @@ - - - - - - -## translation metadata -# Revision: $Revision: 24862 $ -# Translation-Priority: 3-low -#include "head.wmi" TITLE="Tor Project: Contact" CHARSET="UTF-8" -<div id="content" class="clearfix"> - <div id="breadcrumbs"> - <a href="<page index>">Home » </a> - <a href="<page about/overview>">Sobre » </a> - <a href="<page about/contact>">Contato</a> - </div> - <div id="maincol"> - <h2>Tor: Contato</h2> - - <h3>Email</h3> - <i>tor-assistants em torproject.org</i> -é o endereçoo geral para qualquer assunto. Pode ser usado - para entrar em contato com pessoas trabalhando no Tor. - - Alguns outros endereÃ§os sÃ£o mais específicos: - - <ul> - <li><i>tor-translation em lists.torproject.org</i> pode colocar novas <a -href="<page - getinvolved/translation>">traduções do website</a> no lugar, - e ajudar a responder questões sobre traduções novas ou existentes.</li> - <li>atalho para chegar às pessoas responsaveis pelo tordns exitlist.</li> - <li><i>donations at torproject.org</i> para fazer perguntas e comentários sobre -<a - href="<page donate/donate>">doações em dinheiro para os -desenvolvedores</a>. Mais - doações significam <a href="<page docs/faq>#Funding">mais - Tor</a>. Ficaremos felizes em ajuda-lo a pensar em formas criativas -para contribuir.</li> - <li><i>execdir at torproject.org</i> para imprensa/mídia, perguntas e -comentários sobre - Tor, a organização sem fins lucrativos: perguntas sobre marca -registrada, afiliação - e coordenação, grandes doações, questões contratuais, licenciamento e -certificação, etc.</li> - </ul> - - <h3>Identi.ca</h3> - <p><a id="identica"></a> - Entre em contato pela nossa conta no serviço de microblogging Identi.ca -em <a - href="https://identi.ca/torproject">torproject</a>.</p> - - <h3>IRC</h3> - <a id="irc"></a> - <p>Usuários e desenvolvedores Tor também podem ser encontrados nos seguintes -canais na rede <a - href="http://www.oftc.net/oftc/">OFTC</a>:</p> - - <ul> - <li><i>#tor</i> - Discussões a respeito de usuários e da operação de -relays. Problemas para usar o Tor ou tem uma pergunta direcionada a outros -usuários? Então esse é o lugar para você.</li> - <li><i>#tor-dev</i> - Canal para pessoas interessadas no desenvolvimento do Tor. - Discussões sobre o código do Tor, protocolos e <a href="<page - getinvolved/volunteer>">idéias</a> são todos bem vindos.</li> - <li><i>#nottor</i> - O lugar onde as pessoas envolvidas com o Tor se encontram -para conversar sobre outras coisas não relacionadas ao Tor.</li> - </ul> - - <h3>Telefone</h3> - <a id="phone"></a> - <p>Se nenhuma das formas de contato acima resolver, ligue para +1-781-352-0568, -o telefone do nosso escritório. Se não obtiver resposta, por favor deixe -uma mensagem.</p> - - </div> - -  -<div id = "sidecol"> - - - #include "side.wmi" -#include "info.wmi" -</div> - - -</div> - - -#include "foot.wmi" Deleted: website/trunk/about/pt_BR/sidenav.wmi =================================================================== --- website/trunk/about/pt_BR/sidenav.wmi 2011-07-14 07:26:18 UTC (rev 24900) +++ website/trunk/about/pt_BR/sidenav.wmi 2011-07-14 07:27:46 UTC (rev 24901) @@ -1,56 +0,0 @@ -## translation metadata -# Revision: $Revision: 24336 $ -# Translation-Priority: 2-medium - -# this structure defines the side nav bar for the /about 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' => 'about/overview', - 'txt' => 'Visão Geral do Tor', - }, - {'url' => 'about/torusers', - 'txt' => 'Usuários do Tor', - }, - - {'url' => 'about/corepeople', - 'txt' => 'Pessoas do Tor', - 'subelements' => [ - {'url' => 'about/board', - 'txt' => 'Diretoria', - }, - {'url' => 'about/translators', - 'txt' => 'Tradutores', - }, - {'url' => 'about/volunteers', - 'txt' => 'Voluntários', - }, - {'url' => 'about/contributors', - 'txt' => 'Antigos Contribuidores', - }] - }, - {'url' => 'about/sponsors', - 'txt' => 'Patrocinadores', - }, - {'url' => 'about/financials', - 'txt' => 'Relatórios Financeiros', - }, - {'url' => 'projects/projects', - 'txt' => 'Projetos', - }, - {'url' => 'docs/documentation', - 'txt' => 'Documentação', - }, - ]; -:> Deleted: website/trunk/pt_BR/index.wml =================================================================== --- website/trunk/pt_BR/index.wml 2011-07-14 07:26:18 UTC (rev 24900) +++ website/trunk/pt_BR/index.wml 2011-07-14 07:27:46 UTC (rev 24901) @@ -1,195 +0,0 @@ - - - - - - -## translation metadata -# Revision: $Revision: 24425 $ -# Translation-Priority: 1-high -#include "head.wmi" TITLE="Tor Project: Anonymity Online" CHARSET="UTF-8" ANNOUNCE_RSS="yes" -<div id="home"> - <div id="content" class="clearfix"> - <div id="maincol"> - <div id="banner"> - <ul> - <li>O Tor impede qualquer pessoa de descobrir sua localização ou seus hábitos na -internet.</li> - <li>O Tor funciona em navegadores web, clientes de bate papo, acesso remoto, e -mais.</li> - <li>O Tor é gratuito e de código aberto para Windows, Mac, Linux/Unix, e -Android.</li> - </ul> - <h1 class="headline">Anonimato Online</h1> - <p class="desc">Proteja sua privacidade. Defenda-se contra vigilancia na rede e análise de -tráfego.</p> - - <div id="download"> - <a href="<page download/download>"><span class="download-tor">Baixe o -Tor</span></a></div> - - </div> - </div> - <div class="subcol-container clearfix"> - <div class="subcol first"> - <h2>O que é o Tor?</h2> <p>O Tor é um software livre e uma rede aberta que te ajuda - a se defender contra uma forma de vigilancia na rede que - ameaça sua privacidade, sua liberdade, negócios confidenciais, - atividades e relacionamentos, e segurança estatal conhecida como -<a - href="<page about/overview>">análise de trafego</a><br><span - class="continue"><a href="<page about/overview>">Aprenda mais - sobre Tor »</a></span></p> - </div> - -  -<div class="subcol"> - <h2>Porque o Anonimato é Importante</h2> - <p>O Tor proteje você carregando suas comunicações através - de uma rede distribuida de relays mantidos por voluntários ao -redor - do mundo: ele impede que alguém monitorando sua conexão com a -Internet - descubra quais sistes você visita, e ele impede que os sites - que você visita saibam sua localização física. - O Tor funciona com muitos programas existentes, incluindo - navegadores web, clientes de bate papo, de acesso remoto e outros - programas que têm como base o protocolo TCP.<br><span - class="continue"><a href="<page getinvolved/volunteer>">Involva-se -com - o Tor »</a></span></p> </div> - </div> - -  -<div id="home-our-projects" class="clearfix"> - <h2>Nossos Projetos</h2> - <div class="fauxhead"></div> - <table style="table-layout: fixed;"> - <tr> - <td> - <img src="$(IMGROOT)/icon-TorButton.jpg" alt="Torbutton Icon"> - <h3>Torbutton</h3> - <p>Torbutton é um uma botão que possibilita usuários - do Firefox a habilitar ou desabilitar o Tor no Firefox - com apenas 1 clique.</p> - </td> - <td> - <img src="$(IMGROOT)/icon-TorCheck.jpg" alt="Tor Check Icon"> - <h3><a href="https://check.torproject.org/">Check</a></h3> - <p>Ferramenta que verifica se você esta navegando - pela rede Tor.</p> - </td> - </tr> - <tr> - <td> - <img src="$(IMGROOT)/icon-Vidalia.jpg" alt="Vidalia Icon"> - <h3>Vidalia</h3> - <p>Vidalia é uma interface gráfica para você ver e controlar - as configurações e connexões do Tor.</p> - </td> - <td> - <img src="$(IMGROOT)/icon-TorBrowser.jpg" alt="TorBrowser Icon"> - <h3>Tor Browser</h3> - <p>Tor Browser é um navegador que tem tudo que você precisa para - navegar com segurança pela web. </p> - </td> - </tr> - </table> - </div> - -  -</div> - - -  -<div id="sidecol"> - <div id="torusers"> - <h2>Que Usa o Tor?</h2> - <div class="user"> - <h3> - <a href="<page about/torusers>#normalusers"><img src="$(IMGROOT)/family.jpg" -alt="Normal People">Familia & Amigos</a> - </h3> - <p>Pessoas como você e a sua familia usam o Tor para se protegerem, protegerem -seus filhos e sua dignidade enquanto usam a Internet.</p> - </div> - <div class="user"> - <h3> - <a href="<page about/torusers>#executives"><img -src="$(IMGROOT)/consumers.jpg" alt="Businesses">Empresas</a> - </h3> - <p>Empresas usam o Tor para pesquisar, competir, manter suas estratégias de -negócio confidenciais e facilitar a prestação de contas internament.</p> - </div> - <div class="user"> - <h3> - <a href="<page about/torusers>#activists"><img -src="$(IMGROOT)/activists.jpg" alt="Activists & -Whistleblowers">Ativistas</a> - </h3> - <p>Ativistas usam o Tor para reportar anonimamente abusos em zonas de perigo. -Denunciantes usam o Tor para reportar e denunciar corrupção com segurança.</p> - </div> - <div class="user"> - <h3> - <a href="<page about/torusers>#journalist"><img src="$(IMGROOT)/media.jpg" -alt="Journalists and the Media">Mídia</a> - </h3> - <p>Jornalistas e a mídia usam o Tor para proteger suas pesquisas e suas fontes -online.</p> - </div> - <div class="user"> - <h3> - <a href="<page about/torusers>#military"><img src="$(IMGROOT)/military.jpg" -alt="Military and Law Enforcement">Militares & Governos</a> - </h3> - <p>Militares e governos usam o Tor para proteger suas comunicações, -investigações e reuniões online.</p> - </div> - </div> - <div id="home-announcements" class="clearfix"> - <h2>Anúncios</h2> - <div class="fauxhead"></div> - <table> - <tr> - <td> - <div class="calendar"><span class="month">Mar</span><br><span class="day">23</span></div> - <p>O Projeto Tor ganha o prêmio "Projeto de Benefício Social" da - Fundação - Software Livre e Projeto GNU. Nós estamos honrados - em ganhar este prêmio e por estarmos listados entre - os outros ganhadores. <a - -href="https://blog.torproject.org/blog/tor-project-receives-fsf-award">Leia -mais - </a> sobre o prêmio.</p> - <div class="calendar"><span class="month">Fev</span><br><span class="day">23</span></div> - <p>A última versão estável do Tor, 0.2.1.30, é <a - -href="https://lists.torproject.org/pipermail/tor-announce/2011-February/000000.ht…">lançada</a>. - Tor 0.2.1.30 conserta vários problemas menos críticos. A -maior mudança - é uma pequena modificação no handshake TLS que faz com que - relays e pontes que rodam essa versão sejam acessíveis -novamente - do Iran. Não esperamos que essa nova versão vá ganhar a -corrida - a longo prazo, mas assim ganhamos um pouco de tempo até - acharmos uma solução melhor. - </p> - </td> - </tr> - </table> - </div> - -  -</div> - -  -</div> - -  -</div> - - -#include "foot.wmi" Deleted: website/trunk/pt_BR/navigation.wmi =================================================================== --- website/trunk/pt_BR/navigation.wmi 2011-07-14 07:26:18 UTC (rev 24900) +++ website/trunk/pt_BR/navigation.wmi 2011-07-14 07:27:46 UTC (rev 24901) @@ -1,24 +0,0 @@ -#!/usr/bin/wml - -## translation metadata -# Revision: $Revision: 24807 $ -# Translation-Priority: 1-high - -<: - # path link text - my @navigation = ( - 'index' , 'Home', - 'about/overview' , 'Sobre o Tor', - 'docs/documentation' , 'Documentação', - 'projects/projects' , 'Projetos', - 'press/press' , 'Imprensa', - '<blog>' , 'Blog', - 'http://printfection.com/torprojectstore' , 'Loja', - ); - my @calltoaction = ( - 'download/download' , 'Baixe', - 'getinvolved/volunteer' , 'Seja Voluntário', - 'donate/donate' , 'Doe', - ); - -:>

1 0