[tor-commits] r24287: {translation} documenting the workflow for all of our translation projects (translation/trunk/documentation)
Author: runa Date: 2011-03-02 15:46:57 + (Wed, 02 Mar 2011) New Revision: 24287 Modified: translation/trunk/documentation/howto.txt Log: documenting the workflow for all of our translation projects, work in progress Modified: translation/trunk/documentation/howto.txt === --- translation/trunk/documentation/howto.txt 2011-03-02 15:26:23 UTC (rev 24286) +++ translation/trunk/documentation/howto.txt 2011-03-02 15:46:57 UTC (rev 24287) @@ -1,32 +1,338 @@ -## Instructions for helping translate text for Vidalia, TorButton -## and TorCheck -## ( More translation information for Tor related apps will accumulate here ) +# This file documents the translation process for all projects +# currently available in the Tor translation portal: +# +# *. BridgeDB +# *. GetTor +# *. Vidalia Help Files +# *. Vidalia Installer +# *. Vidalia +# *. Orbot +# *. Torbutton-alpha +# *. Torbutton +# *. Torcheck +# *. The Website +# * Tor Manual Pages +# +# ( More translation information for Tor related apps and documentation +# will accumulate here ) -Our translations are handled in one of two places. The Tor Translation Portal -handles all of the translations for Vidalia, Torbutton and TorCheck. The Tor -website itself is currently handled by hand translations using subversion. -- +About Transifex: -For the Tor website, you'll need a Tor SVN account. -If you do not have one and you need one, please run this command with your -desired username in place of 'USERNAME': -htdigest -c passwd.tmp Tor subversion repository USERNAME -and send us the contents of passwd.tmp. +All of the translation projects are located here: +https://www.transifex.net/projects/p/torproject/. -- +Transifex is a website that lets users contribute translations +online using their web browser. Users will have to register at +https://www.transifex.net/accounts/register/ before they can start +translating. -For the Portal-based projects, all three check in their respective .po -files into the following subversion urls: +A project may have many files that can be translated. In transifex, +these files are called resources. Transifex lists all sentences or +phrases (called strings) used by a particular resource, and allows +interested volunteers to translate individual sentences or phrases +as they are able. -https://tor-svn.freehaven.net/svn/translation/trunk/projects/torbutton -https://tor-svn.freehaven.net/svn/translation/trunk/projects/torcheck -https://svn.vidalia-project.net/svn/vidalia/trunk/src/vidalia/i18n/ +The Transifex Client: -The current pootle configuration is checked into subversion as well: +The Transifex Command-line Client enables you to easily manage your +translations within a project without the need of a GUI. You can use +the command line client to easily create new resources, map local +files to translations and synchronize translation projects with your +local repository and vice verca. -https://tor-svn.freehaven.net/svn/translation/trunk/pootle +For more information about the Transifex client, see +http://help.transifex.net/user-guide/client/index.html#user-client +1. Installing the client + + The Transifex Client can be found on the Python Package Index + (PYPI) under the name transifex-client. So to install it, make sure you + have a recent version of setuptools installed and then issue the + following command: + + $ easy_install -U transifex-client + + This command will install the latest version of transifex-client + and if you have an outdated version it’ll perform an update. + +2. Init + + After installing the client, you will need to run the command + below to initialize a project and generate your own config file. + You may run this command from anywhere on your filesystem: + +$ tx init + + NOTE: You will be asked to enter the URL of the Transifex + instance you wish to connect to. Make sure it says + https://www.transifex.net;. + + The init command will create the following files for you: + ~/.tx/config and ~/.transifexrc. Each of the translation projects + have their own configuration file, so you can safely delete + ~/.tx/config. The other file, ~/.transifexrc, holds your username + and password for Transifex. + +3. Set + + The following command is an aggregation of all functions needed + to initialize and setup a new translation resource: + +$ tx set + + For more information and other examples, see + http://help.transifex.net/user-guide/client/index.html +
[tor-commits] [torspec/master] Close proposal 166 and make xxx-geoip-survey-plan obsolete
commit 6501e1e80a6eb44aa1ff089ced2870b6728865a8 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 11:20:33 2011 -0500 Close proposal 166 and make xxx-geoip-survey-plan obsolete Karsten confirms that 166 is implemented, and xxx-geoip-survey-plan is superseded by this tech report: https://metrics.torproject.org/papers/countingusers-2010-11-30.pdf --- proposals/000-index.txt |4 +- proposals/166-statistics-extra-info-docs.txt |2 +- proposals/ideas/old/xxx-geoip-survey-plan.txt | 137 + proposals/ideas/xxx-geoip-survey-plan.txt | 137 - 4 files changed, 140 insertions(+), 140 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 48ec6a8..91c2f27 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -86,7 +86,7 @@ Proposals by number: 163 Detecting whether a connection comes from a client [OPEN] 164 Reporting the status of server votes [OPEN] 165 Easy migration for voting authority sets [OPEN] -166 Including Network Statistics in Extra-Info Documents [ACCEPTED] +166 Including Network Statistics in Extra-Info Documents [CLOSED] 167 Vote on network parameters in consensus [CLOSED] 168 Reduce default circuit window [OPEN] 169 Eliminate TLS renegotiation for the Tor connection handshake [SUPERSEDED] @@ -137,7 +137,6 @@ Proposals by status: 140 Provide diffs between consensuses [for 0.2.2.x] 147 Eliminate the need for v2 directories in generating v3 directories [for 0.2.1.x] 157 Make certificate downloads specific [for 0.2.1.x] - 166 Including Network Statistics in Extra-Info Documents [for 0.2.2] 172 GETINFO controller option for circuit information 173 GETINFO Option Expansion 174 Optimistic Data for Tor: Server Side @@ -179,6 +178,7 @@ Proposals by status: 148 Stream end reasons from the client side should be uniform [in 0.2.1.9-alpha] 150 Exclude Exit Nodes from a circuit [in 0.2.1.3-alpha] 152 Optionally allow exit from single-hop circuits [in 0.2.1.6-alpha] + 166 Including Network Statistics in Extra-Info Documents [for 0.2.2] 167 Vote on network parameters in consensus [in 0.2.2] SUPERSEDED: 112 Bring Back Pathlen Coin Weight diff --git a/proposals/166-statistics-extra-info-docs.txt b/proposals/166-statistics-extra-info-docs.txt index ab2716a..8b0c6a1 100644 --- a/proposals/166-statistics-extra-info-docs.txt +++ b/proposals/166-statistics-extra-info-docs.txt @@ -3,7 +3,7 @@ Title: Including Network Statistics in Extra-Info Documents Author: Karsten Loesing Created: 21-Jul-2009 Target: 0.2.2 -Status: Accepted +Status: Closed Change history: diff --git a/proposals/ideas/old/xxx-geoip-survey-plan.txt b/proposals/ideas/old/xxx-geoip-survey-plan.txt new file mode 100644 index 000..49c6615 --- /dev/null +++ b/proposals/ideas/old/xxx-geoip-survey-plan.txt @@ -0,0 +1,137 @@ + + +Abstract + + This document explains how to tell about how many Tor users there + are, and how many there are in which country. Statistics are + involved. + +Motivation + + There are a few reasons we need to keep track of which countries + Tor users (in aggregate) are coming from: + + - Resource allocation. Knowing about underserved countries with +lots of users can let us know about where we need to direct +translation and outreach efforts. + + - Anticensorship. Sudden drops in usage on a national basis can +indicate the arrival of a censorious firewall. + + - Sponsor outreach and self-evalutation. Many people and +organizations who are interested in funding The Tor Project's +work want to know that we're successfully serving parts of the +world they're interested in, and that efforts to expand our +userbase are actually succeeding. So do we. + +Goals + + We want to know approximately how many Tor users there are, and which + countries they're in, even in the presence of a hypothetical + directory guard feature. Some uncertainty is okay, but we'd like + to be able to put a bound on the uncertainty. + + We need to make sure this information isn't exposed in a way that + helps an adversary. + +Methods for current clients: + + Every client downloads network status documents. There are + currently three methods (one hypothetical) for clients to get them. + - 0.1.2.x clients (and earlier) fetch a v2 networkstatus +document about every NETWORKSTATUS_CLIENT_DL_INTERVAL [30 +minutes]. + + - 0.2.0.x clients fetch a v3 networkstatus consensus document +at a random interval between when their current document is no +longer freshest, and when their current document is about to +expire. + +[In both of the above cases, clients choose a running +directory cache at random with odds roughly proportional to +its bandwidth.
[tor-commits] [torspec/master] Sebastian confirms that 178 should be Open
commit 304314dc6d0ec77887125ed7e34caf3d3ca49c09 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 11:25:44 2011 -0500 Sebastian confirms that 178 should be Open --- proposals/000-index.txt|4 ++-- proposals/178-param-voting.txt |2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 91c2f27..b642703 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -98,7 +98,7 @@ Proposals by number: 175 Automatically promoting Tor clients to nodes [DRAFT] 176 Proposed version-3 link handshake for Tor [OPEN] 177 Abstaining from votes on individual flags [OPEN] -178 Require majority of authorities to vote for consensus parameters [DRAFT] +178 Require majority of authorities to vote for consensus parameters [OPEN] Proposals by status: @@ -112,7 +112,6 @@ Proposals by status: 149 Using data from NETINFO cells [for 0.2.1.x] 170 Configuration options regarding circuit building 175 Automatically promoting Tor clients to nodes - 178 Require majority of authorities to vote for consensus parameters NEEDS-REVISION: 131 Help users to verify they are using Tor OPEN: @@ -130,6 +129,7 @@ Proposals by status: 171 Separate streams across circuits by connection metadata 176 Proposed version-3 link handshake for Tor [for 0.2.3] 177 Abstaining from votes on individual flags + 178 Require majority of authorities to vote for consensus parameters ACCEPTED: 110 Avoiding infinite length circuits [for 0.2.1.x] [in 0.2.1.3-alpha] 117 IPv6 exits [for 0.2.1.x] diff --git a/proposals/178-param-voting.txt b/proposals/178-param-voting.txt index ff3d055..b5664b5 100644 --- a/proposals/178-param-voting.txt +++ b/proposals/178-param-voting.txt @@ -2,7 +2,7 @@ Filename: 178-param-voting.txt Title: Require majority of authorities to vote for consensus parameters Author: Sebastian Hahn Created: 16-Feb-2011 -Status: Draft +Status: Open Overview: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24288: {translation} more text, some nitpicking, still work in progress (translation/trunk/documentation)
Author: runa Date: 2011-03-02 16:43:14 + (Wed, 02 Mar 2011) New Revision: 24288 Modified: translation/trunk/documentation/howto.txt Log: more text, some nitpicking, still work in progress Modified: translation/trunk/documentation/howto.txt === --- translation/trunk/documentation/howto.txt 2011-03-02 15:46:57 UTC (rev 24287) +++ translation/trunk/documentation/howto.txt 2011-03-02 16:43:14 UTC (rev 24288) @@ -1,16 +1,16 @@ # This file documents the translation process for all projects # currently available in the Tor translation portal: # -# *. BridgeDB -# *. GetTor -# *. Vidalia Help Files -# *. Vidalia Installer -# *. Vidalia -# *. Orbot -# *. Torbutton-alpha -# *. Torbutton -# *. Torcheck -# *. The Website +# * BridgeDB +# * GetTor +# * Vidalia Help Files +# * Vidalia Installer +# * Vidalia +# * Orbot +# * Torbutton-alpha +# * Torbutton +# * Torcheck +# * The Website # * Tor Manual Pages # # ( More translation information for Tor related apps and documentation @@ -235,8 +235,8 @@ 5. Pushing Files to the Transifex Server - To push new/updated source files or translations to the Transifex, - simply run 'tx push' with either '-s' or '-t'. + To push new/updated source files or translations to the Transifex + server, simply run 'tx push' with either '-s' or '-t'. Vidalia: @@ -266,7 +266,7 @@ 5. Pushing Files to the Transifex Server To push new/updated source files or translations to the - Transifex, simply run 'tx push' with either '-s' or '-t'. + Transifex server, simply run 'tx push' with either '-s' or '-t'. Orbot: @@ -314,7 +314,7 @@ 5. Pushing Files to the Transifex Server To push new/updated source files or translations to the - Transifex, simply run 'tx push' with either '-s' or '-t'. + Transifex server, simply run 'tx push' with either '-s' or '-t'. Torbutton and Torbutton-alpha: @@ -324,15 +324,71 @@ and here: https://svn.torproject.org/svn/translation/trunk/projects/torbutton-alpha/. +You will also need: https://gitweb.torproject.org/torbutton.git/. + 1. Pulling Translations from the Transifex Server - To pull new translations from the server, run 'tx pull'. Remember - to commit the changes to SVN. + To pull new translations from the server, cd to the 'po' + directory and run 'tx pull'. Remember to commit the changes to + SVN. +2. Converting Translations to Mozilla Files + # TODO: document how to convert translations to mozilla files. + +3. Creating/Updating Translation Template Files + If you made changes to strings in Torbutton, you need to rebuild + the templates in the 'po/templates' directory. This is done with + the following command from within the torbutton.git checkout + directory: + $ moz2po -P -i src/chrome/locale/en/ -o /path/to/po/templates +4. Adding New Translation Resources to Transifex + + To add new translation resources to Transifex, open up + 'po/.tx/config' and create entries for the new resources. Use an + existing entry as a template. Remember to commit the file to SVN. + +5. Pushing Files to the Transifex Server + + To push new/updated source files or translations to the Transifex + server, cd to the 'po' directory and run 'tx push' with either + '-s' or '-t'. + +Torcheck: + +The Transifex configuration file, source file and translations can +be found here: +https://svn.torproject.org/svn/translation/trunk/projects/torcheck/. + +1. Pulling Translations from the Transifex Server + + To pull new translations from the server, cd to the 'po' + directory and run 'tx pull'. Remember to commit the changes to + SVN. + +2. Converting Translations to + + # TODO: document how to convert translations to a useful format. + +3. Creating/Updating Translation Template Files + + # TODO: document this as well + +4. Adding New Translation Resources to Transifex + + To add new translation resources to Transifex, open up + 'po/.tx/config' and create entries for the new resources. Use an + existing entry as a template. Remember to commit the file to SVN. + +5. Pushing Files to the Transifex Server + + To push new/updated source files or translations to the Transifex + server, cd to the 'po' directory and run 'tx push' with either + '-s' or '-t'. + TorCheck --- TorCheck uses our translation portal to accept translations. Users use ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24289: {website} updated translations for the website as wml files (in website/trunk: about/ru docs/en download/en projects/en)
Author: runa Date: 2011-03-02 17:16:57 + (Wed, 02 Mar 2011) New Revision: 24289 Modified: website/trunk/about/ru/overview.wml website/trunk/docs/en/faq.wml website/trunk/download/en/download-easy.wml website/trunk/projects/en/torbrowser.wml website/trunk/projects/en/vidalia.wml Log: updated translations for the website as wml files Modified: website/trunk/about/ru/overview.wml === --- website/trunk/about/ru/overview.wml 2011-03-02 16:43:14 UTC (rev 24288) +++ website/trunk/about/ru/overview.wml 2011-03-02 17:16:57 UTC (rev 24289) @@ -4,7 +4,7 @@ ## translation metadata -# Revision: $Revision: 23689 $ +# Revision: $Revision: 24254 $ # Translation-Priority: 2-medium #include head.wmi TITLE=Tor Project: Overview CHARSET=UTF-8 div id=content class=clearfix @@ -154,8 +154,6 @@ определённо сказать, откуда данные пришли и куда они направляются. /p -pimg alt=Первый шаг цепи Tor src=$(IMGROOT)/htw1.png/p - p Чтобы создать приватный путь с помощью Tor, программа пользователя или клиент последовательно строит цепочки зашифрованных соединений с серверами Modified: website/trunk/docs/en/faq.wml === --- website/trunk/docs/en/faq.wml 2011-03-02 16:43:14 UTC (rev 24288) +++ website/trunk/docs/en/faq.wml 2011-03-02 17:16:57 UTC (rev 24289) @@ -1577,6 +1577,7 @@ problems are: /p +ol liIP packets reveal OS characteristics. We would still need to do IP-level packet normalization, to stop things like TCP fingerprinting attacks. Given the diversity and complexity of TCP stacks, along with a Modified: website/trunk/download/en/download-easy.wml === --- website/trunk/download/en/download-easy.wml 2011-03-02 16:43:14 UTC (rev 24288) +++ website/trunk/download/en/download-easy.wml 2011-03-02 17:16:57 UTC (rev 24289) @@ -19,7 +19,7 @@ tdThe strongTor Browser Bundle/strong contains everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. a href=page projects/torbrowserLearn more -amp other languages raquo;/a/td +amp; other languages raquo;/a/td /tr tr class=gray tdspan class=windows @@ -28,6 +28,7 @@ (a href=../dist/torbrowser/tor-browser-version-torbrowserbundle_en-US.exe.ascsig/a) /span /td +/tr tr tdspan class=mac # Translators: please point to the version of TBB in your language, if there is one. Modified: website/trunk/projects/en/torbrowser.wml === --- website/trunk/projects/en/torbrowser.wml2011-03-02 16:43:14 UTC (rev 24288) +++ website/trunk/projects/en/torbrowser.wml2011-03-02 17:16:57 UTC (rev 24289) @@ -240,7 +240,8 @@ pClick strongExtract/strong (3) to begin extraction. This may take a few minutes to complete./p -pimg src=$(IMGROOT)/tbb-screenshot1.png alt=Screenshot of extraction process/p +pimg src=$(IMGROOT)/tbb-screenshot1.png alt=Screenshot of +extraction process //p a id=Usage/a h3a class=anchor href=#UsageUsage/a/h3 @@ -252,7 +253,8 @@ pThe Vidalia window will shortly appear./p -pimg src=$(IMGROOT)/tbb-screenshot2.png alt=Screenshot of bundle startup/p +pimg src=$(IMGROOT)/tbb-screenshot2.png alt=Screenshot of +bundle startup //p pOnce Tor is ready, Firefox will automatically be opened. Only web pages visited through the included Firefox browser will be sent via Tor. Other web @@ -264,15 +266,18 @@ pIf you installed the Tor IM Browser Bundle, the Pidgin instant messaging client will also be automatically opened./p pOnce you are finished browsing, close any open Firefox windows by clicking -on the img src=$(IMGROOT)/tbb-close-button.png alt=Close button (times;) (6). +on the img src=$(IMGROOT)/tbb-close-button.png alt=Close button +(times;) / (6). For privacy reasons, the list of webpages you visited and any cookies will be deleted./p -pimg src=$(IMGROOT)/tbb-screenshot3a.png alt=Screenshot of Firefox/p +pimg src=$(IMGROOT)/tbb-screenshot3a.png alt=Screenshot of +Firefox //p pWith the Tor Browser Bundle, Vidalia and Tor will automatically close. With the Tor IM Browser Bundle you need to also close Pidgin by right-clicking on the Pidgin icon (7), and choosing Quit (8)./p -pimg src=$(IMGROOT)/tbb-screenshot3b.png alt=Screenshot of Pidgin/p +pimg src=$(IMGROOT)/tbb-screenshot3b.png alt=Screenshot of +Pidgin //p pTo use the Tor Browser Bundle or Tor IM Browser Bundle again, repeat the steps in a href=#UsageUsage/a./p Modified: website/trunk/projects/en/vidalia.wml === --- website/trunk/projects/en/vidalia.wml 2011-03-02 16:43:14 UTC (rev 24288) +++
[tor-commits] [torspec/master] tweak ipv6 plan more
commit 2fa1377bdc200cecd0c36ba4104f3da156ba1ea8 Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 12:21:56 2011 -0500 tweak ipv6 plan more --- proposals/ideas/xxx-ipv6-plan.txt | 22 +++--- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/proposals/ideas/xxx-ipv6-plan.txt b/proposals/ideas/xxx-ipv6-plan.txt index 12bd4d4..73a21f1 100644 --- a/proposals/ideas/xxx-ipv6-plan.txt +++ b/proposals/ideas/xxx-ipv6-plan.txt @@ -18,17 +18,14 @@ Motivation: What needs to change: - Tor uses the Internet in many ways. There are four main ways that + Tor uses the Internet in many ways. There are three main ways that will need to change for IPv6 support, from most urgent to least urgent. - 0. An unknown laundry list of issues that will supersede all other -listed issues in this list. - 1. Tor must allow connections from IPv6-only clients. (Currently, routers and bridges do not listen on IPv6 addresses, and can't -advertise that they support IPv6 addresses, so clients can't learn that -they do.) +advertise that they support IPv6 addresses, so clients can't +learn that they do.) 2. Tor must transport IPv6 traffic and IPv6-related DNS traffic. (Currently, Tor only allows BEGIN cells to ask for connections @@ -38,11 +35,14 @@ What needs to change: 3. Tor must allow nodes to connect to one another over IPv6. Allowing IPv6-only clients is the most important, since unless we - do, these clients will be unable to connect to Tor at all. Next most - important is to support IPv6 DNS related dependencies and exiting to IPv6 - services. Finally, allowing Tor nodes to support a dual stack of both IPv4 - and IPv6 for interconnection seems like a reasonable step towards a fully - hybrid v4/v6 Tor network. + do, these clients will be unable to connect to Tor at all. Next + most important is to support IPv6 DNS related dependencies and + exiting to IPv6 services. Finally, allowing Tor nodes to support a + dual stack of both IPv4 and IPv6 for interconnection seems like a + reasonable step towards a fully hybrid v4/v6 Tor network. + + Of course, more issues may be discovered as we develop solutions for these + issues, some of which may need to take priority. Designs that we will need to do: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [torspec/master] ipv6-plan patch from ioerror
commit 2cb38a6ef43fd3b5de7508622a815d8810275e0b Author: Nick Mathewson ni...@torproject.org Date: Wed Mar 2 11:29:41 2011 -0500 ipv6-plan patch from ioerror --- proposals/ideas/xxx-ipv6-plan.txt | 21 +++-- 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/proposals/ideas/xxx-ipv6-plan.txt b/proposals/ideas/xxx-ipv6-plan.txt index e9ffb10..12bd4d4 100644 --- a/proposals/ideas/xxx-ipv6-plan.txt +++ b/proposals/ideas/xxx-ipv6-plan.txt @@ -18,13 +18,16 @@ Motivation: What needs to change: - Tor uses the Internet in many ways. There four main ways that + Tor uses the Internet in many ways. There are four main ways that will need to change for IPv6 support, from most urgent to least urgent. + 0. An unknown laundry list of issues that will supersede all other +listed issues in this list. + 1. Tor must allow connections from IPv6-only clients. (Currently, -routers do not listen on IPv6 addresses, and can't advertise -that they support IPv6 addresses, so clients can't learn that +routers and bridges do not listen on IPv6 addresses, and can't +advertise that they support IPv6 addresses, so clients can't learn that they do.) 2. Tor must transport IPv6 traffic and IPv6-related DNS traffic. @@ -35,8 +38,11 @@ What needs to change: 3. Tor must allow nodes to connect to one another over IPv6. Allowing IPv6-only clients is the most important, since unless we - do, these unable to connect to Tor at all. Next most - important is to allow IPv6 + do, these clients will be unable to connect to Tor at all. Next most + important is to support IPv6 DNS related dependencies and exiting to IPv6 + services. Finally, allowing Tor nodes to support a dual stack of both IPv4 + and IPv6 for interconnection seems like a reasonable step towards a fully + hybrid v4/v6 Tor network. Designs that we will need to do: @@ -51,13 +57,16 @@ Designs that we will need to do: for places that might assume that IPs are a scarce resource. For example, clients assume that any two routers occupying an IPv4 /16 network are too close topologically to be used in the same - circuit, and the bridgedb https distributor assumes that hopping + circuit, and the bridgedb HTTPS distributor assumes that hopping from one /24 to another takes a little effort for most clients. The directory authorities assume that blacklisting an IP is an okay response to a bad router at that address. These and other places will needed instead more appropriate notions of closeness and similarity. + We'll want to consider geographic and political boundaries rather than + purely mathematical notions such as the size of network blocks. + We'll need a way to advertise IPv6 bridges, and to use them. For transporting IPv6-only traffic, we have another accepted design ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24290: {translation} some more text for the translation howto (translation/trunk/documentation)
Author: runa Date: 2011-03-02 19:30:13 + (Wed, 02 Mar 2011) New Revision: 24290 Modified: translation/trunk/documentation/howto.txt Log: some more text for the translation howto Modified: translation/trunk/documentation/howto.txt === --- translation/trunk/documentation/howto.txt 2011-03-02 17:16:57 UTC (rev 24289) +++ translation/trunk/documentation/howto.txt 2011-03-02 19:30:13 UTC (rev 24290) @@ -288,7 +288,7 @@ Start by checking out the following directory: https://svn.torproject.org/svn/projects/android/trunk/Orbot/. - You can use the following script to convert translated .po files to .xml files:: + You can use the following script to convert translated .po files to .xml files: https://svn.torproject.org/vidalia/vidalia/trunk/src/vidalia/help/content/po2html.sh NOTE: You need to have the package 'po4a' installed before running the script. @@ -369,14 +369,17 @@ directory and run 'tx pull'. Remember to commit the changes to SVN. -2. Converting Translations to +2. Updating the Translations on the Server Hosting Torcheck - # TODO: document how to convert translations to a useful format. + After pulling new translations from Transifex, someone will have + to put the .po files on the server where Torcheck is running so + that TorCheck.py can find them. 3. Creating/Updating Translation Template Files # TODO: document this as well - + (xgettext cgi-bin/TorCheck.py -dTorCheck -oi18n/TorCheck.pot) + 4. Adding New Translation Resources to Transifex To add new translation resources to Transifex, open up @@ -389,156 +392,59 @@ server, cd to the 'po' directory and run 'tx push' with either '-s' or '-t'. - TorCheck --- +The Website: -TorCheck uses our translation portal to accept translations. Users use -the portal to check in their changes. To make use of the translations -that users have committed to the translations/ subversion module, you'll -need to ensure that you have a current checked out copy of TorCheck: +The Transifex configuration file, source file and translations can +be found here: +https://svn.torproject.org/svn/translation/trunk/projects/website/. + +You will also need to check out the wml files for the website: +https://svn.torproject.org/svn/website/trunk/. -cd check/trunk/i18n/ -check/trunk/i18n$ svn up +1. Pulling Translations from the Transifex Server -You should see something like the following: + To pull new translations from the server, cd to the 'po' + directory in the translation module and run 'tx pull'. Remember + to commit the changes to SVN. -Fetching external item into 'pootle' -External at revision 15300. +2. Converting Translations to WML -At revision 15300. + Simply pulling translations from the Transifex server is not + enough. To make use of the translations, you will need to convert + the .po files to .wml files. -Now if you had changes, you'd simply want to move the newly updated .po files -into the current stable directory. Moving the .po files from -'check/trunk/i18n/pootle/' into 'check/trunk/i18n' properly naming the files -for their respective locale. + You can use the 'po2wml.sh' script inside the website module to + convert translated .po files to .wml. Make sure that you check + out the two subversion modules in the same directory, so that you + have (for example) ~/tor/website and ~/tor/translation. + + NOTE: You need to have the package 'po4a' installed before running the script. -Here's an example of how to move all of the current pootle translations into -the svn trunk area of TorCheck: +3. Creating/Updating Translation Template Files -cd check/trunk/i18n/ -for locale in `ls -1 pootle/|grep -v template`; -do -mv -v pootle/$locale/TorCheck_$locale.po TorCheck_$locale.po; -done + To create a .pot file from a new .wml file, or to update existing + .pot files when one or more website files are updated, run the + 'wml2po.sh' script. Make sure that you check out the two + subversion modules in the same directory, so that you have (for + example) ~/tor/website and ~/tor/translation. -Now check the differences (ensure the output looks reasonable): +4. Adding New Translation Resources to Transifex -svn diff + To add new translation resources to Transifex, open up + 'po/.tx/config' and create entries for the new resources. Use an + existing entry as a template. Remember to commit the file to SVN. -Ensure that msgfmt has no errors: +5. Pushing Files to the Transifex Server -msgfmt -C *.po + To push new/updated source files or translations
[tor-commits] [torsocks/master] Really fix multiple runs of config.status this time
commit 339e9597fd77d9e84119f747e9158cb0fc4f4952
Author: Robert Hogan rob...@roberthogan.net
Date: Wed Mar 2 20:04:34 2011 +
Really fix multiple runs of config.status this time
---
configure.in | 12 +---
src/Makefile.am |2 --
test/Makefile.am |1 +
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/configure.in b/configure.in
index 0291f8f..4bc0e7b 100644
--- a/configure.in
+++ b/configure.in
@@ -546,8 +546,12 @@ AC_DEFINE_UNQUOTED([SENDMSG_ARGNAMES],[${NAMES}],[Argument
names])
#we need to use DYLD_INSERT_LIBRARIES.
##
+# This variable is used for the LDFLAGS in test/Makefile.am
TESTLDFLAGS=$LDFLAGS
+# Version information for libtorsocks
+LDFLAGS=$LDFLAGS -version-info 1:0:0
+
dnl Linker checks for Mac OSX, which uses DYLD_INSERT_LIBRARIES
dnl instead of LD_PRELOAD
case $host_os in
@@ -636,10 +640,4 @@ AC_ENABLE_STATIC
AC_CONFIG_FILES([src/usewithtor src/torsocks doc/torsocks.conf.5
doc/torsocks.8 doc/usewithtor.1 doc/torsocks.1])
AC_CONFIG_FILES(Makefile src/Makefile doc/Makefile)
-AC_OUTPUT
-
-dnl Output the Makefile for test/test_torsocks.
-dnl Dump any LDFLAGS that were only required for linking libtorsocks, such as
-dynamiclib on OSX.
-LDFLAGS=$TESTLDFLAGS
-AC_CONFIG_FILES(test/Makefile)
-AC_OUTPUT
+#AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index d6da8f3..8d47fb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,8 +9,6 @@ INSTALL_SCRIPT = $(install_sh) -c -m 755
# Install main library to $(prefix)/lib/tor (must match torsocks.in)
lib_LTLIBRARIES = libtorsocks.la
libtorsocks_la_SOURCES = torsocks.c common.c parser.c dead_pool.c
darwin_warts.c socks.c
-libtorsocks_la_LDFLAGS = -version-info 1:0:0
-#libtorsocks_la_CFLAGS = -nostartfiles
DISTCLEANFILES=parser.lo dead_pool.lo common.lo libtorsocks.lo torsocks.lo
darwin_warts.lo socks.lo\
config.cache config.log config.h Makefile \
diff --git a/test/Makefile.am b/test/Makefile.am
index 84e4859..c04e5ea 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,5 @@
noinst_PROGRAMS= test_torsocks
test_torsocks_SOURCES= test_torsocks.c
+test_torsocks_LDFLAGS= $(TESTLDFLAGS)
CLEANFILES= test_torsocks
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24291: {website} modified version for new Android build (website/trunk/include)
Author: n8fr8 Date: 2011-03-02 21:15:28 + (Wed, 02 Mar 2011) New Revision: 24291 Modified: website/trunk/include/versions.wmi Log: modified version for new Android build Modified: website/trunk/include/versions.wmi === --- website/trunk/include/versions.wmi 2011-03-02 19:30:13 UTC (rev 24290) +++ website/trunk/include/versions.wmi 2011-03-02 21:15:28 UTC (rev 24291) @@ -47,8 +47,8 @@ define-tag version-vidalia-stable whitespace=delete0.2.10/define-tag -define-tag version-androidbundle-tor whitespace=delete0.2.2.14-alpha/define-tag -define-tag version-androidbundle-orbot whitespace=delete1.0.4/define-tag +define-tag version-androidbundle-tor whitespace=delete0.2.2.22-alpha/define-tag +define-tag version-androidbundle-orbot whitespace=delete1.0.4.1/define-tag define-tag version-androidbundle-privoxy whitespace=deleteprivoxy-3.0.12-stable/define-tag define-tag version-androidbundle-libevent whitespace=deletelibevent-1.4.12-stable/define-tag define-tag package-androidbundle-alpha whitespace=deletedist/android/version-androidbundle-tor-orbot-version-androidbundle-orbot.apk/define-tag ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24294: {arm} Adding config options for displaying the new and/or old conf (in arm/trunk: . src/interface)
Author: atagar
Date: 2011-03-03 04:16:21 + (Thu, 03 Mar 2011)
New Revision: 24294
Modified:
arm/trunk/armrc.sample
arm/trunk/src/interface/controller.py
Log:
Adding config options for displaying the new and/or old config panel.
Modified: arm/trunk/armrc.sample
===
--- arm/trunk/armrc.sample 2011-03-03 03:37:40 UTC (rev 24293)
+++ arm/trunk/armrc.sample 2011-03-03 04:16:21 UTC (rev 24294)
@@ -153,9 +153,15 @@
# Parameters for connection display
# -
-# features.connection.showColumn.*
+# oldPanel
+# includes the old connection panel in the interface
+# newPanel
+# includes the new connection panel in the interface
+# showColumn.*
# toggles the visability of the connection table columns
+features.connection.oldPanel true
+features.connection.newPanel false
features.connection.showColumn.fingerprint true
features.connection.showColumn.nickname true
features.connection.showColumn.destination true
Modified: arm/trunk/src/interface/controller.py
===
--- arm/trunk/src/interface/controller.py 2011-03-03 03:37:40 UTC (rev
24293)
+++ arm/trunk/src/interface/controller.py 2011-03-03 04:16:21 UTC (rev
24294)
@@ -31,8 +31,6 @@
import graphing.connStats
import graphing.resourceStats
-INCLUDE_CONNPANEL_2 = False
-
CONFIRM_QUIT = True
REFRESH_RATE = 5# seconds between redrawing screen
MAX_REGEX_FILTERS = 5 # maximum number of previous regex filters that'll be
remembered
@@ -45,17 +43,17 @@
PAGES = [
[graph, log],
[conn],
+ [conn2],
[config],
[torrc]]
-if INCLUDE_CONNPANEL_2:
- PAGES.append([conn2])
-
PAUSEABLE = [header, graph, log, conn, conn2]
CONFIG = {log.torrc.readFailed: log.WARN,
features.graph.type: 1,
features.config.prepopulateEditValues: True,
+ features.connection.oldPanel: True,
+ features.connection.newPanel: False,
queries.refreshRate.rate: 5,
log.torEventTypeUnrecognized: log.NOTICE,
features.graph.bw.prepopulate: True,
@@ -560,8 +558,18 @@
# before being positioned - the following is a quick hack til rewritten
panels[log].setPaused(True)
- panels[conn] = connPanel.ConnPanel(stdscr, conn, isBlindMode)
- panels[conn2] = interface.connections.connPanel.ConnectionPanel(stdscr,
config)
+ if CONFIG[features.connection.oldPanel]:
+panels[conn] = connPanel.ConnPanel(stdscr, conn, isBlindMode)
+ else:
+panels[conn] = panel.Panel(stdscr, blank, 0, 0, 0)
+PAUSEABLE.remove(conn)
+
+ if CONFIG[features.connection.newPanel]:
+panels[conn2] = interface.connections.connPanel.ConnectionPanel(stdscr,
config)
+ else:
+panels[conn2] = panel.Panel(stdscr, blank, 0, 0, 0)
+PAUSEABLE.remove(conn2)
+
panels[control] = ControlPanel(stdscr, isBlindMode)
panels[config] = configPanel.ConfigPanel(stdscr, configPanel.State.TOR,
config)
panels[torrc] = torrcPanel.TorrcPanel(stdscr, torrcPanel.Config.TORRC,
config)
@@ -587,7 +595,8 @@
conn.add_event_listener(panels[graph].stats[bandwidth])
conn.add_event_listener(panels[graph].stats[system resources])
if not isBlindMode:
conn.add_event_listener(panels[graph].stats[connections])
- conn.add_event_listener(panels[conn])
+ if CONFIG[features.connection.oldPanel]:
+conn.add_event_listener(panels[conn])
conn.add_event_listener(sighupTracker)
# prepopulates bandwidth values from state file
@@ -614,7 +623,8 @@
# tells revised panels to run as daemons
panels[header].start()
panels[log].start()
- panels[conn2].start()
+ if CONFIG[features.connection.newPanel]:
+panels[conn2].start()
# warns if tor isn't updating descriptors
#try:
@@ -673,7 +683,8 @@
#panels[header]._updateParams(True)
# other panels that use torrc data
-panels[conn].resetOptions()
+if CONFIG[features.connection.oldPanel]:
+ panels[conn].resetOptions()
#if not isBlindMode:
panels[graph].stats[connections].resetOptions(conn)
#panels[graph].stats[bandwidth].resetOptions()
@@ -734,7 +745,8 @@
isUnresponsive = False
log.log(log.NOTICE, Relay resumed)
- panels[conn].reset()
+ if CONFIG[features.connection.oldPanel]:
+panels[conn].reset()
# TODO: part two of hack to prevent premature drawing by log panel
if page == 0 and not isPaused: panels[log].setPaused(False)
@@ -828,11 +840,11 @@
# stops panel daemons
panels[header].stop()
-panels[conn2].stop()
+if CONFIG[features.connection.newPanel]: panels[conn2].stop()
panels[log].stop()
panels[header].join()
-panels[conn2].join()
+if CONFIG[features.connection.newPanel]: panels[conn2].join()
panels[log].join()
