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

[atlas/master] Correctly display contact if undefined.
by karsten＠torproject.org 17 Jul '13

17 Jul '13

commit bb8721ba6ab1f208ebd8cd9e0c3457943ea17b1b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 17 12:39:15 2013 +0200 Correctly display contact if undefined. Previously, we'd display the contact of the previously shown relay. Fixes #9281. --- js/models/relay.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/models/relay.js b/js/models/relay.js index e1e74fb..ab48b74 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -135,6 +135,7 @@ define([ if (data.relays.length >= 1) { var relay = data.relays[0]; //console.log(data); + relay.contact = relay.contact ? relay.contact : 'undefined'; relay.bandwidth = relay.advertised_bandwidth ? relay.advertised_bandwidth : null; relay.bandwidth_hr = relay.advertised_bandwidth ? hrBandwidth(relay.advertised_bandwidth) : null; relay.family = relay.family ? relay.family : null;

1 0

[metrics-db/master] Warn if assignments.log contains duplicate fingerprints.
by karsten＠torproject.org 17 Jul '13

17 Jul '13

commit 4ce2bb867b3cf9fada741ee5cf7af0c95d0a091c Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jul 17 12:28:11 2013 +0200 Warn if assignments.log contains duplicate fingerprints. --- .../db/bridgepools/BridgePoolAssignmentsProcessor.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java b/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java index 77cfd7a..4735d35 100644 --- a/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java +++ b/src/org/torproject/ernie/db/bridgepools/BridgePoolAssignmentsProcessor.java @@ -14,7 +14,9 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; import java.util.SortedSet; import java.util.Stack; import java.util.TimeZone; @@ -101,6 +103,7 @@ public class BridgePoolAssignmentsProcessor extends Thread { SimpleDateFormat filenameFormat = new SimpleDateFormat("yyyy/MM/dd/yyyy-MM-dd-HH-mm-ss"); filenameFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + String duplicateFingerprint = null; long maxBridgePoolAssignmentTime = 0L; for (File assignmentFile : assignmentFiles) { logger.info("Processing bridge pool assignment file '" @@ -117,6 +120,7 @@ public class BridgePoolAssignmentsProcessor extends Thread { String line, bridgePoolAssignmentLine = null; SortedSet<String> sanitizedAssignments = new TreeSet<String>(); boolean wroteLastLine = false, skipBefore20120504125947 = true; + Set<String> hashedFingerprints = null; while ((line = br.readLine()) != null || !wroteLastLine) { if (line != null && line.startsWith("bridge-pool-assignment ")) { String[] parts = line.split(" "); @@ -190,6 +194,7 @@ public class BridgePoolAssignmentsProcessor extends Thread { wroteLastLine = true; } else { bridgePoolAssignmentLine = line; + hashedFingerprints = new HashSet<String>(); } } else { String[] parts = line.split(" "); @@ -207,6 +212,10 @@ public class BridgePoolAssignmentsProcessor extends Thread { + line + "'. Aborting."); break; } + if (hashedFingerprints.contains(hashedFingerprint)) { + duplicateFingerprint = bridgePoolAssignmentLine; + } + hashedFingerprints.add(hashedFingerprint); String assignmentDetails = line.substring(40); sanitizedAssignments.add(hashedFingerprint + assignmentDetails); @@ -220,6 +229,12 @@ public class BridgePoolAssignmentsProcessor extends Thread { } } + if (duplicateFingerprint != null) { + logger.warning("At least one bridge pool assignment list contained " + + "duplicate fingerprints. Last found in assignment list " + + "starting with '" + duplicateFingerprint + "'."); + } + if (maxBridgePoolAssignmentTime > 0L && maxBridgePoolAssignmentTime + 330L * 60L * 1000L < System.currentTimeMillis()) {

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 17 Jul '13

17 Jul '13

commit dd56d413858870fc1d671d8ee701d261875e642c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 17 08:16:19 2013 +0000 Update translations for torcheck_completed --- kn/torcheck.po | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/kn/torcheck.po b/kn/torcheck.po new file mode 100644 index 0000000..041cb14 --- /dev/null +++ b/kn/torcheck.po @@ -0,0 +1,57 @@ +# TorCheck gettext template +# Copyright (C) 2008-2012 The Tor Project, Inc +# +# Translators: +# msj2, 2013 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-02-16 20:28+PDT\n" +"PO-Revision-Date: 2013-07-17 07:50+0000\n" +"Last-Translator: msj2\n" +"Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Generated-By: pygettext.py 1.5\n" +"Language: kn\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +msgid "Congratulations. Your browser is configured to use Tor." +msgstr "ಯಾಹೂ, ನಿಮ್ಮ ಬ್ರೌಸರ್ ಈಗ ಟಾರ್ ಬಳಸೋಕೆ ಸಿದ್ಧವಾಯ್ತು." + +msgid "" +"Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " +"for further information about using Tor safely. You are now free to browse " +"the Internet anonymously." +msgstr "ದಯವಿಟ್ಟು ಟಾರ್‌ ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಬಳಸೋಕೆ <a href=\"https://www.torproject.org/\"> ರೋಟಾರ್‌ ತಾಣ</a>ದಲ್ಲಿರೋ ಮಾಹಿತಿ ಓದಿ. ನೀವೀಗ ಅಂತರ್ಜಾಲವನ್ನ ಅನಾಮಿಕವಾಗಿ ಜಾಲಾಡಬಹುದು." + +msgid "There is a security update available for the Tor Browser Bundle." +msgstr "ಟಾರ್ ಬ್ರೌಸರ್‌ನ ಬಂಡಲ್‌ಗೆ ರಕ್ಷಣಾ ಹೊಸ ಅವೃತ್ತಿ ರೆಡಿಯಾಗಿದೆ." + +msgid "" +"<a href=\"https://www.torproject.org/download/download-easy.html\">Click " +"here to go to the download page</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">ಇಳಿಸಿಕೊಳ್ಳೋಕೆ ಕ್ಲಿಕ್ ಮಾಡಿ.<a>" + +msgid "Sorry. You are not using Tor." +msgstr "ಕ್ಷಮಿಸಿ, ನೀವು ಟಾರ್ ಬಳಸ್ತಾ ಇಲ್ಲ." + +msgid "" +"If you are attempting to use a Tor client, please refer to the <a " +"href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" +" href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " +"configuring your Tor client</a>." +msgstr "ಟಾರ್ ಬಳಸೋಕೆ ಪ್ರಯತ್ನ ಪಡ್ತಾ ಇದ್ದೀರಾ? <a href=\"https://www.torproject.org/\">ಟಾರ್‍ ತಾಣ</a>ಕ್ಕೆ ಹೋಗಿ ಅಲ್ಲಿರೋ<a href=\"https://www.torproject.org/docs/faq#DoesntWork\"> ಮಾಹಿತಿ </a>ಬಳಸಿ ಟಾರ್‍ ಗಿರಾಕಿಯನ್ನ ಬಳಸ್ಕೊಳ್ಳಿ." + +msgid "Sorry, your query failed or an unexpected response was received." +msgstr "ಕ್ಷಮಿಸಿ, ನಿಮ್ಮ ಪ್ರಶ್ನೆ ಫ಼ೀಲ್ ಆಯ್ತು ಅಥವಾ ಅಸಮಂಜಸ ಪ್ರತಿಕ್ರಿಯೆ ಸಿಕ್ಕಿದೆ." + +msgid "" +"A temporary service outage prevents us from determining if your source IP " +"address is a <a href=\"https://www.torproject.org/\">Tor</a> node." +msgstr "ಕ್ಷಮಿಸಿ ಸ್ವಾಮಿ/ತಾಯಿ, ನಿಮ್ಮ ಐ. ಪಿ. ವಿಳಾಸ <a href=\"https://www.torproject.org/\"> ಟಾರ್ ನೋಡ್ ಹೌದೋ,</a> ಅಲ್ವೋ ಅಂತ ಲೆಕ್ಕ ಹಾಕೋದಿಕ್ಕೆ ಸದ್ಯಕ್ಕೆ ತೊಂದ್ರೆ ಆಗ್ತಿದೆ." + +msgid "Your IP address appears to be: " +msgstr "ನಿಮ್ಮ ಐ. ಪಿ. ವಿಳಾಸ ಇದು ಅಂತ ಕಾಣ್ಸುತ್ತೆ:"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 17 Jul '13

17 Jul '13

commit 7dcb0f0a23b11bc2ee3bf12b2c939905156ecb5d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 17 08:16:15 2013 +0000 Update translations for torcheck --- kn/torcheck.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kn/torcheck.po b/kn/torcheck.po index 7aed970..041cb14 100644 --- a/kn/torcheck.po +++ b/kn/torcheck.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-07-17 07:45+0000\n" +"PO-Revision-Date: 2013-07-17 07:50+0000\n" "Last-Translator: msj2\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n" @@ -28,7 +28,7 @@ msgid "" msgstr "ದಯವಿಟ್ಟು ಟಾರ್‌ ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಬಳಸೋಕೆ <a href=\"https://www.torproject.org/\"> ರೋಟಾರ್‌ ತಾಣ</a>ದಲ್ಲಿರೋ ಮಾಹಿತಿ ಓದಿ. ನೀವೀಗ ಅಂತರ್ಜಾಲವನ್ನ ಅನಾಮಿಕವಾಗಿ ಜಾಲಾಡಬಹುದು." msgid "There is a security update available for the Tor Browser Bundle." -msgstr "" +msgstr "ಟಾರ್ ಬ್ರೌಸರ್‌ನ ಬಂಡಲ್‌ಗೆ ರಕ್ಷಣಾ ಹೊಸ ಅವೃತ್ತಿ ರೆಡಿಯಾಗಿದೆ." msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " @@ -51,7 +51,7 @@ msgstr "ಕ್ಷಮಿಸಿ, ನಿಮ್ಮ ಪ್ರಶ್ನೆ ಫ಼ೀ msgid "" "A temporary service outage prevents us from determining if your source IP " "address is a <a href=\"https://www.torproject.org/\">Tor</a> node." -msgstr "" +msgstr "ಕ್ಷಮಿಸಿ ಸ್ವಾಮಿ/ತಾಯಿ, ನಿಮ್ಮ ಐ. ಪಿ. ವಿಳಾಸ <a href=\"https://www.torproject.org/\"> ಟಾರ್ ನೋಡ್ ಹೌದೋ,</a> ಅಲ್ವೋ ಅಂತ ಲೆಕ್ಕ ಹಾಕೋದಿಕ್ಕೆ ಸದ್ಯಕ್ಕೆ ತೊಂದ್ರೆ ಆಗ್ತಿದೆ." msgid "Your IP address appears to be: " msgstr "ನಿಮ್ಮ ಐ. ಪಿ. ವಿಳಾಸ ಇದು ಅಂತ ಕಾಣ್ಸುತ್ತೆ:"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 17 Jul '13

17 Jul '13

commit 72cfa60b4d516088d5822de562b61e5eb81b1afe Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 17 07:46:42 2013 +0000 Update translations for mat-gui --- id.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id.po b/id.po index 30d2230..332db33 100644 --- a/id.po +++ b/id.po @@ -40,7 +40,7 @@ msgstr "" #: mat-gui:119 mat-gui:214 msgid "Check" -msgstr "" +msgstr "Periksa" #: mat-gui:121 msgid "Check selected files for harmful meta"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 17 Jul '13

17 Jul '13

commit 37111867433535ba5669124724853c36789982ff Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 17 07:46:13 2013 +0000 Update translations for torcheck --- kn/torcheck.po | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/kn/torcheck.po b/kn/torcheck.po index c98aeaa..7aed970 100644 --- a/kn/torcheck.po +++ b/kn/torcheck.po @@ -2,13 +2,14 @@ # Copyright (C) 2008-2012 The Tor Project, Inc # # Translators: +# msj2, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2013-06-18 22:31+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2013-07-17 07:45+0000\n" +"Last-Translator: msj2\n" "Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,13 +19,13 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" msgid "Congratulations. Your browser is configured to use Tor." -msgstr "" +msgstr "ಯಾಹೂ, ನಿಮ್ಮ ಬ್ರೌಸರ್ ಈಗ ಟಾರ್ ಬಳಸೋಕೆ ಸಿದ್ಧವಾಯ್ತು." msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "" +msgstr "ದಯವಿಟ್ಟು ಟಾರ್‌ ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ಬಳಸೋಕೆ <a href=\"https://www.torproject.org/\"> ರೋಟಾರ್‌ ತಾಣ</a>ದಲ್ಲಿರೋ ಮಾಹಿತಿ ಓದಿ. ನೀವೀಗ ಅಂತರ್ಜಾಲವನ್ನ ಅನಾಮಿಕವಾಗಿ ಜಾಲಾಡಬಹುದು." msgid "There is a security update available for the Tor Browser Bundle." msgstr "" @@ -32,20 +33,20 @@ msgstr "" msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">ಇಳಿಸಿಕೊಳ್ಳೋಕೆ ಕ್ಲಿಕ್ ಮಾಡಿ.<a>" msgid "Sorry. You are not using Tor." -msgstr "" +msgstr "ಕ್ಷಮಿಸಿ, ನೀವು ಟಾರ್ ಬಳಸ್ತಾ ಇಲ್ಲ." msgid "" "If you are attempting to use a Tor client, please refer to the <a " "href=\"https://www.torproject.org/\">Tor website</a> and specifically the <a" " href=\"https://www.torproject.org/docs/faq#DoesntWork\">instructions for " "configuring your Tor client</a>." -msgstr "" +msgstr "ಟಾರ್ ಬಳಸೋಕೆ ಪ್ರಯತ್ನ ಪಡ್ತಾ ಇದ್ದೀರಾ? <a href=\"https://www.torproject.org/\">ಟಾರ್‍ ತಾಣ</a>ಕ್ಕೆ ಹೋಗಿ ಅಲ್ಲಿರೋ<a href=\"https://www.torproject.org/docs/faq#DoesntWork\"> ಮಾಹಿತಿ </a>ಬಳಸಿ ಟಾರ್‍ ಗಿರಾಕಿಯನ್ನ ಬಳಸ್ಕೊಳ್ಳಿ." msgid "Sorry, your query failed or an unexpected response was received." -msgstr "" +msgstr "ಕ್ಷಮಿಸಿ, ನಿಮ್ಮ ಪ್ರಶ್ನೆ ಫ಼ೀಲ್ ಆಯ್ತು ಅಥವಾ ಅಸಮಂಜಸ ಪ್ರತಿಕ್ರಿಯೆ ಸಿಕ್ಕಿದೆ." msgid "" "A temporary service outage prevents us from determining if your source IP " @@ -53,4 +54,4 @@ msgid "" msgstr "" msgid "Your IP address appears to be: " -msgstr "" +msgstr "ನಿಮ್ಮ ಐ. ಪಿ. ವಿಳಾಸ ಇದು ಅಂತ ಕಾಣ್ಸುತ್ತೆ:"

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 17 Jul '13

17 Jul '13

commit b5389f197c745639890b776c43bf5c5e44d50300 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jul 17 07:45:13 2013 +0000 Update translations for orbot --- values-id/strings.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/values-id/strings.xml b/values-id/strings.xml index 1107c5b..310edda 100644 --- a/values-id/strings.xml +++ b/values-id/strings.xml @@ -15,12 +15,18 @@ <string name="menu_home">Home</string> <string name="menu_browse">Jelajahi</string> <string name="menu_settings">Pengaturan</string> + <string name="menu_log">Log</string> <string name="menu_info">Bantuan</string> <string name="menu_about">Mengenai</string> <string name="button_help">Bantuan</string> <string name="button_close">Dekat</string> <string name="button_about">Mengenai</string> + <string name="button_clear_log">Hapus Log</string> + <string name="menu_verify">Periksa</string> <string name="menu_exit">Keluar</string> + <string name="pref_transparent_all_title">Tor Semuanya</string> + <string name="pref_transparent_port_title">Daftar Port</string> + <string name="pref_has_root">Minta Akses Dasar</string> <string name="btn_back">Kembali</string> <string name="btn_cancel">Batal</string>

1 0

[tor-browser-bundle/master] Fix a typo during mingw rename.
by mikeperry＠torproject.org 17 Jul '13

17 Jul '13

commit 3feeca34f21fdd6ae5519154535b84028694c09d Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Jul 16 20:36:38 2013 -0700 Fix a typo during mingw rename. --- gitian/descriptors/windows/gitian-firefox.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/descriptors/windows/gitian-firefox.yml b/gitian/descriptors/windows/gitian-firefox.yml index f23bd10..e0f59c9 100644 --- a/gitian/descriptors/windows/gitian-firefox.yml +++ b/gitian/descriptors/windows/gitian-firefox.yml @@ -51,7 +51,7 @@ script: | # mkdir mingw-w64 cd mingw-w64 - unzip ../mingw-w64-svn-snapshot-*.zip + unzip ../mingw-w64-svn-snapshot.zip # mkdir mingw-w64-headers32 && cd mingw-w64-headers32 ../mingw-w64-svn/mingw-w64-headers/configure --host=i686-w64-mingw32 --prefix=/usr/i686-w64-mingw32/ --enable-sdk=all --enable-secure-api --enable-idl

1 0

r26257: {website} add new links, update mirror status. (in website/trunk: include press/en)
by Andrew Lewman 17 Jul '13

17 Jul '13

Author: phobos Date: 2013-07-17 02:28:11 +0000 (Wed, 17 Jul 2013) New Revision: 26257 Modified: website/trunk/include/mirrors-table.wmi website/trunk/press/en/press.wml Log: add new links, update mirror status. Modified: website/trunk/include/mirrors-table.wmi =================================================================== --- website/trunk/include/mirrors-table.wmi 2013-07-17 02:07:18 UTC (rev 26256) +++ website/trunk/include/mirrors-table.wmi 2013-07-17 02:28:11 UTC (rev 26257) @@ -222,6 +222,23 @@ <tr> + <td>LT</td> + + <td></td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.vesta.nu/dist/">http</a></td> + <td><a href="http://tor.vesta.nu/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>DE</td> <td></td> @@ -307,23 +324,6 @@ <tr> - <td>AT</td> - - <td>cyberarmy</td> - - <td>Up to date</td> - - <td> - </td> - <td> - </td> - <td><a href="http://tor.cyberarmy.at/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>NO</td> <td>MultiNet AS</td> @@ -511,6 +511,23 @@ <tr> + <td>US</td> + + <td>AskApache</td> + + <td>Up to date</td> + + <td> - </td> + <td><a href="http://tor.askapache.com/dist/">http</a></td> + <td><a href="http://tor.askapache.com/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>RU</td> <td>Soviet Anonymous</td> @@ -715,40 +732,6 @@ <tr> - <td>LT</td> - - <td></td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.vesta.nu/dist/">http</a></td> - <td><a href="http://tor.vesta.nu/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - - <td>US</td> - - <td>AskApache</td> - - <td>Up to date</td> - - <td> - </td> - <td><a href="http://tor.askapache.com/dist/">http</a></td> - <td><a href="http://tor.askapache.com/">http</a></td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> -</tr> - -<tr> - <td>TN</td> <td></td> @@ -936,6 +919,23 @@ <tr> + <td>AT</td> + + <td>cyberarmy</td> + + <td>Unknown</td> + + <td> - </td> + <td> - </td> + <td><a href="http://tor.cyberarmy.at/">http</a></td> + <td> - </td> + <td> - </td> + <td> - </td> + <td> - </td> +</tr> + +<tr> + <td>US</td> <td></td> Modified: website/trunk/press/en/press.wml =================================================================== --- website/trunk/press/en/press.wml 2013-07-17 02:07:18 UTC (rev 26256) +++ website/trunk/press/en/press.wml 2013-07-17 02:28:11 UTC (rev 26257) @@ -32,7 +32,44 @@ <th>Topic</th> </tr> </thead> +<tr> +<td>2013 Jul 01</td> +<td>Slice of MIT</td> +<td><a href="http://alum.mit.edu/pages/sliceofmit/2013/07/01/after-prism-asking-how-much…">After PRISM, Is Too Much Anonymity Possible?</a></td> +</td> +<tr> <tr style="background-color: #e5e5e5;"> +<td>2013 Jun 28</td> +<td>Mercury News</td> +<td><a href="http://www.mercurynews.com/business/ci_23561083/how-increase-your-online-pr…">How to increase your online privacy</a></td> +</tr> +<tr> +<td>2013 Jun 26</td> +<td>Reason.com</td> +<td><a href="http://reason.com/reasontv/2013/06/26/surf-without-surveillance-tors-karen-…">Reason Interviews Karen Reilly of The Tor Project Regarding Online Privacy</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Jun 21</td> +<td>Fast Company</td> +<td><a href="http://www.fastcompany.com/3013346/nsa-cramping-your-style-use-these-easy-e…">NSA cramping your style? Use these easy encryption solutions</a></td> +</tr> +<tr> +<td>2013 Jun 14</td> +<td>The Salt Lake Tribune</td> +<td><a href="http://www.sltrib.com/sltrib/world/56463680-68/privacy-data-nsa-disadvantag…">Ideas for keeping your data safe from spying</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> +<td>2013 Jun 11</td> +<td>Reflex (Czech)</td> +<td><a href="http://www.reflex.cz/clanek/zpravy/50756/soukromi-na-internetu-uz-neexistuj…">Privacy on the Internet already exists. But there's still Tor</a></td> +</tr> +<tr> +<td>2013 Apr 23</td> +<td>The Verge</td> +<td><a +href="http://www.theverge.com/2013/4/24/4259672/world-wide-redacted-inside-irans-…">World Wide [Redacted]: inside Iran's private internet</a></td> +</tr> +<tr style="background-color: #e5e5e5;"> <td>2012 Dec 17</td> <td>Wall Street Journal</td> <td><a href="http://online.wsj.com/article/SB10001424127887324677204578185382377144280.h…">Tor: An Anonymous, And Controversial, Way to Web-Surf</a></td>

1 0

r26256: {website} clarify right to change our minds (website/trunk/docs/en)
by Andrew Lewman 17 Jul '13

17 Jul '13

Author: phobos Date: 2013-07-17 02:07:18 +0000 (Wed, 17 Jul 2013) New Revision: 26256 Modified: website/trunk/docs/en/trademark-faq.wml Log: clarify right to change our minds Modified: website/trunk/docs/en/trademark-faq.wml =================================================================== --- website/trunk/docs/en/trademark-faq.wml 2013-07-14 05:24:52 UTC (rev 26255) +++ website/trunk/docs/en/trademark-faq.wml 2013-07-17 02:07:18 UTC (rev 26256) @@ -14,7 +14,7 @@ <h1>General Statement of Trademark and Copyright</h1> - <p>Content on this site is Copyright The Tor Project, Inc.. Reproduction of content is permitted under a <a href="https://creativecommons.org/licenses/by/3.0/us/">Creative Commons Attribution 3.0 United States License</a>. All use under such license must be accompanied by a clear and prominent attribution that identifies The Tor Project, Inc. as the owner and originator of such content. The Tor Project Inc. reserves the right to revoke the foregoing licenses and permissions at any time in its sole discretion.</p> + <p>Content on this site is Copyright The Tor Project, Inc.. Reproduction of content is permitted under a <a href="https://creativecommons.org/licenses/by/3.0/us/">Creative Commons Attribution 3.0 United States License</a>. All use under such license must be accompanied by a clear and prominent attribution that identifies The Tor Project, Inc. as the owner and originator of such content. The Tor Project Inc. reserves the right to change licenses and permissions at any time in its sole discretion.</p> <p>The Tor&#174 software is licensed in various ways. Learn more about the <a href="<page docs/faq>#DistributingTor">various licenses</a>.

1 0