- tor-commits - lists.torproject.org

r24588: {translation} updated translation priority (translation/trunk/projects/torbutton-alpha/po/.tx)
by Runa Sandvik 12 Apr '11

12 Apr '11

Author: runa Date: 2011-04-12 09:21:56 +0000 (Tue, 12 Apr 2011) New Revision: 24588 Modified: translation/trunk/projects/torbutton-alpha/po/.tx/config Log: updated translation priority Modified: translation/trunk/projects/torbutton-alpha/po/.tx/config =================================================================== --- translation/trunk/projects/torbutton-alpha/po/.tx/config 2011-04-12 09:20:07 UTC (rev 24587) +++ translation/trunk/projects/torbutton-alpha/po/.tx/config 2011-04-12 09:21:56 UTC (rev 24588) @@ -1,12 +1,12 @@ [main] host = https://www.transifex.net -[torproject.torbutton-alpha-torbutton-dtd-pot] +[torproject.3-torbutton-alpha-torbutton-dtd-pot] file_filter = <lang>/torbutton.dtd.po source_file = templates/torbutton.dtd.pot source_lang = en -[torproject.torbutton-alpha-torbutton-properties-pot] +[torproject.3-torbutton-alpha-torbutton-properties-pot] file_filter = <lang>/torbutton.properties.po source_file = templates/torbutton.properties.pot source_lang = en

1 0

r24587: {translation} updated translation priority (translation/trunk/projects/website/po/.tx)
by Runa Sandvik 12 Apr '11

12 Apr '11

Author: runa Date: 2011-04-12 09:20:07 +0000 (Tue, 12 Apr 2011) New Revision: 24587 Modified: translation/trunk/projects/website/po/.tx/config Log: updated translation priority Modified: translation/trunk/projects/website/po/.tx/config =================================================================== --- translation/trunk/projects/website/po/.tx/config 2011-04-11 15:41:31 UTC (rev 24586) +++ translation/trunk/projects/website/po/.tx/config 2011-04-12 09:20:07 UTC (rev 24587) @@ -3,27 +3,27 @@ source_file = templates/docs/1-high.bridges.pot source_lang = en -[torproject.website-docs-android-pot] +[torproject.4-website-docs-android-pot] file_filter = <lang>/docs/3-low.android.po source_file = templates/docs/3-low.android.pot source_lang = en -[torproject.website-about-contact-pot] +[torproject.5-website-about-contact-pot] file_filter = <lang>/about/3-low.contact.po source_file = templates/about/3-low.contact.pot source_lang = en -[torproject.website-getinvolved-translation-pot] +[torproject.5-website-getinvolved-translation-pot] file_filter = <lang>/getinvolved/4-optional.translation.po source_file = templates/getinvolved/4-optional.translation.pot source_lang = en -[torproject.website-donate-become-sponsor-pot] +[torproject.5-website-donate-become-sponsor-pot] file_filter = <lang>/donate/3-low.become-sponsor.po source_file = templates/donate/3-low.become-sponsor.pot source_lang = en -[torproject.website-about-translators-pot] +[torproject.5-website-about-translators-pot] file_filter = <lang>/about/3-low.translators.po source_file = templates/about/3-low.translators.pot source_lang = en @@ -33,17 +33,17 @@ source_file = templates/about/2-medium.overview.pot source_lang = en -[torproject.website-docs-debian-pot] +[torproject.4-website-docs-debian-pot] file_filter = <lang>/docs/3-low.debian.po source_file = templates/docs/3-low.debian.pot source_lang = en -[torproject.website-getinvolved-tshirt-pot] +[torproject.4-website-getinvolved-tshirt-pot] file_filter = <lang>/getinvolved/3-low.tshirt.po source_file = templates/getinvolved/3-low.tshirt.pot source_lang = en -[torproject.website-projects-torweather-pot] +[torproject.5-website-projects-torweather-pot] file_filter = <lang>/projects/3-low.torweather.po source_file = templates/projects/3-low.torweather.pot source_lang = en @@ -53,47 +53,47 @@ source_file = templates/docs/2-medium.manual.pot source_lang = en -[torproject.website-press-2008-12-19-roadmap-press-release-pot] +[torproject.5-website-press-2008-12-19-press-release-pot] file_filter = <lang>/press/4-optional.2008-12-19-roadmap-press-release.po source_file = templates/press/4-optional.2008-12-19-roadmap-press-release.pot source_lang = en -[torproject.website-getinvolved-mirrors-pot] +[torproject.4-website-getinvolved-mirrors-pot] file_filter = <lang>/getinvolved/3-low.mirrors.po source_file = templates/getinvolved/3-low.mirrors.pot source_lang = en -[torproject.website-press-press-pot] +[torproject.5-website-press-press-pot] file_filter = <lang>/press/3-low.press.po source_file = templates/press/3-low.press.pot source_lang = en -[torproject.website-donate-donate-pot] +[torproject.5-website-donate-donate-pot] file_filter = <lang>/donate/3-low.donate.po source_file = templates/donate/3-low.donate.pot source_lang = en -[torproject.website-about-sponsors-pot] +[torproject.5-website-about-sponsors-pot] file_filter = <lang>/about/3-low.sponsors.po source_file = templates/about/3-low.sponsors.pot source_lang = en -[torproject.website-docs-N900-pot] +[torproject.5-website-docs-N900-pot] file_filter = <lang>/docs/3-low.N900.po source_file = templates/docs/3-low.N900.pot source_lang = en -[torproject.website-projects-vidalia-pot] +[torproject.5-website-projects-vidalia-pot] file_filter = <lang>/projects/4-optional.vidalia.po source_file = templates/projects/4-optional.vidalia.pot source_lang = en -[torproject.website-docs-rpms-pot] +[torproject.4-website-docs-rpms-pot] file_filter = <lang>/docs/3-low.rpms.po source_file = templates/docs/3-low.rpms.pot source_lang = en -[torproject.website-donate-matching-program-pot] +[torproject.5-website-donate-matching-program-pot] file_filter = <lang>/donate/3-low.matching-program.po source_file = templates/donate/3-low.matching-program.pot source_lang = en @@ -103,22 +103,22 @@ source_file = templates/download/3-low.download.pot source_lang = en -[torproject.website-docs-debian-vidalia-pot] +[torproject.4-website-docs-debian-vidalia-pot] file_filter = <lang>/docs/3-low.debian-vidalia.po source_file = templates/docs/3-low.debian-vidalia.pot source_lang = en -[torproject.website-getinvolved-research-pot] +[torproject.5-website-getinvolved-research-pot] file_filter = <lang>/getinvolved/4-optional.research.po source_file = templates/getinvolved/4-optional.research.pot source_lang = en -[torproject.website-torbutton-index-pot] +[torproject.5-website-torbutton-index-pot] file_filter = <lang>/torbutton/3-low.index.po source_file = templates/torbutton/3-low.index.pot source_lang = en -[torproject.website-press-inthemedia-pot] +[torproject.5-website-press-inthemedia-pot] file_filter = <lang>/press/3-low.inthemedia.po source_file = templates/press/3-low.inthemedia.pot source_lang = en @@ -128,37 +128,37 @@ source_file = templates/projects/1-high.torbrowser.pot source_lang = en -[torproject.website-torbutton-torbutton-faq-pot] +[torproject.4-website-torbutton-torbutton-faq-pot] file_filter = <lang>/torbutton/3-low.torbutton-faq.po source_file = templates/torbutton/3-low.torbutton-faq.pot source_lang = en -[torproject.website-docs-installguide-pot] +[torproject.3-website-docs-installguide-pot] file_filter = <lang>/docs/2-medium.installguide.po source_file = templates/docs/2-medium.installguide.pot source_lang = en -[torproject.website-about-board-pot] +[torproject.5-website-about-board-pot] file_filter = <lang>/about/3-low.board.po source_file = templates/about/3-low.board.pot source_lang = en -[torproject.website-about-corepeople-pot] +[torproject.5-website-about-corepeople-pot] file_filter = <lang>/about/3-low.corepeople.po source_file = templates/about/3-low.corepeople.pot source_lang = en -[torproject.website-getinvolved-volunteer-pot] +[torproject.5-website-getinvolved-volunteer-pot] file_filter = <lang>/getinvolved/4-optional.volunteer.po source_file = templates/getinvolved/4-optional.volunteer.pot source_lang = en -[torproject.website-docs-verifying-signatures-pot] +[torproject.3-website-docs-verifying-signatures-pot] file_filter = <lang>/docs/2-medium.verifying-signatures.po source_file = templates/docs/2-medium.verifying-signatures.pot source_lang = en -[torproject.website-about-torusers-pot] +[torproject.4-website-about-torusers-pot] file_filter = <lang>/about/2-medium.torusers.po source_file = templates/about/2-medium.torusers.pot source_lang = en @@ -166,7 +166,7 @@ [main] host = https://www.transifex.net -[torproject.website-about-volunteers-pot] +[torproject.5-website-about-volunteers-pot] file_filter = <lang>/about/3-low.volunteers.po source_file = templates/about/3-low.volunteers.pot source_lang = en @@ -176,37 +176,37 @@ source_file = templates/1-high.index.pot source_lang = en -[torproject.website-docs-documentation-pot] +[torproject.3-website-docs-documentation-pot] file_filter = <lang>/docs/2-medium.documentation.po source_file = templates/docs/2-medium.documentation.pot source_lang = en -[torproject.website-getinvolved-translation-overview-pot] +[torproject.5-website-getinvolved-translation-overview-pot] file_filter = <lang>/getinvolved/4-optional.translation-overview.po source_file = templates/getinvolved/4-optional.translation-overview.pot source_lang = en -[torproject.website-docs-trademark-faq-pot] +[torproject.4-website-docs-trademark-faq-pot] file_filter = <lang>/docs/3-low.trademark-faq.po source_file = templates/docs/3-low.trademark-faq.pot source_lang = en -[torproject.website-download-download-unix-pot] +[torproject.4-website-download-download-unix-pot] file_filter = <lang>/download/3-low.download-unix.po source_file = templates/download/3-low.download-unix.pot source_lang = en -[torproject.website-docs-tor-doc-unix-pot] +[torproject.4-website-docs-tor-doc-unix-pot] file_filter = <lang>/docs/3-low.tor-doc-unix.po source_file = templates/docs/3-low.tor-doc-unix.pot source_lang = en -[torproject.website-projects-gettor-pot] +[torproject.5-website-projects-gettor-pot] file_filter = <lang>/projects/3-low.gettor.po source_file = templates/projects/3-low.gettor.pot source_lang = en -[torproject.website-docs-faq-pot] +[torproject.4-website-docs-faq-pot] file_filter = <lang>/docs/2-medium.faq.po source_file = templates/docs/2-medium.faq.pot source_lang = en @@ -216,22 +216,22 @@ source_file = templates/docs/1-high.tor-doc-windows.pot source_lang = en -[torproject.website-download-thankyou-pot] +[torproject.5-website-download-thankyou-pot] file_filter = <lang>/download/3-low.thankyou.po source_file = templates/download/3-low.thankyou.pot source_lang = en -[torproject.website-docs-tor-doc-osx-pot] +[torproject.3-website-docs-tor-doc-osx-pot] file_filter = <lang>/docs/2-medium.tor-doc-osx.po source_file = templates/docs/2-medium.tor-doc-osx.pot source_lang = en -[torproject.website-docs-hidden-services-pot] +[torproject.5-website-docs-hidden-services-pot] file_filter = <lang>/docs/3-low.hidden-services.po source_file = templates/docs/3-low.hidden-services.pot source_lang = en -[torproject.website-donate-donate-hardware-pot] +[torproject.5-website-donate-donate-hardware-pot] file_filter = <lang>/donate/3-low.donate-hardware.po source_file = templates/donate/3-low.donate-hardware.pot source_lang = en @@ -241,7 +241,7 @@ source_file = templates/docs/1-high.proxychain.pot source_lang = en -[torproject.website-projects-puppettor-pot] +[torproject.5-website-projects-puppettor-pot] file_filter = <lang>/projects/3-low.puppettor.po source_file = templates/projects/3-low.puppettor.pot source_lang = en @@ -251,87 +251,87 @@ source_file = templates/download/1-high.download-easy.pot source_lang = en -[torproject.website-docs-tor-doc-web-pot] +[torproject.5-website-docs-tor-doc-web-pot] file_filter = <lang>/docs/3-low.tor-doc-web.po source_file = templates/docs/3-low.tor-doc-web.pot source_lang = en -[torproject.website-press-2010-03-25-press-release-pot] +[torproject.5-website-press-2010-03-25-press-release-pot] file_filter = <lang>/press/4-optional.2010-03-25-tor-store-press-release.po source_file = templates/press/4-optional.2010-03-25-tor-store-press-release.pot source_lang = en -[torproject.website-getinvolved-open-positions-pot] +[torproject.5-website-getinvolved-open-positions-pot] file_filter = <lang>/getinvolved/4-optional.open-positions.po source_file = templates/getinvolved/4-optional.open-positions.pot source_lang = en -[torproject.website-projects-tordnsel-pot] +[torproject.5-website-projects-tordnsel-pot] file_filter = <lang>/projects/3-low.tordnsel.po source_file = templates/projects/3-low.tordnsel.pot source_lang = en -[torproject.website-docs-tor-hidden-service-pot] +[torproject.4-website-docs-tor-hidden-service-pot] file_filter = <lang>/docs/3-low.tor-hidden-service.po source_file = templates/docs/3-low.tor-hidden-service.pot source_lang = en -[torproject.website-about-contributors-pot] +[torproject.5-website-about-contributors-pot] file_filter = <lang>/about/3-low.contributors.po source_file = templates/about/3-low.contributors.pot source_lang = en -[torproject.website-docs-tor-doc-relay-pot] +[torproject.4-website-docs-tor-doc-relay-pot] file_filter = <lang>/docs/2-medium.tor-doc-relay.po source_file = templates/docs/2-medium.tor-doc-relay.pot source_lang = en -[torproject.website-docs-faq-abuse-pot] +[torproject.4-website-docs-faq-abuse-pot] file_filter = <lang>/docs/3-low.faq-abuse.po source_file = templates/docs/3-low.faq-abuse.pot source_lang = en -[torproject.website-donate-donate-service-pot] +[torproject.5-website-donate-donate-service-pot] file_filter = <lang>/donate/3-low.donate-service.po source_file = templates/donate/3-low.donate-service.pot source_lang = en -[torproject.website-torbutton-torbutton-options-pot] +[torproject.5-website-torbutton-torbutton-options-pot] file_filter = <lang>/torbutton/3-low.torbutton-options.po source_file = templates/torbutton/3-low.torbutton-options.pot source_lang = en -[torproject.website-projects-torbrowser-split-pot] +[torproject.3-website-projects-torbrowser-split-pot] file_filter = <lang>/projects/1-high.torbrowser-split.po source_file = templates/projects/1-high.torbrowser-split.pot source_lang = en -[torproject.website-projects-torbrowser-details-pot] +[torproject.5-website-projects-torbrowser-details-pot] file_filter = <lang>/projects/4-optional.torbrowser-details.po source_file = templates/projects/4-optional.torbrowser-details.pot source_lang = en -[torproject.website-projects-arm-pot] +[torproject.5-website-projects-arm-pot] file_filter = <lang>/projects/4-optional.arm.po source_file = templates/projects/4-optional.arm.pot source_lang = en -[torproject.website-projects-projects-pot] +[torproject.5-website-projects-projects-pot] file_filter = <lang>/projects/3-low.projects.po source_file = templates/projects/3-low.projects.pot source_lang = en -[torproject.website-docs-running-a-mirror-pot] +[torproject.5-website-docs-running-a-mirror-pot] file_filter = <lang>/docs/4-optional.running-a-mirror.po source_file = templates/docs/4-optional.running-a-mirror.pot source_lang = en -[torproject.website-about-gsoc-pot] +[torproject.5-website-about-gsoc-pot] file_filter = <lang>/about/4-optional.gsoc.po source_file = templates/about/4-optional.gsoc.pot source_lang = en -[torproject.website-about-financials-pot] +[torproject.5-website-about-financials-pot] file_filter = <lang>/about/3-low.financials.po source_file = templates/about/3-low.financials.pot source_lang = en

1 0

[tor/master] forward-port the 0.2.2.24-alpha changelog
by arma＠torproject.org 12 Apr '11

12 Apr '11

commit c4bf7f59d83487e72f564bb50327fdeeda796f3d Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 11 23:26:27 2011 -0400 forward-port the 0.2.2.24-alpha changelog --- ChangeLog | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 87 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index bfa634c..70afe71 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,90 @@ +Changes in version 0.2.2.24-alpha - 2011-04-08 + Tor 0.2.2.24-alpha fixes a variety of bugs, including a big bug that + prevented Tor clients from effectively using "multihomed" bridges, + that is, bridges that listen on multiple ports or IP addresses so users + can continue to use some of their addresses even if others get blocked. + + o Major bugfixes: + - Fix a bug where bridge users who configure the non-canonical + address of a bridge automatically switch to its canonical + address. If a bridge listens at more than one address, it should be + able to advertise those addresses independently and any non-blocked + addresses should continue to work. Bugfix on Tor 0.2.0.x. Fixes + bug 2510. + - If you configured Tor to use bridge A, and then quit and + configured Tor to use bridge B instead, it would happily continue + to use bridge A if it's still reachable. While this behavior is + a feature if your goal is connectivity, in some scenarios it's a + dangerous bug. Bugfix on Tor 0.2.0.1-alpha; fixes bug 2511. + - Directory authorities now use data collected from their own + uptime observations when choosing whether to assign the HSDir flag + to relays, instead of trusting the uptime value the relay reports in + its descriptor. This change helps prevent an attack where a small + set of nodes with frequently-changing identity keys can blackhole + a hidden service. (Only authorities need upgrade; others will be + fine once they do.) Bugfix on 0.2.0.10-alpha; fixes bug 2709. + + o Minor bugfixes: + - When we restart our relay, we might get a successful connection + from the outside before we've started our reachability tests, + triggering a warning: "ORPort found reachable, but I have no + routerinfo yet. Failing to inform controller of success." This + bug was harmless unless Tor is running under a controller + like Vidalia, in which case the controller would never get a + REACHABILITY_SUCCEEDED status event. Bugfix on 0.1.2.6-alpha; + fixes bug 1172. + - Make directory authorities more accurate at recording when + relays that have failed several reachability tests became + unreachable, so we can provide more accuracy at assigning Stable, + Guard, HSDir, etc flags. Bugfix on 0.2.0.6-alpha. Resolves bug 2716. + - Fix an issue that prevented static linking of libevent on + some platforms (notably Linux). Fixes bug 2698; bugfix on + versions 0.2.1.23/0.2.2.8-alpha (the versions introducing + the --with-static-libevent configure option). + - We now ask the other side of a stream (the client or the exit) + for more data on that stream when the amount of queued data on + that stream dips low enough. Previously, we wouldn't ask the + other side for more data until either it sent us more data (which + it wasn't supposed to do if it had exhausted its window!) or we + had completely flushed all our queued data. This flow control fix + should improve throughput. Fixes bug 2756; bugfix on the earliest + released versions of Tor (svn commit r152). + - Avoid a double-mark-for-free warning when failing to attach a + transparent proxy connection. (We thought we had fixed this in + 0.2.2.23-alpha, but it turns out our fix was checking the wrong + connection.) Fixes bug 2757; bugfix on 0.1.2.1-alpha (the original + bug) and 0.2.2.23-alpha (the incorrect fix). + - When warning about missing zlib development packages during compile, + give the correct package names. Bugfix on 0.2.0.1-alpha. + + o Minor features: + - Directory authorities now log the source of a rejected POSTed v3 + networkstatus vote. + - Make compilation with clang possible when using + --enable-gcc-warnings by removing two warning optionss that clang + hasn't implemented yet and by fixing a few warnings. Implements + ticket 2696. + - When expiring circuits, use microsecond timers rather than + one-second timers. This can avoid an unpleasant situation where a + circuit is launched near the end of one second and expired right + near the beginning of the next, and prevent fluctuations in circuit + timeout values. + - Use computed circuit-build timeouts to decide when to launch + parallel introduction circuits for hidden services. (Previously, + we would retry after 15 seconds.) + - Update to the April 1 2011 Maxmind GeoLite Country database. + + o Packaging fixes: + - Create the /var/run/tor directory on startup on OpenSUSE if it is + not already created. Patch from Andreas Stieger. Fixes bug 2573. + + o Documentation changes: + - Modernize the doxygen configuration file slightly. Fixes bug 2707. + - Resolve all doxygen warnings except those for missing documentation. + Fixes bug 2705. + - Add doxygen documentation for more functions, fields, and types. + + Changes in version 0.2.2.23-alpha - 2011-03-08 Tor 0.2.2.23-alpha lets relays record their bandwidth history so when they restart they don't lose their bandwidth capacity estimate. This

1 0

[torspec/master] make explicit how to distinguish old bridge lines
by arma＠torproject.org 11 Apr '11

11 Apr '11

commit e65b0219700ab09819aebeab6034df9cbb3b3591 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 11 19:27:43 2011 -0400 make explicit how to distinguish old bridge lines --- proposals/180-pluggable-transport.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index daa81bf..5e9e5b1 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -159,6 +159,15 @@ Specifications: Client behavior The "id-fingerprint" field is always provided in a field named "keyid", if it was given. Method names must be C identifiers. + For reference, the old bridge format was + bridge address[:port] [id-fingerprint] + where port defaults to 443 and the id-fingerprint is optional. The + new format can be distinguished from the old one by checking if the + first argument has any non-C-identifier characters. (Looking for a + period should be a simple way.) Also, while the id-fingerprint could + 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

1 0

[torspec/master] finish mucking with proposal 180
by arma＠torproject.org 11 Apr '11

11 Apr '11

commit 648ca5d78889a440fac1594f89fc3cab15dbb6a3 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 11 16:08:24 2011 -0400 finish mucking with proposal 180 --- proposals/180-pluggable-transport.txt | 48 ++++++++++++++++++--------------- 1 files changed, 26 insertions(+), 22 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index b1836e0..daa81bf 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -142,7 +142,7 @@ Specifications: Client behavior to use to connect to a bridge. The new format is: - "bridge method address:port [[keyid=]id-fingerprint] [k=v] [k=v] [k=v]" + 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 @@ -352,30 +352,34 @@ Managed proxy interface - FORWARD:1 - If this option is set, and address:port is not a publicly - accessible address, then the bridge needs to forward some - other address:port to address:port via upnp-helper. + If this option is set (for example, because address:port is not + a publicly accessible address), then Tor needs to forward some + other address:port to address:port via upnp-helper. Tor would + then advertise that other address:port in the bridge line instead. - - ARGS:k=v,k=v,k=v + - ARGS:K=V,K=V,K=V - If this option is set, the K=V arguments are added to the + If this option is set, the K=V arguments are added to Tor's extrainfo document. - DECLARE:K=V,... - If this option is set, all the K=V options should be - added as extension entries to the router descriptor, so other - relays can make use of it. (See below) + If this option is set, the K=V options should be added as + extension entries to the router descriptor, so clients and other + relays can make use of it. See ideas/xxx-triangleboy-transport.txt + for an example situation where the plugin would want to declare + parameters to other Tors. - USE-EXTENDED-PORT:1 - If this option is set, the server plugin is using the - extended server port. + If this option is set, the server plugin is planning to connect + to Tor's extended server port. SMETHOD and CMETHOD lines may be interspersed, to allow the proxies to - report success even when some methods may require probing your network, - connecting to some kind of peers, etc. After the last SMETHOD line, - the proxy says "SMETHODS DONE". + report methods as they become available, even when some methods may + require probing your network, connecting to some kind of peers, etc + before they are set up. After the final SMETHOD line, the proxy says + "SMETHODS DONE". The proxy SHOULD NOT tell Tor about a server or client method unless it is actually open and ready to use. @@ -395,9 +399,9 @@ The extended ORPort protocol Server transports may need to connect to the bridge and pass additional information about client connections that the bridge - would ordinarily receive from the kernel's TCP stack. To to this, + would ordinarily receive from the kernel's TCP stack. To do this, they connect to the "extended server port" as given in - SERVER_PORT, sent a short amount of information, wait for a + EXTENDED_SERVER_PORT, send a short amount of information, wait for a response, and then send the user traffic on that port. The extended server port protocol is as follows: @@ -429,16 +433,16 @@ Advertising bridge methods Bridges put the 'method' lines in their extra-info documents. - method SP methodname SP address:port SP arglist NL + method SP methodname SP address:port [SP arglist] NL - The address:port parse are as returned from an SMETHOD line. The - arglist is a K=V,... list as returned in the ARGS part of the - SMETHOD line. + The address:port are as returned from an SMETHOD line (unless they are + replaced by the FORWARD: directive). The arglist is a K=V,... list as + returned in the ARGS: part of the SMETHOD line's Options component. If the SMETHOD line includes a DECLARE: part, the router descriptor gets a new line: - method-info SP methodname SP arglist NL + method-info SP methodname [SP arglist] NL Bridge authority behavior @@ -452,7 +456,7 @@ Bridgedb behavior Bridgedb can, given a set of router descriptors and their corresponding extrainfo documents, generate a set of bridge lines - for each descriptor. Bridgedb may want to avoid handing out + for each bridge. Bridgedb may want to avoid handing out methods that seem to get bridges blocked quickly. Implementation plan

1 0

[torspec/master] interim commit while i clean up proposal 180
by arma＠torproject.org 11 Apr '11

11 Apr '11

commit 6982edff1b24e5d185245216dae12e1acfec3143 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 11 15:10:21 2011 -0400 interim commit while i clean up proposal 180 --- proposals/180-pluggable-transport.txt | 121 ++++++++++++++++----------------- 1 files changed, 58 insertions(+), 63 deletions(-) diff --git a/proposals/180-pluggable-transport.txt b/proposals/180-pluggable-transport.txt index dc0564d..b1836e0 100644 --- a/proposals/180-pluggable-transport.txt +++ b/proposals/180-pluggable-transport.txt @@ -102,8 +102,8 @@ Non-Goals current proposal, though we are not currently sure whether it's a good idea to implement. - We deliberately reject any design that would involve linking more code - into Tor's process space. + We deliberately reject any design that would involve linking the + transport plugins into Tor's process space. Design overview @@ -188,20 +188,19 @@ Specifications: Client behavior options, even if the same executable and options are listed for more than one method. - If instead of a transport name, the torrc lists "*" for a managed proxy, - tor uses that proxy for all transports that it supports. So - "ClientTransportPlugin * exec /usr/libexec/tor/foobar" tells Tor - that it should use the foobar plugin for everything that it supports. + If instead of a transport method, the torrc lists "*" for a managed + proxy, Tor uses that proxy for all transport methods that the plugin + supports. So "ClientTransportPlugin * exec /usr/libexec/tor/foobar" + tells Tor that Tor should use the foobar plugin for every method that + the proxy supports. See the "Managed proxy interface" section below + for details on how Tor learns which methods a plugin supports. - If two proxies support the same method, Tor should use whichever + If two plugins support the same method, Tor should use whichever one is listed first. The same program can implement a managed or an external proxy: it just needs to take an argument saying which one to be. - See "Managed proxy behavior" for more information on the managed - proxy interface. - Server behavior Server proxies are configured similarly to client proxies. When @@ -216,7 +215,7 @@ Server behavior this in-band. As before, the server lists proxies in its torrc. These can be - external proxies that run on their own, or managedproxies that Tor + external proxies that run on their own, or managed proxies that Tor launches. An external server proxy is configured as @@ -227,9 +226,9 @@ Server behavior configuration information that we'll tell users. A managed proxy is configured as - ServerTransportPlugin method exec /path/to/binary [options] + ServerTransportPlugin method exec /path/to/binary [options] or - ServerTransportPlugin * exec /path/to/binary [options] + ServerTransportPlugin * exec /path/to/binary [options] When possible, Tor should launch only one binary of each binary/option pair configured. So if the torrc contains @@ -243,12 +242,12 @@ Server behavior Managed proxy interface - When the Tor client launches a client proxy from the command - line, it communicates via environment variables. At a minimum, - it sets: + When the Tor client or relay launches a managed proxy, it communicates + via environment variables. At a minimum, it sets: {Client and server} - HOME, PATH -- as you'd expect. + + "HOME", "PATH" -- as you'd expect. "STATE_LOCATION" -- a directory where the proxy should store state if it wants to. This directory is not required to @@ -272,19 +271,23 @@ Managed proxy interface {Server only} - "EXT_SERVER_PORT=addr:portnum" -- A port (probably on localhost) that - speaks the extended server protocol. + "EXTENDED_SERVER_PORT=addr:portnum" -- A port (probably on localhost) + that speaks the extended server protocol. (See the "The extended + ORPort protocol" section below.) "ORPORT=addr:portnum" -- Our regular ORPort in a form suitable - for local connections. + for local connections, i.e. connections from the proxy to + the ORPort. - "BINDADDR=addr" -- An address on which to listen for local + "BINDADDR=addr" -- An address on which to listen for client proxy connections. This might be the advertised address, or might be a local address that Tor will forward ports to. It MUST be an address that will work with bind(). "SERVER_TRANSPORTS=..." -- A comma-separated list of server - methods that the proxy should support, or * + methods that the proxy should support, or * if all methods + should be enabled. The proxy SHOULD ignore methods that it + doesn't recognize. The transport proxy replies by writing NL-terminated lines to stdout. The metaformat is @@ -300,14 +303,14 @@ Managed proxy interface First, the proxy writes "VERSION 1" to say that it supports this protocol. It must either pick a version that Tor told it about, or - pick no version at all, and say "ERROR no-version\n" and exit. + pick no version at all, say "ERROR no-version\n", and exit. The proxy should then open its ports. If running as a client proxy, it should not use fixed ports; instead it should autoselect ports to avoid conflicts. A client proxy should by default only listen on localhost for connections. - A server proxy SHOULD try listen at a consistent port, though it + A server proxy SHOULD try to listen at a consistent port, though it SHOULD pick a different one if the port it last used is now allocated. A client or server proxy then should tell which methods it has @@ -334,20 +337,18 @@ Managed proxy interface should say: CMETHOD-ERROR methodname "Message" - A proxy should tell Tor about the server methods it is providing + A proxy should also tell Tor about the server methods it is providing by printing zero or more SMETHOD lines. These lines look like: - SMETHOD methodname address:port [Options] + SMETHOD methodname address:port [Options] If there's an error setting up a configured server method, the proxy should say: SMETHOD-ERROR methodname "message" The 'address:port' part of an SMETHOD line is the address to put - in the bridge line. The ARGS: part is a list of key-value pairs - that the client needs to know. The Options part is a list of - space-separated K:V flags that Tor should know about. Recognized - options are: + in the bridge line. The Options part is a list of space-separated + K:V flags that Tor should know about. Recognized options are: - FORWARD:1 @@ -363,16 +364,18 @@ Managed proxy interface - DECLARE:K=V,... If this option is set, all the K=V options should be - added as extension entries to the router descriptor. (See - below) + added as extension entries to the router descriptor, so other + relays can make use of it. (See below) - - USE-EXTPORT:1 + - USE-EXTENDED-PORT:1 If this option is set, the server plugin is using the extended server port. - SMETHOD and CMETHOD lines may be interspersed. After the list - SMETHOD line, the proxy says "SMETHODS DONE" + SMETHOD and CMETHOD lines may be interspersed, to allow the proxies to + report success even when some methods may require probing your network, + connecting to some kind of peers, etc. After the last SMETHOD line, + the proxy says "SMETHODS DONE". The proxy SHOULD NOT tell Tor about a server or client method unless it is actually open and ready to use. @@ -388,7 +391,7 @@ Managed proxy interface closed. Proxies should respond to a second INT signal by shutting down cleanly. -The extended ORPort protocol. +The extended ORPort protocol Server transports may need to connect to the bridge and pass additional information about client connections that the bridge @@ -422,17 +425,17 @@ The extended ORPort protocol. about client addresses, but that's a historically error-prone way to go about annotating connections.] -Advertising bridge methods: +Advertising bridge methods Bridges put the 'method' lines in their extra-info documents. method SP methodname SP address:port SP arglist NL The address:port parse are as returned from an SMETHOD line. The - arglist is a K=V,... list as retuned in the ARGS part of the + arglist is a K=V,... list as returned in the ARGS part of the SMETHOD line. - If the SMETHOD line includes a DECLARE: part, the routerinfo gets + If the SMETHOD line includes a DECLARE: part, the router descriptor gets a new line: method-info SP methodname SP arglist NL @@ -445,7 +448,7 @@ Bridge authority behavior transport method before we allow its use: the point of this design is to remove bottlenecks in transport deployment. -Bridgedb behavior: +Bridgedb behavior Bridgedb can, given a set of router descriptors and their corresponding extrainfo documents, generate a set of bridge lines @@ -455,9 +458,10 @@ Bridgedb behavior: Implementation plan First, we should implement per-bridge proxies via the "external - proxy" method described in "Specifications: Client behavior". the + proxy" method described in "Specifications: Client behavior". Also, + we'll want to build the extended-server-port mechanism. This will let bridges run - transport proxies such that they can give bridge lines to + transport proxies such that they can generate bridge lines to give to clients for testing, so long as the user configures and launches their proxies on their own. @@ -465,15 +469,15 @@ Implementation plan the whole idea there is silly. If we do, the next most important part seems to be getting - the client-side automatic part written. And once that's done, we + the client-side automation part written. And once that's done, we can evaluate how much of the server side is easy for people to do and how much is hard. The "obfsproxy" obfuscating proxy is a likely candidate for an - initial transport, as is Steven Murdoch's http thing or something - similar. + initial transport (trac entry #2760), as is Steven Murdoch's http + thing (trac entry #2759) or something similar. -Notes on plugins to write: +Notes on plugins to write We should ship a couple of null plugin implementations in one or two popular, portable languages so that people get an idea of how to @@ -482,23 +486,15 @@ Notes on plugins to write: 1. We should have one that's just a proof of concept that does nothing but transfer bytes back and forth. - 1. We should not do a rot13 one. - - 2. We should implement a basic proxy that does not transform the bytes at all - - 1. We should implement DNS or HTTP using other software (as goodesll + 2. We should implement DNS or HTTP using other software (as Geoff Goodell did years ago with DNS) as an example of wrapping existing code into our plugin model. - 2. The obfuscated-ssh superencipherment is pretty trivial and pretty - useful. It makes the protocol stringwise unfingerprintable. + 3. The obfuscated-ssh superencipherment is pretty trivial and pretty + useful. It makes the protocol stringwise unfingerprintable. - 1. Nick needs to be told firmly not to bikeshed the obfuscated-ssh - superencipherment too badly - - 1. Go ahead, bikeshed my day - - 1. If we do a raw-traffic proxy, openssh tunnels would be the logical choice. + 4. If we do a raw-traffic proxy, openssh tunnels would be the logical + choice. Appendix: recommendations for transports @@ -506,8 +502,9 @@ Appendix: recommendations for transports someday do so well at circumvention that it should be implemented inside Tor, it should use the same license as Tor. - Use libraries that Tor already requires. (You can rely on openssl and - libevent being present if current Tor is present.) + Tor already uses OpenSSL, Libevent, and zlib. Before you go and decide + to use crypto++ in your transport plugin, ask yourself whether OpenSSL + wouldn't be a nicer choice. Be portable: most Tor users are on Windows, and most Tor developers are not, so designing your code for just one of these platforms will @@ -529,5 +526,3 @@ Appendix: recommendations for transports protocols -- and in many cases, most possible variants of a given protocol won't actually exist in the wild. - -

1 0

r24586: {translation} update translation priority (translation/trunk/projects/orbot/po/.tx)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 15:41:31 +0000 (Mon, 11 Apr 2011) New Revision: 24586 Modified: translation/trunk/projects/orbot/po/.tx/config Log: update translation priority Modified: translation/trunk/projects/orbot/po/.tx/config =================================================================== --- translation/trunk/projects/orbot/po/.tx/config 2011-04-11 15:31:29 UTC (rev 24585) +++ translation/trunk/projects/orbot/po/.tx/config 2011-04-11 15:41:31 UTC (rev 24586) @@ -1,4 +1,4 @@ -[torproject.orbot-strings-pot] +[torproject.3-orbot-strings-pot] file_filter = <lang>/strings.po source_file = templates/strings.pot source_lang = en

1 0

r24585: {translation} updating translation priority (translation/trunk/projects/torbutton/po/.tx)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 15:31:29 +0000 (Mon, 11 Apr 2011) New Revision: 24585 Modified: translation/trunk/projects/torbutton/po/.tx/config Log: updating translation priority Modified: translation/trunk/projects/torbutton/po/.tx/config =================================================================== --- translation/trunk/projects/torbutton/po/.tx/config 2011-04-11 15:25:55 UTC (rev 24584) +++ translation/trunk/projects/torbutton/po/.tx/config 2011-04-11 15:31:29 UTC (rev 24585) @@ -1,12 +1,12 @@ [main] host = https://www.transifex.net -[torproject.torbutton-torbutton-dtd-pot] +[torproject.1-torbutton-torbutton-dtd-pot] file_filter = <lang>/torbutton.dtd.po source_file = templates/torbutton.dtd.pot source_lang = en -[torproject.torbutton-torbutton-properties-pot] +[torproject.1-torbutton-torbutton-properties-pot] file_filter = <lang>/torbutton.properties.po source_file = templates/torbutton.properties.pot source_lang = en

1 0

r24584: {translation} updating the resource names, see #2713 for more info (translation/trunk/projects/website/po/.tx)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 15:25:55 +0000 (Mon, 11 Apr 2011) New Revision: 24584 Modified: translation/trunk/projects/website/po/.tx/config Log: updating the resource names, see #2713 for more info Modified: translation/trunk/projects/website/po/.tx/config =================================================================== --- translation/trunk/projects/website/po/.tx/config 2011-04-11 14:50:21 UTC (rev 24583) +++ translation/trunk/projects/website/po/.tx/config 2011-04-11 15:25:55 UTC (rev 24584) @@ -1,4 +1,4 @@ -[torproject.website-docs-bridges-pot] +[torproject.2-website-docs-bridges-pot] file_filter = <lang>/docs/1-high.bridges.po source_file = templates/docs/1-high.bridges.pot source_lang = en @@ -28,7 +28,7 @@ source_file = templates/about/3-low.translators.pot source_lang = en -[torproject.website-about-overview-pot] +[torproject.2-website-about-overview-pot] file_filter = <lang>/about/2-medium.overview.po source_file = templates/about/2-medium.overview.pot source_lang = en @@ -98,7 +98,7 @@ source_file = templates/donate/3-low.matching-program.pot source_lang = en -[torproject.website-download-download-pot] +[torproject.1-website-download-download-pot] file_filter = <lang>/download/3-low.download.po source_file = templates/download/3-low.download.pot source_lang = en @@ -123,7 +123,7 @@ source_file = templates/press/3-low.inthemedia.pot source_lang = en -[torproject.website-projects-torbrowser-pot] +[torproject.3-website-projects-torbrowser-pot] file_filter = <lang>/projects/1-high.torbrowser.po source_file = templates/projects/1-high.torbrowser.pot source_lang = en @@ -171,7 +171,7 @@ source_file = templates/about/3-low.volunteers.pot source_lang = en -[torproject.website-index-pot] +[torproject.1-website-index-pot] file_filter = <lang>/1-high.index.po source_file = templates/1-high.index.pot source_lang = en @@ -211,7 +211,7 @@ source_file = templates/docs/2-medium.faq.pot source_lang = en -[torproject.website-docs-tor-doc-windows-pot] +[torproject.1-website-docs-tor-doc-windows-pot] file_filter = <lang>/docs/1-high.tor-doc-windows.po source_file = templates/docs/1-high.tor-doc-windows.pot source_lang = en @@ -236,7 +236,7 @@ source_file = templates/donate/3-low.donate-hardware.pot source_lang = en -[torproject.website-docs-highproxychain-pot] +[torproject.2-website-docs-highproxychain-pot] file_filter = <lang>/docs/1-high.proxychain.po source_file = templates/docs/1-high.proxychain.pot source_lang = en

1 0

r24583: {website} make sure we include the German .wmi files for German transl (website/trunk)
by Runa Sandvik 11 Apr '11

11 Apr '11

Author: runa Date: 2011-04-11 14:50:21 +0000 (Mon, 11 Apr 2011) New Revision: 24583 Modified: website/trunk/po2wml.sh Log: make sure we include the German .wmi files for German translations Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-04-11 14:03:18 UTC (rev 24582) +++ website/trunk/po2wml.sh 2011-04-11 14:50:21 UTC (rev 24583) @@ -119,7 +119,7 @@ # Include the English footer for most of the # translations - if [[ $subdir != "ar" && $subdir != "pl" ]] + if [[ $subdir != "ar" && $subdir != "pl" && $subdir != "de" ]] then echo '#include "foot.wmi"' >> "$wmldir/$subdir/$wmlfile" fi @@ -153,6 +153,35 @@ echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" fi + # If the translation is German, include the + # correct header, menu files and footer + if [ $subdir = "de" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@de/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "de/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "de/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$wmlfile" + fi + + # Footer + echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$wmlfile" + fi + # If the translation is Arabic, include the # correct header, css, menu files and footer if [ $subdir = "ar" ] @@ -217,7 +246,7 @@ # Include the English footer for most of the # translations - if [[ $lang != "ar" && $lang != "pl" ]] + if [[ $lang != "ar" && $lang != "pl" && $subdir != "de" ]] then echo '#include "foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi @@ -250,6 +279,34 @@ echo '#include "pl/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi + # If the translation is German, include the + # correct header, menu files and footer + if [ $lang = "de" ] + then + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + new_head=`echo $orig_head | sed s@head.wmi@de/head.wmi@` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "de/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "de/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Footer + echo '#include "de/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + fi + # If the file is an Arabic translation, include the # correct header, css, menu files and footer if [ $lang = "ar" ]

1 0