[tor-commits] [translation/tsum] Update translations for tsum
commit c1562e6322f28e5de1c344cb71628b40a1aa2e49 Author: Translation commit bot Date: Mon Feb 3 07:45:08 2014 + Update translations for tsum --- km/short-user-manual_km_noimg.xhtml |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index 73af017..f61059e 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -16,7 +16,7 @@ áááá ááâáááâáá¾áâáá¶áâáááááâá¢áá»áá¶áááâáá âá¢áááâáááá¾âá ááá¾áâáááá»áâáẠhttps://www.torproject.org/projects/torbrowser.html";>Tor Browser Bundleá áááá ááâáááâáá¶áâáááááá·áá¸âá¢áá¸áááºáá·áâáááâáá¶áâáááááâáá áá¶ááááááááâáá¶âáá»á áá¾áááá¸âáá»ááááá·áá¶áâáá¶áâáá»áááâá¢áá¸áááºáá·áâáá¶áâááá Tor, á á¾áâáá·áâáá¶ááá¶áâáá¶áâááá¡á¾áâá¡á¾áá á¢áááâáá¶áâááâáááá áá, ááâááááááá¶áâá áá á á¾áâá á¶áááááá¾á Tor á áá¶áâáá·áá¸âáá¸áâáááááâáááá¶ââáá¸áâáááá»áâáá¶áâááá½áâááâáááááá·áḠTor á á¢áááâá¢á¶á âáááá¾áâ https://www.torproject.org/";>áááááâááááá¶áâááááááâáááá Tor á á¾áâáá¶áâááâáá¶â á¬âá¢áááâá¢á¶á âáááá¾ GetTor, áááááá·áá¸âáááá¾áááâá¢áá¸áááâááááááááááááá·á ááááâááá½áâáá Tor áá¶áâá¢áá¸ááá -áá¾áááá¸âááá½áâáá¶á English Tor Browser Bundle ááááá¶áá Windows, áááá¾âá¢áá¸áááâáá get...@torproject.org áááâáááá¾ windows áááá»áâáá½âááá áááá¸âáá¶áá á¢áááâá¢á¶á âáá»áâááááá¶áâááâáááá +áá¾áááá¸âááá½áâáá¶á English Tor Browser Bundle ááááá¶ááâáá¸ááá¼, áááá¾âá¢áá¸áááâáá get...@torproject.org áááâáááá¾ áá¸ááá¼ áááá»áâáá½âááá áááá¸âáá¶áá á¢áááâá¢á¶á âáá»áâááááá¶áâááâáááá á¢áááâá¢á¶á âáááá¾ Tor Browser Bundle ááááá¶áá Mac OS X áá¶áâááâááá (ááááá macos-i386), áá·áâáá¸áá»á (ááááá linux-i386 ááááá¶ááâáááááááá 32-bit ᬠlinux-x86_64 ááááá¶ááâáááááááá 64-bit)á ááááá·ááá¾âá¢áááâá ááâáá¶áâááááâáááâáá¶áâááááááâáá Tor, ááááá áááá½á áááá½áá á¢áááâáá¹áâááá½áâáá¶áâá¢áá¸áááâáááâáá¶áâááá áááá¸âáááá¶á áá·áâááááá¸âáá¶áá¶âáááâáá¶áá á ááá¶áá Tor Browser Bundles ááááá¶ááâáá¸áá»á áá·á Mac OS X ááâáá¶á á á¾áâá¢áááâáá·áâá¢á¶á âááá½áâáá¶áâáááá ááâáá¶ááâáááââáá¶áá½á Gmail, Hotmail á¬âáááḠYahoo á ááááá·ááá¾âá¢áááâáá·áâááá½áâáá¶áâáááá ááâáááâá¢áááâá ááâááá½áâáá¶áâááâááá, áááá¾âá¢áá¸áááâáá h...@rt.torproject.org áá¾áâáá¹áâáááááâá²ááâá¢áááâáá¼áâááááá¸ââáááááâááááá¶áââáááâáááá¼áâáááá¾á ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tsum] Update translations for tsum
commit c87403137c75cd0f76279558928688626ca602ec Author: Translation commit bot Date: Mon Feb 3 07:15:07 2014 + Update translations for tsum --- km/short-user-manual_km_noimg.xhtml |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index 6dff6c3..73af017 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -9,7 +9,7 @@ áá¼áâááááá¶ááâáá¶âáá¾áâáá·áâáááá»áâáááááâáá¶áâáá¶ááááâáá¾âáá¼ááááá¶áâáááâáá¶áâáááá¾á, á á¾áâáá¾áâááá½áâáá¶áâá¢áá¸áááâáá¶á ááá¾áâááááá¶ááââááááá áá·áâá á¶ááá¶á áâá¢á¶ááááááâáá ááááá·ááá¾âáá¾áâáá·áâáááá¡ááâááâáááááâáááá¼áâáááááá áá¾ Tor áááá¾ááá¶áâááááâáᶠTor áá¶âáááá¾ááá¶áâáááá¼áááâáá·áááá·áâáááâá¢áá»áááá¶áâá¢ááááááá¾âá²ááâáá»ááááá·áá¶á áá·áâáá¶áâá¯áááââááááâá¢áááâááááá¾áâá¡á¾áâáá¾âá¢áá¸áááºáá·áá Tor áááá¾ááá¶áâáááâáááá¾âá áá¶á áááâááááâá¢áááâáá¶áâáááâááá¶ááá¸áâááâá áááááâáḠ(áá¼á âáááâáá¶áâáááá¶ááâáᶠáá¶áâááááá¼áâá) áá âáááá»áâááááá¶á Tor , áá»áâáááâá áá¶á áááâáááá¼áâáá¶áâáááá¾âá ááâáá âáá¶ááâá¢áá¸áááºáá·áâáá¶âáá¶áá¶áááá -áá¼ááá¶áâáá¶ááá¾âáááá á¶áâáá¸âáá¶áâáá»áááâááááâá¢áááâááááá¶ááâáááááâááááá¶áâááááááâáááá¶âáá¾ Tor á ááá¼áá¸áááâáááâááááâáááá á¶áâáá¶áâááááá¼áâáâ âáá âáááá»áâááááá¶á Tor áááâáááââáá¶áááâááááá¹áâáá¸âáááá á¶áâáááááâááâáá¶áâá¢áá·ááááá¸áâááá¶áâá¢áááâáááá¾ áá·áâáá¶áâááááá¼áâááááâáá¸áá½ááá +áá¼ááá¶áâáá¶ááá¾âáááá á¶áâáá¸âáá¶áâáá»áááâááááâá¢áááââáá ââáááááâááááá¶áâááááááâáááá¶âáá¾ Tor á ááá¼áá¸áááâáááâááááâáááá á¶áâáá¶áâááááá¼áâáâ âáá âáááá»áâááááá¶á Tor áááâáááââáá¶áááâááááá¹áâáá¸âáááá á¶áâáááááâááâáá¶áâá¢áá·ááááá¸áâááá¶áâá¢áááâáááá¾ áá·áâáá¶áâááááá¼áâááááâáá¸áá½ááá Tor áá¹áâáááá¾âá²ááâá áá¶á áááâááááâá¢áááââáá¾áâá¢áá¶áá·á, á á¾áâáá¶âáá¹áâá¢áá·ááááá¸áâá¢ááá¸âáááááááá¶áâááá¶áâá¢ááá áá·áâááááá¶áâ Tor ááááâá¢áááá Tor áá¹áâá¢áá·ááááá¸áâá áá¶á áááâááááâá¢áááâááâáááâáá âáááá»áâááááá¶á Tor , ááá»ááááâáá¶âáá·áâá¢á¶á âá¢áá·ááááá¸áâá áá¶á áááâááááâá¢áááâááá¶áâááááá¶á Tor áá·ááá âá á»ááááááâááááâáá¶á ááááá·ááá¾âá¢áááâááá½áâáá¶áâáááááá¶á, á§áá¶á ááá áá âáááâá¢áááâá á¼áâáá âáááááâááááá¶áâáááá¾âáá¶áááâááááá¶áá á¬âáááááâá¢áááâáááá¾, áá¼áâáááá¶ááâáá¶âá¢áááâáááá»áâáááá¾ HTTPS (á§. https://torproject.org/, áá·áâááá http://torproject.org/) á ááááâáá¶áâáá Tor @@ -70,7 +70,7 @@ sub 2048R/EB399FD7 2003-10-16 You are behind a restrictive firewall: To tell Tor to only try port 80 and port 443, open the Vidalia control panel, click on Settings and Network, and tick the box that says My
[tor-commits] [translation/tsum] Update translations for tsum
commit da18e791c5f7f8d4564f699054864bf320360252 Author: Translation commit bot Date: Mon Feb 3 05:15:07 2014 + Update translations for tsum --- km/short-user-manual_km_noimg.xhtml |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index cdb0d27..6dff6c3 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -56,7 +56,7 @@ sub 2048R/EB399FD7 2003-10-16 ááááááâáá½áááâáá·áá¶áâ "á ááááááá¶âáááá¹ááááá¼á" á á ááááááá¶âáá·áâáááá¹ááááá¼áâáá¶áâáááâáá¶âá¯ááá¶áâá¢á¶á âáá¼á á ááááá·ááá¾âá¢áááâáá¾áâáá¾áâá ááááááá¶âáá·áâáááá¹ááááá¼á, áááá¾âáááááá¶áâáááá¢á·áâá¢ááá¸âáá¸ááááááâáááâá¢áááâáá¶áâááââááááááâáááá áá, ááááâááááááááá¶ááâá ááááááᶠáá·áâááááááâáḠGnuPG áááá»áâá¢áá¸áááâáá áá¶áá h...@rt.torproject.org á -áá âáááâá¢áááâáá¶áâááááááááá¶ááâá ááááááᶠá á¾áâáá¾áââááááááâáá¶â "á ááááááá¶âáááá¹ááááá¼á" , áá âáá»á á á¾áâáááááâá ááâááááááá¶áâáááá ááá You should then see a directory similar to tor-browser_en-US. Inside that directory is another directory called Docs, which contains a file called changelog. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename. +áá âáááâá¢áááâáá¶áâááááááááá¶ááâá ááááááᶠá á¾áâáá¾áââááááááâáá¶â "á ááááááá¶âáááá¹ááááá¼á" , áá âáá»á á á¾áâáááááâá ááâááááááá¶áâáááá ááá ááááá¶ááâááâá¢áááâáá½áááâáá¾áâáá¾áâááâááááááâáááᶠtor-browser_en-US á áá âáá¶áâáááá»áâááâáááâáá¶âááâáááááâáááâá á âáᶠDocs, áááâáá¶áâá á âáá¶áâá á âáᶠchangelogá á¢áááâáááá¶ááâáá¶âá ááâá²ááâáááâááááâáá âáá½áâáá¶ááá¾âááâá¯ááá¶á changelog áááá¼ááááâáá¹áâáááâáááá âáááá¸âáááá»áâáááááâá¯ááá¶áá ááááâáááá¾ Tor Browser Bundle ááááá¶ááâáá¸âáá¶áâáá Tor Browser Bundle áá·áâáááááâáááá ááâá áá, á¢áááâáá½áááâáá¶áâááâáááâáá¶áâá¯ááá¶áâáááá¸á áá½áâáááá»áâá ááááâá¯ááá¶áâá¢á¶á âááááá·ááááá·âáá¶áââáááá¶ááâáᶠ"Start Tor Browser" (ᬠ"start-tor-browser", ááá¢ááâáá¾âááááááááâááááá·ááááá·âááááâá¢ááá)á áá âáááâá¢áááâá á¶áááááá¾á Tor Browser Bundle, áááá¼áâá¢áááâáááá¼áâáá¾áâáá¶áâááá¡á¾á Vidalia âáá·áâááááâááááá¶ááâá¢áááâáá âááááá¶á Tor á ááááá¶ááâááâ á¢áááâáá¹áâáá¾áâáááááá·áá¸âá¢áá¸áááºáá·áâááááá¶ááâáá¶âá¢áááâáááá»áâáááá¾ Tor á¥á¡á¼áâáááá áá¶âáááá¼áâáá¶áâáááá¾âáááâáá¶áâáááá á¶á https://check.torproject.org/";>https://check.torproject.org/ á¢áááâá¢á¶á ââáá»áááâá¢áá¸áááºáá·áâá¥á¡á¼áâáááââáá¶áâááá Tor á @@ -64,7 +64,7 @@ sub 2048R/EB399FD7 2003-10-16 áá¼áâá ááá¶áâáá¶âáá¶âáá¶áâáá¶áááááá¶ááââáááâá¢áááâáááá¾âáááááá·áá¸âá¢áá¸áááºáá·áââáá¶áâââáááá ááâááá, á á¾áâáá·áâáá¶áâáá¶âáááááá·áá¸âá¢áá¸áááºáá·áâáááá¶ááâáááá½áâááááâá¢áááá áá¾âáááá¼áâáá
[tor-commits] r26577: {website} add new mirror (website/trunk/include)
Author: phobos Date: 2014-02-03 04:54:12 + (Mon, 03 Feb 2014) New Revision: 26577 Modified: website/trunk/include/tor-mirrors.csv Log: add new mirror Modified: website/trunk/include/tor-mirrors.csv === --- website/trunk/include/tor-mirrors.csv 2014-02-02 05:49:39 UTC (rev 26576) +++ website/trunk/include/tor-mirrors.csv 2014-02-03 04:54:12 UTC (rev 26577) @@ -78,3 +78,4 @@ doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, Germany, DE, TRUE, FALSE, NO, https://tor-mirror.cyberguerrilla.org, , , , https://tor-mirror.cyberguerrilla.org/dist/, , , http://6dvj6v5imhny3anf.onion, Sat Feb 1 14:21:23 2014 cont...@gtor.org, Gtor, DE, Germany, DE, TRUE, TRUE, NO, http://torproject.gtor.org/, https://torproject.gtor.org/, rsync://torproject.gtor.org/website-mirror/, , http://torproject.gtor.org/dist/, https://torproject.gtor.org/dist/, rsync://torproject.gtor.org/website-mirror/dist/, , Sat Feb 1 14:21:23 2014 mirr...@dev-null.io, dev-null.io, NL, The Netherlands, NL, TRUE, FALSE, NO, http://tor.dev-null.io/, https://tor.dev-null.io/, , , http://tor.dev-null.io/dist/, https://tor.dev-null.io/dist/, , , +Tor Fan,Quintex Alliance Consulting,US,United States,US,TRUE,FALSE,NO,http://tor.mirror.quintex.com,,rsync://tor.mirror.quintex.com::tor,ftp://mirror.quintex.com/tor/,http://tor.mirror.quintex.com/dist,,rsync://mirror.quintex.com::tordist,, ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [translation/tsum] Update translations for tsum
commit aaba88e86c05d40cdfffc496ba7ef849197acfa9 Author: Translation commit bot Date: Mon Feb 3 04:45:07 2014 + Update translations for tsum --- km/short-user-manual_km_noimg.xhtml |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index b8c077c..cdb0d27 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -29,7 +29,7 @@ áá»áâáááâá¢áááâááááááááá¶ááâá ááááááᶠá¢áááâáááá¼áâáá¶áâáá á á¾áâááá¡á¾á GnuPG á áá¸ááá¼: http://gpg4win.org/download.html";>http://gpg4win.org/download.htmlMac OS X: http://macgpg.sourceforge.net/";>http://macgpg.sourceforge.net/áá¸áá»á á áá¶áâáááá ááâáá¸áá»á âáá¶âá ááá¾áâáá¶áâáá¶áá½á GnuPG áá»áâááá¡á¾áá áá¼áâá ááá¶áâáá¶âá¢áááâáááá¼áâááâáááá¼á áá·áâáá¶áááâááááá¶âáááâáá¶áâáááá¾âáá¶áááááá áá¾áááá¸âááá½áâáá¶áâáᶠáá¾áááá¸âá á¼áâáááá¾ááá¶áâáá âáá¾âááááááááâááááâá¢áááá -Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import Erinn's key, run: +Erinn Clark á á»áâá ááááááᶠTor Browser Bundles áááâáááá¾ key 0x63FEE659 á áá¾áááá¸âáá¶áá á¼á Erinn's key, áááá¾ááá¶áá gpg --keyserver hkp://keys.gnupg.net --recv-keys 0x63FEE659 @@ -55,8 +55,8 @@ sub 2048R/EB399FD7 2003-10-16 gpg --verify tor-browser-2.2.33-2_en-US.exe.asc tor-browser-2.2.33-2_en-US.exe -The output should say "Good signature". A bad signature means that the file may have been tampered with. If you see a bad signature, send details about where you downloaded the package from, how you verified the signature, and the output from GnuPG in an email to h...@rt.torproject.org. -Once you have verified the signature and seen the "Good signature" output, go ahead and extract the package archive. You should then see a directory similar to tor-browser_en-US. Inside that directory is another directory called Docs, which contains a file called changelog. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename. +ááááááâáá½áááâáá·áá¶áâ "á ááááááá¶âáááá¹ááááá¼á" á á ááááááá¶âáá·áâáááá¹ááááá¼áâáá¶áâáááâáá¶âá¯ááá¶áâá¢á¶á âáá¼á á ááááá·ááá¾âá¢áááâáá¾áâáá¾áâá ááááááá¶âáá·áâáááá¹ááááá¼á, áááá¾âáááááá¶áâáááá¢á·áâá¢ááá¸âáá¸ááááááâáááâá¢áááâáá¶áâááââááááááâáááá áá, ááááâááááááááá¶ááâá ááááááᶠáá·áâááááááâáḠGnuPG áááá»áâá¢áá¸áááâáá áá¶áá h...@rt.torproject.org á +áá âáááâá¢áááâáá¶áâááááááááá¶ááâá ááááááᶠá á¾áâáá¾áââááááááâáá¶â "á ááááááá¶âáááá¹ááááá¼á" , áá âáá»á á á¾áâáááááâá ááâááááááá¶áâáááá ááá You should then see a directory similar to tor-browser_en-US. Inside that directory is another directory called Docs, which contains a file called changelog. You want to make sure that the version number on the top line of the changelog file matches the version number in the filename. ááááâáááá¾ Tor Browser Bundle ááááá¶ááâáá¸âáá¶áâáá Tor Browser Bundle áá·áâáááááâáááá ááâá áá, á¢áááâáá½áááâáá¶áâááâáááâáá¶áâá¯ááá¶áâáááá¸á áá½áâáááá»áâá ááááâá¯ááá¶áâá¢á¶á âááááá·ááááá·âáá¶áââáááá¶ááâáᶠ"Start Tor Browser" (ᬠ"start-tor-browser", ááá¢ááâáá¾âááááááááâááááá·ááááá·âááááâá¢ááá)á áá âáááâá¢áááâá á¶áááááá¾á Tor Browser Bundle, áááá¼áâá¢áááâáááá¼áâáá¾áâáá¶áâááá¡á¾á Vidalia âáá·áâááááâááááá¶ááâá¢áááâá
[tor-commits] [translation/tsum] Update translations for tsum
commit 5eb12ae59e5b6737c36f411684c36ac35b28d148 Author: Translation commit bot Date: Mon Feb 3 04:15:10 2014 + Update translations for tsum --- km/short-user-manual_km_noimg.xhtml |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index 0957aca..b8c077c 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -5,13 +5,13 @@ The Short User Manual -This user manual contains information about how to download Tor, how to use it, and what to do if Tor is unable to connect to the network. If you can't find the answer to your question in this document, email h...@rt.torproject.org. + á¢áááâáááá¾âáááâááâáááâáá¶áâáááááá¶áâá¢ááá¸âááááâáá¶áâáá Tor, ááááâáááá¾âáááá¶ááâáᶠáá·áâáá·á áá áá¶áâáááâáááá¼áâáááá¾ ááááá·ááá¾ Tor áá·áâá¢á¶á âááááá¶ááâáá âááááá¶áâáá¶áâááá ááááá·ááá¾âá¢áááâáá·áâá¢á¶á ââáááááááâá áááá¾áâáááá½áâááááâá¢áááâáá âáááá»áâá¯ááá¶áâáááâáá¶áâáá, áááá¾âá¢áá¸ááá h...@rt.torproject.org á áá¼áâááááá¶ááâáá¶âáá¾áâáá·áâáááá»áâáááááâáá¶áâáá¶ááááâáá¾âáá¼ááááá¶áâáááâáá¶áâáááá¾á, á á¾áâáá¾áâááá½áâáá¶áâá¢áá¸áááâáá¶á ááá¾áâááááá¶ááââááááá áá·áâá á¶ááá¶á áâá¢á¶ááááááâáá ááááá·ááá¾âáá¾áâáá·áâáááá¡ááâááâáááááâáááá¼áâáááááá áá¾ Tor áááá¾ááá¶áâááááâáᶠTor áá¶âáááá¾ááá¶áâáááá¼áááâáá·áááá·áâáááâá¢áá»áááá¶áâá¢ááááááá¾âá²ááâáá»ááááá·áá¶á áá·áâáá¶áâá¯áááââááááâá¢áááâááááá¾áâá¡á¾áâáá¾âá¢áá¸áááºáá·áá Tor áááá¾ááá¶áâáááâáááá¾âá áá¶á áááâááááâá¢áááâáá¶áâáááâááá¶ááá¸áâááâá áááááâáḠ(áá¼á âáááâáá¶áâáááá¶ááâáᶠáá¶áâááááá¼áâá) áá âáááá»áâááááá¶á Tor , áá»áâáááâá áá¶á áááâáááá¼áâáá¶áâáááá¾âá ááâáá âáá¶ááâá¢áá¸áááºáá·áâáá¶âáá¶áá¶áááá áá¼ááá¶áâáá¶ááá¾âáááá á¶áâáá¸âáá¶áâáá»áááâááááâá¢áááâááááá¶ááâáááááâááááá¶áâááááááâáááá¶âáá¾ Tor á ááá¼áá¸áááâáááâááááâáááá á¶áâáá¶áâááááá¼áâáâ âáá âáááá»áâááááá¶á Tor áááâáááââáá¶áááâááááá¹áâáá¸âáááá á¶áâáááááâááâáá¶áâá¢áá·ááááá¸áâááá¶áâá¢áááâáááá¾ áá·áâáá¶áâááááá¼áâááááâáá¸áá½ááá Tor áá¹áâáááá¾âá²ááâá áá¶á áááâááááâá¢áááââáá¾áâá¢áá¶áá·á, á á¾áâáá¶âáá¹áâá¢áá·ááááá¸áâá¢ááá¸âáááááááá¶áâááá¶áâá¢ááá áá·áâááááá¶áâ Tor ááááâá¢áááá Tor áá¹áâá¢áá·ááááá¸áâá áá¶á áááâááááâá¢áááâááâáááâáá âáááá»áâááááá¶á Tor , ááá»ááááâáá¶âáá·áâá¢á¶á âá¢áá·ááááá¸áâá áá¶á áááâááááâá¢áááâááá¶áâááááá¶á Tor áá·ááá âá á»ááááááâááááâáá¶á -If you are communicating sensitive information, for example when logging on to a website with a username and password, make sure that you are using HTTPS (e.g. https://torproject.org/, not http://torproject.org/). + ááááá·ááá¾âá¢áááâááá½áâáá¶áâáááááá¶á, á§áá¶á ááá áá âáááâá¢áááâá á¼áâáá âáááááâááááá¶áâáááá¾âáá¶áááâá
[tor-commits] [translation/tsum] Update translations for tsum
commit 98fa8d28510d51244a6edc2714da5ea0e89fb3bf Author: Translation commit bot Date: Mon Feb 3 03:45:07 2014 + Update translations for tsum --- km/short-user-manual_km_noimg.xhtml |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index 56b58d3..0957aca 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -27,7 +27,7 @@ áá»áâáááâáááá¾ááá¶á Tor Browser Bundle, á¢áááâáá½áááâáááá¶ááâáá¶âá¢áááâáá¶áâááááâáááá¹ááááá¼áá áááááá·áá¸âáááâáá¶áâááá½áâáá¶áâáá¶áá½áâá¯ááá¶áâáááâáá¶áâáááááâáá¼á âáááá¶âáá¶âáááá áá áá·áâáááááâáááááá .asc á á¯ááá¶á .asc áááâáá¶âá ááááááᶠGPG á á¾áâá¢áá»áááá¶áâá²ááâá¢áááâááááááááá¶ááâá¯ááá¶áâáááâá¢áááâáá¶áâáá¶áâááâáááâáá¶ááâáá¶ááâáá½áâáááâáá¾áâáá¶áâáááááâá²ááâá¢áááâááá½áâáá¶áá áá»áâáááâá¢áááâááááááááá¶ááâá ááááááᶠá¢áááâáááá¼áâáá¶áâáá á á¾áâááá¡á¾á GnuPG á -Windows: http://gpg4win.org/download.html";>http://gpg4win.org/download.htmlMac OS X: http://macgpg.sourceforge.net/";>http://macgpg.sourceforge.net/Linux: Most Linux distributions come with GnuPG preinstalled. +áá¸ááá¼: http://gpg4win.org/download.html";>http://gpg4win.org/download.htmlMac OS X: http://macgpg.sourceforge.net/";>http://macgpg.sourceforge.net/áá¸áá»á á áá¶áâáááá ááâáá¸áá»á âáá¶âá ááá¾áâáá¶áâáá¶áá½á GnuPG áá»áâááá¡á¾áá áá¼áâá ááá¶áâáá¶âá¢áááâáááá¼áâááâáááá¼á áá·áâáá¶áááâááááá¶âáááâáá¶áâáááá¾âáá¶áááááá áá¾áááá¸âááá½áâáá¶áâáᶠáá¾áááá¸âá á¼áâáááá¾ááá¶áâáá âáá¾âááááááááâááááâá¢áááá Erinn Clark signs the Tor Browser Bundles with key 0x63FEE659. To import Erinn's key, run: @@ -125,8 +125,8 @@ sub 2048R/EB399FD7 2003-10-16 á ááá¶áâáá¶âáááááá·áá¸âá¢áá¸áááºáá·áâáá¹áâáá·áâá áá á¶áâáá¶âá¢áááâáá¶áâáááá¶áá trial áá âáááâá¢áááâáá·áâáá¶, áá¼á ááááâá¢áááâáá¹áââáááá¼áâáááá¶áá trial á¡á¾áâáá·áâááááá¶ááâáá¸âá¢áááâáááá¾ááá¶á Tor Browser Bundle á áá¼áâáá¾á https://www.torproject.org/torbutton/torbutton-faq.html#noflash";>Torbutton FAQ ááááá¶ááâáááááá¶áâááááááá áááá»áâá ááâáááá¾âáááááá·áá¸âá¢áá¸áááºáá·áâááááá -ááááá¶ááâá ááá»âááâáá»ááááá·áá¶á, áá¾áâáá¶áâáááááâá¢áá»áá¶áááâá²ááâá¢áááâáá»áááâááâááááá¶áâáá¶áâááá Tor áááâáááá¾ Tor Browser Bundle á It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks. -Why Tor is slow -Tor can sometimes be a bit slower than your normal Internet connection. After all, your traffic is sent through many different countries, sometimes across oceans around the world! +ááááá¶ááâá ááá»âááâáá»ááááá·áá¶á, áá¾áâáá¶áâáááááâá¢áá»áá¶áááâá²ááâá¢áááâáá»áááâááâááááá¶áâáá¶áâááá Tor áááâáááá¾ Tor Browser Bundle á áá¶âáá¶âáá áá áááááâáááâá¢á¶á âáááá¾ Tor áá¶áá½áâáááááá·áá¸âá¢áá¸áááºáá·áâááááááâááá, ááá»ááááâáááâáá¶áâáááá¾âáá¼á ááááââá¢áááâá¢á¶á âáá¾áâáááâáááá½áâá¯áâá +á ááá»âá¢ááḠTor ááºá +áááâáááá Tor á¢á¶á âáá¶âááá¸áâáááâááºáâáá¶áâáá¶áâááááá¶ááâá¢áá¸áááºáá·
[tor-commits] [torspec/master] fix some typos on proposal 220
commit 7ab099c16aec1b30b0c9217793afb8391ba70a56 Author: Roger Dingledine Date: Sun Feb 2 22:32:53 2014 -0500 fix some typos on proposal 220 --- proposals/220-ecc-id-keys.txt | 33 + 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/proposals/220-ecc-id-keys.txt b/proposals/220-ecc-id-keys.txt index ebbc3b5..b14fea7 100644 --- a/proposals/220-ecc-id-keys.txt +++ b/proposals/220-ecc-id-keys.txt @@ -59,7 +59,7 @@ Status: Draft 1.1. 'Personalized' signatures Each of the keys introduced here is used to sign more than one kind - of document. While these documents should be unambiguous, I'd going + of document. While these documents should be unambiguous, I'm going to forward-proof the signatures by specifying each signature to be generated, not on the document itself, but on the document prefixed with some distinguishing string. @@ -106,7 +106,7 @@ Status: Draft SIGNATURE [64 Bytes] FIXED_PREFIX is "REVOKEID" or "REVOKESK". VERSION is [01]. KEYTYPE is - [01] for revoking a signing key or [02] or revoking an identity key. + [01] for revoking a signing key or [02] for revoking an identity key. REVOKED_KEY is the key being revoked; IDENTITY_KEY is the node's Ed25519 identity key. PUBLISHED is the time that the document was generated, in seconds since the epoch. EXTRA_STUFF is left for a @@ -132,7 +132,7 @@ Status: Draft But we also support offline identity keys: * When a Tor node starts with an Ed25519 public identity key - but no private identity key, it checks wither it has + but no private identity key, it checks whether it has a currently valid certified signing keypair. If it does, it starts. Otherwise, it refuses to start. * If a Tor node's signing key is going to expire soon, it starts @@ -152,9 +152,9 @@ Status: Draft signing key and checking the signature before fully parsing the rest of the document. -NM] - When an identity-ed25519 element is present, there must also be an + When an identity-ed25519 element is present, there must also be a "router-signature-ed25519" element. It MUST be the next-to-last - element in the descriptor, appearing immediately before RSA + element in the descriptor, appearing immediately before the RSA signature. It MUST contain an ed25519 signature of the entire document, from the first character up to but not including the "router-signature-ed25519" element, prefixed with the string "Tor @@ -162,9 +162,9 @@ Status: Draft "router-signature-ed25519" SP signature NL - Were 'signature' is encoded in base64 with terminating =s removed. + Where 'signature' is encoded in base64 with terminating =s removed. - The identity key in the identity-ed25519 key MUST be the one used to + The identity-key in the identity-ed25519 key MUST be the one used to sign the certification, and the signing key in the certification MUST be the one used to sign the document. @@ -204,9 +204,9 @@ Status: Draft appear in router descriptors. Additionally, we add the base64-encoded, =-stripped SHA256 digest of - a node's extra-info document field to the extra-info-digest line. - (All versions of Tor that recognize this line allow an extra field - there.) + a node's extra-info document field to the extra-info-digest line in + the router descriptor. (All versions of Tor that recognize this line + allow an extra field there.) 2.3.3. A note on signature verification @@ -259,7 +259,7 @@ Status: Draft "id" SP ed25519-identity NL - where ed25519-identity is base-64 encoded, with trailing = characters + where ed25519-identity is base64-encoded, with trailing = characters omitted. In vote documents, it may be replaced by the format: "id" SP "none" NL @@ -348,7 +348,7 @@ Status: Draft 7: RSA cross-certification for Ed25519 identity key The content of certificate type 4 is: -Ed25519 identity key [32 byets] +Ed25519 identity key [32 bytes] Signing key certificate as in 2.1 above [variable length] The content of certificate type 5 is: @@ -463,9 +463,9 @@ Status: Draft Anywhere in the interface that takes an $identity should be able to take an ECC identity too. ECC identities are case-sensitive base64 encodings of Ed25519 identity keys. You can use $ to indicate them as - well; we distinguish RSA identity digests length. + well; we distinguish RSA identity digests by length. - When we need to indicate an Ed25519 identity key in an hostname + When we need to indicate an Ed25519 identity key in a hostname format (as in a .exit address), we use the lowercased version of the name, and perform a case-insensitive match. (This loses us a little less than one bit per byte of name, leaving plenty of bits to make
[tor-commits] [translation/tsum] Update translations for tsum
commit 4efde09200c7f391273c4150bc30a17438017b33 Author: Translation commit bot Date: Mon Feb 3 03:15:07 2014 + Update translations for tsum --- km/short-user-manual_km_noimg.xhtml | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index 57c0c6d..56b58d3 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -118,14 +118,14 @@ sub 2048R/EB399FD7 2003-10-16 You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems: á¢áááâáááá»áâáááá¾ááá¶á Vidalia áá·á Tor á á¾áá á§áá¶á ááá, áááá¶ááá¶áâáááâá¢á¶á âáá¾áâá¡á¾á ááááá·ááá¾âá¢áááâáá¶áâááá¡á¾á Vidalia bundle á¥á¡á¼áâáááâá¢áááâáááá»áâáááá¶áá¶áâáááá¾ááá¶á Tor Browser Bundle á áá âáááá»áâáááá¸âááá, á¢áááâáá¹áâáááá¼áâáá·áâ Tor áá·á Vidalia á á¶áá áá»áâáááâá¢áááâáááá¾ááá¶áá Vidalia crashed, but left Tor running: If the dialog that prompts you for a control password has a Reset button, you can click the button and Vidalia will restart Tor with a new random control password. If you do not see a Reset button, or if Vidalia is unable to restart Tor for you; go into your process or task manager, and terminate the Tor process. Then use Vidalia to restart Tor. -For more information, see the https://torproject.org/docs/faq.html#VidaliaPassword";>FAQ on the Tor Project website. -Flash does not work -For security reasons, Flash, Java, and other plugins are currently disabled for Tor. Plugins operate independently from Firefox and can perform activity on your computer that ruins your anonymity. -Most YouTube videos work with HTML5, and it is possible to view these videos over Tor. You need to join the https://www.youtube.com/html5";>HTML5 trial on the YouTube website before you can use the HTML5 player. -Note that the browser will not remember that you joined the trial once you close it, so you will need to re-join the trial the next time you run the Tor Browser Bundle. -Please see the https://www.torproject.org/torbutton/torbutton-faq.html#noflash";>Torbutton FAQ for more information. -I want to use another browser -For security reasons, we recommend that you only browse the web through Tor using the Tor Browser Bundle. It is technically possible to use Tor with other browsers, but by doing so you open yourself up to potential attacks. +áááááá¶áâááááááâáá¼áâáá¾á https://torproject.org/docs/faq.html#VidaliaPassword";>FAQ áá âáá¾âáááááâááááá¶áâáááááá Tor á +á§áááááâáááá»áâá áááâáá·áâáááá¾ááá¶á +ááááá¶ááâá ááá»âááâáá»ááááá·áá¶á, Flash, Java, áá·áâáááááá·áá¸âáááá½áâááááááâáááâáááá¼áâáá¶áâáá·áâáá áá á»ááááááâááááá¶áá Tor á áááááá·áá¸âáááá½áâáááá¾ááá¶áâáááâá¯ááá¶áááâáḠFirefox á á¾áâá¢á¶á âáááá¾âááááááá¶áâáá âáá¾âáá»ááááá¼áááâááááâá¢áááâáááâá¢á¶á âáá¶áááááâá¢áá¶áá·áâáá¶áâááááâá¢áááá +áá¸ááá¢á¼â YouTube áá¶âá ááá¾áâáááá¾ááá¶áâáá¶áá½á HTML5, á á¾áâáá¶âá¢á¶á âáá¾áâáá¾áâáá·ááááá¶áâáá¸ááá¢á¼âáá¶áááááâáá¾ Tor á á¢áááâáááá¼áâáááá¶áá https://www.youtube.com/html5";>HTML5 trial áá¾âáááááâááááá¶á YouTube áá»áâáááâá¢áááâá¢á¶á âáááá¾âáááááá·áá¸âá á¶áá HTML5 á +á ááá¶áâáá¶âáááááá·áá¸âá¢áá¸áááºáá·áâáá¹áâáá·áâá áá á¶áâáá¶âá¢áááâáá¶áâáááá¶áá trial áá âáááâá¢áááâáá·áâáá¶, áá¼á ááááâá¢áááâáá¹áââáááá¼áâáááá¶áá trial á¡á¾áâáá·áâááááá¶ááâáá¸âá¢áááâáááá¾ááá¶á Tor Browser Bundle á +áá¼áâáá¾á https://www.torproject.org/torbutton/torbutton-faq.html#noflash";>Torbutton FAQ ááááá¶ááâáááááá¶áâá
[tor-commits] [translation/tsum] Update translations for tsum
commit d7111c2fcfe4eff38abc35fb04eb7baae22b5460 Author: Translation commit bot Date: Mon Feb 3 02:15:07 2014 + Update translations for tsum --- km/short-user-manual_km_noimg.xhtml | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index 5556355..57c0c6d 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -92,31 +92,31 @@ sub 2048R/EB399FD7 2003-10-16 áááááâáááâáá¹áâáá¶áâá áááá¾áâáááá½áââáá¼áá âáá½áâá ááá½áá ááááá·ááá¾âáááá½áâááááâá¢áááâáá·áâáá¶áââáááááá¶áâáá âáá¸ááá, áá¼áâáááá¾âá¢áá¸áááâáá h...@rt.torproject.org á áá·áâá¢á¶á âáá¾áâááááááá¶áâáááááâá áá ááááá·ááá¾âá¢áááâáááá»áâáááá¾âáá¸ááá¼ á á¾áâáááááááâáá¶âáááâá¢áááâáá·áâá¢á¶á âáááááâá ááâááááááá¶á, áá¶áâáá áá·áâááá¡á¾á http://www.7-zip.org/";>7-Zipá -If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions: +ááááá·ááá¾âá¢áááâáá·áâá¢á¶á âáá¶áâáá 7-Zip, áááá¶áá¶áâáááá¼áâáááááâá¯ááá¶áâáḠ.z to .zip á á¾áâáááá¾ winzip áá¾áááá¸âáááááâááááááá¶áá áá»áâáááâáááá¼áâáááááâá¯ááá¶á, ááááá¾áâá²ááâáá¸ááá¼âáááá á¶áâáááááâááááááâá¯ááá¶áá Windows XP - Open My Computer - Click on Tools and choose Folder Options... in the menu - Click on the View tab - Uncheck Hide extensions for known file types and click OK + áá¾á áá»ááááá¼áááâááááâáááá»á + á á»á âáá¾ á§ááááá á á¾áâáááá¾á ááááá¾áâáá... áááá»áâáááºáá»á + á á»á âáá¾âáááá¶áá áá·ááááá¶á + áááâáá¸á áááááâááááááâáááâáá¶áâáá¶ááâááááá¶ááâááááááâá¯ááá¶áâáááâáá·áâáááá¶áá á á¾áâá á»á âáá¾ áááâáááá Windows Vista - Open Computer - Click on Organize and choose Folder and search options in the menu - Click on the View tab - Uncheck Hide extensions for known file types and click OK + áá¾á áá»ááááá¼ááá + á á»á âáá¾ áááá á á á¾áâáááá¾á ááâ á á¾áâáááááááâááááá¾á áááá»áâáááºáá»á + á á»á âáá¾âáááá¶áá áá·ááááá¶á + áááâáá¸á áááááâááááááâáááâáá¶áâáá¶ááâááááá¶ááâááááááâá¯ááá¶áâáááâáá·áâáááá¶áá á á¾áâá á»á âáá¾ áááâáááá Windows 7 - Open Computer - Click on Organize and choose Folder and search options in the menu - Click on the View tab - Uncheck Hide extensions for known file types and click OK + áá¾á áá»ááááá¼ááá + á á»á âáá¾ áááá á á á¾áâáááá¾á ááâ á á¾áâáááááááâááááá¾á áááá»áâáááºáá»á + á á»á âáá¾âáááá¶áá áá·ááááá¶á + áááâáá¸á áááááâááááááâáááâáá¶áâáá¶ááâááááá¶ááâááááááâá¯ááá¶áâáááâáá·áâáááá¶áá á á¾áâá á»á âáá¾ áááâáááá -Vidalia asks for a password +Vidalia áááá¾âáá¶áááâááááá¶áá You should not have to enter a password when starting Vidalia. If you are prompted for one, you are likely affected by one of these problems: -You are already running Vidalia and Tor: For example, this situation can happen if you installed the Vidalia bundle and now you're trying to run the Tor Browser Bundle. In that case, you will need to close the old Vidalia and Tor before you can run this one. +á¢áááâáááá»áâáááá¾ááá¶á Vidalia áá·á T
[tor-commits] [translation/tsum] Update translations for tsum
commit 27acc5c0d72f68f19dd5b7e86473170a700df47e Author: Translation commit bot Date: Mon Feb 3 01:45:07 2014 + Update translations for tsum --- km/short-user-manual_km_noimg.xhtml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/km/short-user-manual_km_noimg.xhtml b/km/short-user-manual_km_noimg.xhtml index 33ef726..5556355 100644 --- a/km/short-user-manual_km_noimg.xhtml +++ b/km/short-user-manual_km_noimg.xhtml @@ -85,13 +85,13 @@ sub 2048R/EB399FD7 2003-10-16 áá âáá¾ââááááá¶áá á¢á¶áááááá¶á , áááá á¼áâá¢á¶áááááá¶áâáááá¼áááá¸âáá¾áá áá¶âá¢á¶á âáá¶âáááááâááá¶ááá¸á á¬âá¢á¶áááááá¶á IP á áááá á¼áâá áááâááááá¶ááâáááá¼áááá¸á áá¶âáá¼áá , á¢áááâáá·áâáááá¼áâáá¶áâáá¶áááâááááá¶áá á¬âáááááâá¢áááâáááá¾á ááááá·ááá¾âá¢áááâáááá¼ááá¶á, áááá á¼áâáááááá¶áâáá âáááá»áâáá¶áâáááá¹ááááá¼áá - Choose the Type of proxy you are using, whether HTTP/HTTPS, SOCKS4, or SOCKS5. - Push the OK button. Vidalia and Tor are now configured to use a proxy to access the rest of the Tor network. + áááá¾á áááááá ááâáááá¼áááá¸âáááâá¢áááâáááá»áâáááá¾, áá¶âáá¾ HTTP/HTTPS, SOCKS4, ᬠSOCKS5 á + á á»á âááá¼áá»á ááááááá á Vidalia áá·á Tor áááá¼áâáá¶áâáááááâáá áá¶ááááááááâá¥á¡á¼áâáááâáááá»áâáá¶áâáááá¾âáááá¼áááḠáá¾áááá¸âáááá¾ááá¶áâááá¢á¶áâááááá¶á Tor á -Frequently Asked Questions -This section will answer some of the most common questions. If your question is not mentioned here, please send an email to h...@rt.torproject.org. -Unable to extract the archive -If you are using Windows and find that you cannot extract the archive, download and install http://www.7-zip.org/";>7-Zip. +áááá½áâáááâáá¶áâáá½áâáá¶âáá¹ááá¶áá +áááááâáááâáá¹áâáá¶áâá áááá¾áâáááá½áââáá¼áá âáá½áâá ááá½áá ááááá·ááá¾âáááá½áâááááâá¢áááâáá·áâáá¶áââáááááá¶áâáá âáá¸ááá, áá¼áâáááá¾âá¢áá¸áááâáá h...@rt.torproject.org á +áá·áâá¢á¶á âáá¾áâááááááá¶áâáááááâá áá + ááááá·ááá¾âá¢áááâáááá»áâáááá¾âáá¸ááá¼ á á¾áâáááááááâáá¶âáááâá¢áááâáá·áâá¢á¶á âáááááâá ááâááááááá¶á, áá¶áâáá áá·áâááá¡á¾á http://www.7-zip.org/";>7-Zipá If you are unable to download 7-Zip, try to rename the file from .z to .zip and use winzip to extract the archive. Before renaming the file, tell Windows to show file extensions: Windows XP ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add a sandbox rule to allow IP_TRANSPARENT
commit 25f0eb4512a57e305ed0bff00eb276812a7c8de6 Author: Nick Mathewson Date: Sun Feb 2 15:47:48 2014 -0500 Add a sandbox rule to allow IP_TRANSPARENT --- src/common/sandbox.c |8 1 file changed, 8 insertions(+) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index dec6bfe..6b78748 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -475,6 +475,14 @@ sb_setsockopt(scmp_filter_ctx ctx, sandbox_cfg_t *filter) if (rc) return rc; +#ifdef IP_TRANSPARENT + rc = seccomp_rule_add(ctx, SCMP_ACT_ALLOW, SCMP_SYS(setsockopt), 2, + SCMP_CMP(1, SCMP_CMP_EQ, SOL_IP), + SCMP_CMP(2, SCMP_CMP_EQ, IP_TRANSPARENT)); + if (rc) +return rc; +#endif + return 0; } ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Add support for TPROXY via new TransTPRoxy option
commit 09ccc4c4a3b67695295ad95f24b2f102d5f2fa1a Author: Nick Mathewson Date: Fri Jan 31 12:59:35 2014 -0500 Add support for TPROXY via new TransTPRoxy option Based on patch from "thomo" at #10582. --- changes/10582_tproxy |7 +++ doc/tor.1.txt| 13 + src/or/config.c | 26 ++ src/or/connection.c | 11 +++ src/or/or.h |2 ++ 5 files changed, 55 insertions(+), 4 deletions(-) diff --git a/changes/10582_tproxy b/changes/10582_tproxy new file mode 100644 index 000..3609d56 --- /dev/null +++ b/changes/10582_tproxy @@ -0,0 +1,7 @@ + o Minor features: + +- Add support for the TPROXY transparent proxying facility on Linux. + See documentation for the new TransTRPOXY option for more details. + Implementation by "thomo". Closes ticket 10582. + + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 28e7c5d..69452a0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1183,6 +1183,19 @@ The following options are useful only for clients (that is, if compatibility, TransListenAddress is only allowed when TransPort is just a port number.) +[[TransTPROXY]] **TransTPROXY** **0**|**1**:: +TransTPROXY may only be enabled when there is transparent proxy listener +enabled and only for Linux. + + +Set this 1 if you wish to be able to use the TPROXY linux module to +transparently proxy connections that are configured using the TransPort +option. This setting lets the listener on the TransPort accept connections +for all addresses, even when the TransListenAddress is configured for an +internal address. Detailed information on how to configure the TPROXY +feature can be found in the Linux kernel source tree in the file +Documentation/networking/tproxy.txt. +(Default: 0) + [[NATDPort]] **NATDPort** \['address':]__port__|**auto** [_isolation flags_]:: Open this port to listen for connections from old versions of ipfw (as included in old versions of FreeBSD, etc) using the NATD protocol. diff --git a/src/or/config.c b/src/or/config.c index d348f10..a2366c0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -408,6 +408,7 @@ static config_var_t option_vars_[] = { OBSOLETE("TrafficShaping"), V(TransListenAddress, LINELIST, NULL), VPORT(TransPort, LINELIST, NULL), + V(TransTPROXY, BOOL, "0"), V(TunnelDirConns, BOOL, "1"), V(UpdateBridgesFromAuthority, BOOL, "0"), V(UseBridges, BOOL, "0"), @@ -2530,10 +2531,27 @@ options_validate(or_options_t *old_options, or_options_t *options, "undefined, and there aren't any hidden services configured. " "Tor will still run, but probably won't do anything."); -#ifndef USE_TRANSPARENT - /* 024 I think we can remove this TransListenAddress */ - if (options->TransPort_set || options->TransListenAddress) -REJECT("TransPort and TransListenAddress are disabled in this build."); +#ifdef USE_TRANSPARENT + if (options->TransTPROXY) { +#ifndef __linux__ +REJECT("TransTPROXY is a Linux-specific feature.") +#endif +if (!options->TransPort_set) { + REJECT("Cannot use TransTPROXY without any valid TransPort or " + "TransListenAddress."); +} +/* Friendly suggestion about running as root initially. */ +if (!options->User) { + log_warn(LD_CONFIG, + "You have enabled TransTPROXY but have not specified the " + "\"User\" option. TransTPROXY will not function without " + "root privileges."); +} + } +#else + if (options->TransPort_set || options->TransTPROXY) +REJECT("TransPort, TransListenAddress, and TransTPROXY are disabled " + "in this build."); #endif if (options->TokenBucketRefillInterval <= 0 diff --git a/src/or/connection.c b/src/or/connection.c index 1f6e11f..7d8feeb 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1035,6 +1035,17 @@ connection_listener_new(const struct sockaddr *listensockaddr, make_socket_reuseable(s); +#if defined USE_TRANSPARENT && defined(IP_TRANSPARENT) +if (options->TransTPROXY && type == CONN_TYPE_AP_TRANS_LISTENER) { + int one = 1; + if (setsockopt(s, SOL_IP, IP_TRANSPARENT, &one, sizeof(one)) < 0) { +int e = tor_socket_errno(s); +log_warn(LD_NET, "Error setting IP_TRANSPARENT flag: %s", + tor_socket_strerror(e)); + } +} +#endif + #ifdef IPV6_V6ONLY if (listensockaddr->sa_family == AF_INET6) { #ifdef _WIN32 diff --git a/src/or/or.h b/src/or/or.h index 7df6c37..55f2862 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3553,6 +3553,8 @@ typedef struct { config_line_t *SocksPort_lines; /** Ports to listen on for transparent pf/netfilter connections. */ config_line_t *TransPort_lines; + int TransTPROXY; /** < Boolean: are we going to listen for all destinations +
[tor-commits] [tor/master] Move the friendly warning about TPROXY and root to EPERM time
commit fd8947afc2815cc3316513fe4461d8d8096eddea Author: Nick Mathewson Date: Sun Feb 2 15:45:00 2014 -0500 Move the friendly warning about TPROXY and root to EPERM time I'm doing this because: * User doesn't mean you're running as root, and running as root doesn't mean you've set User. * It's possible that the user has done some other capability-based hack to retain the necessary privileges. --- src/or/config.c |7 --- src/or/connection.c |8 ++-- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index a2366c0..c921bb7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2540,13 +2540,6 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("Cannot use TransTPROXY without any valid TransPort or " "TransListenAddress."); } -/* Friendly suggestion about running as root initially. */ -if (!options->User) { - log_warn(LD_CONFIG, - "You have enabled TransTPROXY but have not specified the " - "\"User\" option. TransTPROXY will not function without " - "root privileges."); -} } #else if (options->TransPort_set || options->TransTPROXY) diff --git a/src/or/connection.c b/src/or/connection.c index 7d8feeb..6dbba66 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1039,9 +1039,13 @@ connection_listener_new(const struct sockaddr *listensockaddr, if (options->TransTPROXY && type == CONN_TYPE_AP_TRANS_LISTENER) { int one = 1; if (setsockopt(s, SOL_IP, IP_TRANSPARENT, &one, sizeof(one)) < 0) { +const char *extra = ""; int e = tor_socket_errno(s); -log_warn(LD_NET, "Error setting IP_TRANSPARENT flag: %s", - tor_socket_strerror(e)); +if (e == EPERM) + extra = "TransTPROXY requires root privileges or similar" +" capabilities."; +log_warn(LD_NET, "Error setting IP_TRANSPARENT flag: %s.%s", + tor_socket_strerror(e), extra); } } #endif ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tor/master] Merge branch 'feature_10582'
commit cac5949697ba1686fd3c5f3b17960273815a6a93 Merge: 4fe253e 25f0eb4 Author: Nick Mathewson Date: Sun Feb 2 15:48:27 2014 -0500 Merge branch 'feature_10582' changes/10582_tproxy |7 +++ doc/tor.1.txt| 13 + src/common/sandbox.c |8 src/or/config.c | 19 +++ src/or/connection.c | 15 +++ src/or/or.h |2 ++ 6 files changed, 60 insertions(+), 4 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits