[tor-commits] [tor-messenger-build/updater] Disable FTE on OS X (see #13252)

2016-08-30 Thread sukhbir
commit e6c8f91328dd3a1bd631420f8afe83a40a83e822
Author: Sukhbir Singh 
Date:   Tue Aug 30 22:25:25 2016 -0400

Disable FTE on OS X (see #13252)
---
 projects/tor-messenger/build.osx | 4 
 1 file changed, 4 insertions(+)

diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index a7b261f..5013d12 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -13,6 +13,10 @@ mkdir torbrowser
 cd torbrowser
 mkdir tor-launc...@torproject.org
 7z x -y -otor-launc...@torproject.org $rootdir/[% 
c('input_files_by_name/tor-launcher') %]
+
+# FTE is disabled on OS X. See #13252.
+sed -i '/default_bridge\.fte/d' $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js
+
 cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \
 tor-launc...@torproject.org/defaults/preferences/prefs.js
 7z x $rootdir/[% c('input_files_by_name/tor-browser') %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-messenger-build/master] Disable FTE on OS X (see #13252)

2016-08-30 Thread sukhbir
commit e6c8f91328dd3a1bd631420f8afe83a40a83e822
Author: Sukhbir Singh 
Date:   Tue Aug 30 22:25:25 2016 -0400

Disable FTE on OS X (see #13252)
---
 projects/tor-messenger/build.osx | 4 
 1 file changed, 4 insertions(+)

diff --git a/projects/tor-messenger/build.osx b/projects/tor-messenger/build.osx
index a7b261f..5013d12 100755
--- a/projects/tor-messenger/build.osx
+++ b/projects/tor-messenger/build.osx
@@ -13,6 +13,10 @@ mkdir torbrowser
 cd torbrowser
 mkdir tor-launc...@torproject.org
 7z x -y -otor-launc...@torproject.org $rootdir/[% 
c('input_files_by_name/tor-launcher') %]
+
+# FTE is disabled on OS X. See #13252.
+sed -i '/default_bridge\.fte/d' $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js
+
 cat $rootdir/Bundle-Data/PTConfigs/bridge_prefs.js >> \
 tor-launc...@torproject.org/defaults/preferences/prefs.js
 7z x $rootdir/[% c('input_files_by_name/tor-browser') %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[webwml/master] add the grants officer page…

2016-08-30 Thread sebastian
commit 66eb675a59a22bd79716185e17c06357608c7599
Author: Sebastian Hahn 
Date:   Wed Aug 31 02:36:53 2016 +0200

add the grants officer page…
---
 about/en/jobs-grants-officer.wml | 127 +++
 1 file changed, 127 insertions(+)

diff --git a/about/en/jobs-grants-officer.wml b/about/en/jobs-grants-officer.wml
new file mode 100644
index 000..3227fa6
--- /dev/null
+++ b/about/en/jobs-grants-officer.wml
@@ -0,0 +1,127 @@
+## translation metadata
+# Revision: $Revision: 25666 $
+# Translation-Priority: 3-low
+
+#include "head.wmi" TITLE="Tor Project: Jobs (Controller)" CHARSET="UTF-8"
+
+   
+Home  
+About  
+Jobs
+  
+   
+Internet Freedom Nonprofit Seeks Experienced Chief Financial and Grants 
Officer
+(Posted August 29, 2016)
+
+The Tor Project, Inc., is a 501(c)(3) organization headquartered in
+Seattle that provides the technical infrastructure for privacy
+protection over the Internet. With paid staff and contractors of around
+25 technologists and operational support people, plus many volunteers
+all over the world who contribute to our work, the Tor Project is funded
+in part by government grants and contracts, as well as by individual,
+foundation, and corporate donations. Our mission statement: “To advance
+human rights and freedoms by creating and deploying free and open
+anonymity and privacy technologies, supporting their unrestricted
+availability and use, and furthering their scientific and popular
+understanding.”
+We are currently seeking an Experienced Chief Financial and Grants
+Officer. This new, senior level position will report directly to the
+Executive Director and will manage the offsite Accounting Manager.
+
+The Chief Financial and
+Grants Officer will serve as the Tor Project's senior grants officer.
+Grant-related tasks include, but are not limited to:
+
+
+Oversee grants and contracts to ensure compliance with funder
+requirements and progress toward annual goals.
+Maintain positive relationships & communications with applicable
+government agencies.
+reate an interactive database of all grants and contracts in
+order to monitor and track them.
+Manage invoicing and billing of federal contracts to ensure full
+payment is received.
+Communicate the status of grant activities and progress toward
+objectives to stakeholders.
+Maintain files and documentation for our federal grants and
+contracts to ensure accuracy and compliance.
+
+
+In addition, the Chief
+Financial and Grants Officer will serve as the Tor Project's senior
+finance officer. Finance-related tasks for this position include, but
+are not limited to:
+
+
+Maintain accounting controls by preparing and recommending
+policies and procedures; review and upgrade as needed to ensure accuracy
+in accounting activities and compliance with any regulatory
+changes.
+Monitor and project cash flow.
+Provide oversight to ensure accounts payable and receivables are
+coded and prepared correctly.
+Work with outside auditors and CPA firm to furnish requisite data
+to ensure timely completion of annual audits and tax filings.
+Work closely with the Executive Director to prepare budgets and
+financial reports.
+Track expenditures and income of various programs to ensure
+financial sustainability.
+
+ The person we seek
+should have the following qualities, skills, and abilities:
+
+5+ years of experience with federal grants and contract
+acquisition and management
+5+ years of experience overseeing a nonprofit organization's
+accounting function; other relevant experience may substitute for a
+portion of this required experience
+Bachelor’s degree in business, finance, accounting, or a closely
+related field is ideal but not required; advanced graduate degree in one
+of the above fields is preferred; CPA license a plus
+Working knowledge of not-for-profit accounting in accordance with
+U.S. Generally Accepted Accounting Principles, Subpart F, of the new
+Uniform Grant Guidance (formerly OMB Circular A-133) and appropriate
+Code of Federal Regulations
+Knowledge of the grants management software landscape, and
+advanced skill and experience with at least one grants management
+software package
+Advanced skill and experience using QuickBooks, Sage (Peachtree),
+or some other organizational accounting program
+Alignment with Tor Project’s mission and a passion for privacy
+and encryption technology preferred
+Experience with FOSS (free/open-source software) preferred
+Proficient understanding of and ability to use technology;
+willingness and ability to learn and use new technologies
+Hard working and highly organized with superior attention to
+detail
+
+The Tor Project's workforce is smart, passionate, and dedicated.
+Experience working with open source communities and/or a commitment to
+Internet civil liberties are added pluses for any candidate applying for
+this position.
+
+Flexible salary, depending on experience. The Tor Project has a

[tor-commits] [webwml/master] Add grants officer job

2016-08-30 Thread sebastian
commit 85430d7eab73f405d758d8f37d87e80a2b0682dc
Author: Sebastian Hahn 
Date:   Wed Aug 31 02:34:18 2016 +0200

Add grants officer job
---
 about/en/jobs.wml | 30 +++---
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/about/en/jobs.wml b/about/en/jobs.wml
index 4a585f1..76330a9 100644
--- a/about/en/jobs.wml
+++ b/about/en/jobs.wml
@@ -12,25 +12,25 @@

 The Tor Project is always looking for more great people to join our 
team!
 
-At the moment, we don't have any official open positions. Please check back
-soon, though! In the meantime, you may want to glance at our
-volunteers page.
-
-#Specifically, we're looking for the following people currently:
-#
-#
-#Core OONI Developer
-##Writer/Editor
-##Administrative 
Assistant
-#
-#
+#At the moment, we don't have any official open positions. Please check back
+#soon, though! In the meantime, you may want to glance at our
+#volunteers page.
+#
+Specifically, we're looking for the following people currently:
+
+
+Chief Financial and Grants 
Officer
+#Writer/Editor
+#Administrative 
Assistant
+
+
 
 In the past, we looked for the following people:
 
 
-Core developer
-Support assistants and translators
-Browser hacker
+Core developer
+Support assistants and translators
+Browser hacker
 Pluggable transport developer
 Lead Automation Engineer
 Firefox/Thunderbird Extension Developer

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-messenger-build/updater] Remove redundant changelog entry

2016-08-30 Thread sukhbir
commit 02e824b96c0b12b3667fdc63297fab9afb719bfd
Author: Sukhbir Singh 
Date:   Mon Aug 29 14:41:58 2016 -0400

Remove redundant changelog entry
---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f1dbd50..c52645b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,6 @@ Tor Messenger 0.1.0b7 --
  * All Platforms
* Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45
* Use the THUNDERBIRD_45_3_0_RELEASE tag on comm-esr45
-   * Bug 14388: Port Tor Browser's updater patches
* Bug 19053: Display plaintext in notifications
* Bug 17363: Remove redundant Tor Messenger folders
* Bug 14388: Secure automatic updates for Tor Messenger



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-messenger-build/updater] Use the correct version in the changelog

2016-08-30 Thread sukhbir
commit 22a5e1f84dead1d2cfcca69ddf70aa69b7b3ad3f
Author: Sukhbir Singh 
Date:   Tue Aug 30 17:55:03 2016 -0400

Use the correct version in the changelog
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 81f01c2..ded8549 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Tor Messenger 0.2.0-beta -- 
+Tor Messenger 0.2.0b1 -- 
  * All Platforms
* Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45
* Use the THUNDERBIRD_45_3_0_RELEASE tag on comm-esr45

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-messenger-build/updater] Update version number to 0.2.0b1

2016-08-30 Thread sukhbir
commit 61231d818fba5296469c5f92eab641518e9a2d13
Author: Sukhbir Singh 
Date:   Tue Aug 30 09:23:36 2016 -0400

Update version number to 0.2.0b1
---
 rbm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf
index f45309f..caf7a43 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -6,7 +6,7 @@ output_dir: "out/[% project %]"
 pkg_type: build
 
 var:
-  tormessenger_version: '0.2.0-beta'
+  tormessenger_version: '0.2.0b1'
   build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]'
   build_id_txt: |
 [% c("version") %]



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-messenger-build/updater] Bump version to 0.2.0-beta

2016-08-30 Thread sukhbir
commit 497e1fb658377f51f373ced0b69e3f63d1db4dde
Author: Sukhbir Singh 
Date:   Mon Aug 29 15:57:31 2016 -0400

Bump version to 0.2.0-beta
---
 ChangeLog | 2 +-
 rbm.conf  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c52645b..81f01c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Tor Messenger 0.1.0b7 --
+Tor Messenger 0.2.0-beta -- 
  * All Platforms
* Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45
* Use the THUNDERBIRD_45_3_0_RELEASE tag on comm-esr45
diff --git a/rbm.conf b/rbm.conf
index f2084c5..f45309f 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -6,7 +6,7 @@ output_dir: "out/[% project %]"
 pkg_type: build
 
 var:
-  tormessenger_version: '0.1.0b6'
+  tormessenger_version: '0.2.0-beta'
   build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]'
   build_id_txt: |
 [% c("version") %]



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-messenger-build/updater] Update bundle-data fetch commit

2016-08-30 Thread sukhbir
commit 6a0dca5080d31c8149167d9fac73ca3cfc6f0af0
Author: Sukhbir Singh 
Date:   Tue Aug 30 17:48:29 2016 -0400

Update bundle-data fetch commit
---
 projects/bundle-data/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/bundle-data/config b/projects/bundle-data/config
index 83cfc9f..bfa1579 100644
--- a/projects/bundle-data/config
+++ b/projects/bundle-data/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://git.torproject.org/builders/tor-browser-bundle.git
-git_hash: 310740285eed2a0e5fc2fd05c29eaa5ebeec27b9
+git_hash: ce368417b914f74383bafddd268b2f1a2e9dc509
 filename: 'bundle-data-[% c("version") %].tar.gz'



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-messenger-build/master] Use the correct version in the changelog

2016-08-30 Thread sukhbir
commit 22a5e1f84dead1d2cfcca69ddf70aa69b7b3ad3f
Author: Sukhbir Singh 
Date:   Tue Aug 30 17:55:03 2016 -0400

Use the correct version in the changelog
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 81f01c2..ded8549 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Tor Messenger 0.2.0-beta -- 
+Tor Messenger 0.2.0b1 -- 
  * All Platforms
* Use the THUNDERBIRD_45_3_0_RELEASE tag on mozilla-esr45
* Use the THUNDERBIRD_45_3_0_RELEASE tag on comm-esr45

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-messenger-build/master] Update bundle-data fetch commit

2016-08-30 Thread sukhbir
commit 6a0dca5080d31c8149167d9fac73ca3cfc6f0af0
Author: Sukhbir Singh 
Date:   Tue Aug 30 17:48:29 2016 -0400

Update bundle-data fetch commit
---
 projects/bundle-data/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/projects/bundle-data/config b/projects/bundle-data/config
index 83cfc9f..bfa1579 100644
--- a/projects/bundle-data/config
+++ b/projects/bundle-data/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 git_url: https://git.torproject.org/builders/tor-browser-bundle.git
-git_hash: 310740285eed2a0e5fc2fd05c29eaa5ebeec27b9
+git_hash: ce368417b914f74383bafddd268b2f1a2e9dc509
 filename: 'bundle-data-[% c("version") %].tar.gz'

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [torbutton/master] fixup! Bug 15852: Remove/synchronize Torbutton SOCKS pref logic

2016-08-30 Thread gk
commit 1648da8461dfed9975ac83fdb03aa745b6c8d49b
Author: Kathy Brade 
Date:   Tue Aug 30 15:48:03 2016 -0400

fixup! Bug 15852: Remove/synchronize Torbutton SOCKS pref logic

Restore previous behavior: do not reset the SOCKS-related preferences when
the TOR_SOCKS_HOST and TOR_SOCKS_PORT environment variables are not set.
---
 src/components/startup-observer.js | 4 
 1 file changed, 4 deletions(-)

diff --git a/src/components/startup-observer.js 
b/src/components/startup-observer.js
index 467019e..f083482 100644
--- a/src/components/startup-observer.js
+++ b/src/components/startup-observer.js
@@ -73,16 +73,12 @@ StartupObserver.prototype = {
 this._prefs.setIntPref('network.proxy.type', 1);
 }
 this.logger.log(3, "Reset socks port to 
"+environ.get("TOR_SOCKS_PORT"));
-  } else {
-this._prefs.setIntPref('network.proxy.socks_port', 9150);
   }
 
   if (environ.exists("TOR_SOCKS_HOST")) {
 if (this.is_tbb) {
 this._prefs.setCharPref('network.proxy.socks', 
environ.get("TOR_SOCKS_HOST"));
 }
-  } else {
-this._prefs.setCharPref('network.proxy.socks', '127.0.0.1');
   }
 
   if (environ.exists("TOR_TRANSPROXY")) {

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [webwml/master] Remove 'Exitmap Improvements' project idea

2016-08-30 Thread atagar
commit 5051d73aa38db7ec22b7dbf73a854094d0d30788
Author: Damian Johnson 
Date:   Tue Aug 30 10:13:26 2016 -0700

Remove 'Exitmap Improvements' project idea

Removing as requested by Philipp.
---
 getinvolved/en/volunteer.wml | 40 
 1 file changed, 40 deletions(-)

diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml
index 3e12459..8f785db 100644
--- a/getinvolved/en/volunteer.wml
+++ b/getinvolved/en/volunteer.wml
@@ -680,11 +680,6 @@ meetings around the world.
 Onions research paper.
 
 
-
-Project Ideas:
-Exitmap Improvements
-
-
 
 DocTor (https://gitweb.torproject.org/doctor.git;>code, 
 
 
-
-
-Exitmap Improvements
-
-Language: Python
-
-Likely Mentors: Philipp (phw)
-
-
-The Tor Project makes use of the Python tool https://gitweb.torproject.org/user/phw/exitmap.git/;>Exitmap to
-systematically scan for malicious and misbehaving exit relays.  Once such a
-relay is found, it is assigned the BadExit flag which prevents clients from
-selecting the relay as last hop in their circuit.
-
-
-
-Exitmap supports scanning modules which implement a specific scan over
-exit relays.  Examples are the DNS module which checks for DNS poisoning
-or the patching check module which looks out for tampered file
-downloads.
-
-
-
-This project is meant to extend exitmap in several ways.  First, it
-should be made fully autonomous.  That means that exitmap should be able
-to run in the background, periodically fetch new relay descriptors, and
-have a smart algorithm which keeps scanning all exit relays
-periodically.  Second, exitmap should be able to emulate some user
-interaction and dynamically "explore" the web in order to detect
-tampering.  Third, unit tests should be added for existing and new code
-in order to make the code base more robust.
-
-
-
 
 
 Expand Nyx

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [metrics-lib/master] Adapted build.xml to use Gson and tweaked some tasks and paths.

2016-08-30 Thread karsten
commit 7a0e1097af1a898282ece6426336b41d2b49c891
Author: iwakeh 
Date:   Fri Aug 19 13:40:28 2016 +0200

Adapted build.xml to use Gson and tweaked some tasks and paths.
---
 build.xml | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index bfede7c..728906c 100644
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,8 @@
   
   
   
-  
+  
+  
   
   
   
@@ -14,18 +15,19 @@
   
   
   
-  
+  
   
+value="${dist}/descriptor-${release.version}-sources.jar" />
   
+value="${dist}/descriptor-${release.version}-javadoc.jar" />
   
   
+value="${dist}/descriptor-${release.version}.tar.gz" />
   
 
   
   
+  
   
   
   
@@ -84,10 +86,7 @@
 
   
 
-
-
-
-
+
   
 
   
@@ -257,6 +256,7 @@
 
   
   
+
 
   
 
@@ -280,7 +280,7 @@
 
   
 
-
+
   
 
   



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [metrics-lib/master] Increased coverage for DescriptorSourceFactory from zero to 100%.

2016-08-30 Thread karsten
commit e9c0731f395fa12be7b2f9d370fb4374bcfeef06
Author: iwakeh 
Date:   Fri Aug 19 13:42:44 2016 +0200

Increased coverage for DescriptorSourceFactory from zero to 100%.
---
 .../descriptor/DescriptorSourceFactoryTest.java| 130 +
 1 file changed, 130 insertions(+)

diff --git 
a/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java 
b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java
new file mode 100644
index 000..5f2e42e
--- /dev/null
+++ b/src/test/java/org/torproject/descriptor/DescriptorSourceFactoryTest.java
@@ -0,0 +1,130 @@
+/* Copyright 2016 The Tor Project
+ * See LICENSE for licensing information */
+package org.torproject.descriptor;
+
+import static org.torproject.descriptor.DescriptorSourceFactory.*;
+
+import org.torproject.descriptor.DescriptorCollector;
+import org.torproject.descriptor.DescriptorDownloader;
+import org.torproject.descriptor.DescriptorParser;
+import org.torproject.descriptor.DescriptorReader;
+import org.torproject.descriptor.ImplementationNotAccessibleException;
+import org.torproject.descriptor.impl.DescriptorCollectorImpl;
+import org.torproject.descriptor.impl.DescriptorDownloaderImpl;
+import org.torproject.descriptor.impl.DescriptorParserImpl;
+import org.torproject.descriptor.impl.DescriptorReaderImpl;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.InvocationTargetException;
+
+public class DescriptorSourceFactoryTest {
+
+  private final static String[] properties = new String[]{
+  COLLECTOR_PROPERTY, DOWNLOADER_PROPERTY, PARSER_PROPERTY, 
READER_PROPERTY};
+  private final static String[] defaults = new String[]{
+  COLLECTOR_DEFAULT, DOWNLOADER_DEFAULT, PARSER_DEFAULT, READER_DEFAULT};
+
+  @Test()
+  public void testDefaults() {
+setProperties(defaults);
+DescriptorCollector dc = 
DescriptorSourceFactory.createDescriptorCollector();
+assertTrue(dc instanceof DescriptorCollectorImpl);
+DescriptorDownloader dd = 
DescriptorSourceFactory.createDescriptorDownloader();
+assertTrue(dd instanceof DescriptorDownloaderImpl);
+DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser();
+assertTrue(dp instanceof DescriptorParserImpl);
+DescriptorReader dr = DescriptorSourceFactory.createDescriptorReader();
+assertTrue(dr instanceof DescriptorReaderImpl);
+  }
+
+  private void setProperties(String[] vals) {
+for (int k = 0; k < properties.length; k++) {
+  System.setProperty(properties[k], vals[k]);
+}
+  }
+
+  @Test(expected = ImplementationNotAccessibleException.class)
+  public void testException() {
+System.setProperty(COLLECTOR_PROPERTY ,
+"no.implementation.available.X");
+DescriptorSourceFactory.createDescriptorCollector();
+  }
+
+  @Test()
+  public void testUnknownPropertyException() {
+setProperties(defaults);
+try {
+  Method retrieve = DescriptorSourceFactory.class
+  .getDeclaredMethod("retrieve", String.class);
+  retrieve.setAccessible(true);
+  retrieve.invoke(null, "unknown.property");
+} catch (InvocationTargetException ite) {
+  if(ite.getCause() instanceof ImplementationNotAccessibleException) {
+return;
+  } else {
+fail("Cause was " + ite.getCause()
++ ", but expected InvocationTargetException.");
+  }
+} catch (Throwable t) {
+  fail("Caught " + t + ", but expected InvocationTargetException.");
+}
+  }
+
+  @Test()
+  public void testProperties() {
+setProperties(new String[]{
+"org.torproject.descriptor.DummyCollectorImplementation",
+"org.torproject.descriptor.DummyDownloaderImplementation",
+"org.torproject.descriptor.DummyParserImplementation",
+"org.torproject.descriptor.DummyReaderImplementation",
+  });
+DescriptorCollector dc = 
DescriptorSourceFactory.createDescriptorCollector();
+assertTrue(dc instanceof DummyCollectorImplementation);
+assertEquals(1, DummyCollectorImplementation.count);
+DescriptorDownloader dd = 
DescriptorSourceFactory.createDescriptorDownloader();
+assertTrue(dd instanceof DummyDownloaderImplementation);
+assertEquals(1, DummyDownloaderImplementation.count);
+DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser();
+assertTrue(dp instanceof DummyParserImplementation);
+assertEquals(1, DummyParserImplementation.count);
+DescriptorReader dr = DescriptorSourceFactory.createDescriptorReader();
+assertTrue(dr instanceof DummyReaderImplementation);
+assertEquals(1, DummyReaderImplementation.count);
+  }
+
+}
+
+class DummyCollectorImplementation extends DescriptorCollectorImpl {
+  static int count;
+  public DummyCollectorImplementation() {
+

[tor-commits] [metrics-lib/master] Added more inline comments and extended tests.

2016-08-30 Thread karsten
commit d65b26e0db29fe71701027ee1567374a55abb378
Author: iwakeh 
Date:   Tue Aug 30 12:15:51 2016 +0200

Added more inline comments and extended tests.
---
 .../index/DescriptorIndexCollectorTest.java| 46 ++
 1 file changed, 39 insertions(+), 7 deletions(-)

diff --git 
a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
 
b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
index 8f14ec7..c5a6a5c 100644
--- 
a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
+++ 
b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
@@ -44,6 +44,11 @@ public class DescriptorIndexCollectorTest {
 
 File indexFile = newIndexFile("testindex.json",
 remoteDirectory.toURL().toString());
+
+// verify precondition for test.
+checkContains(true,
+DescriptorIndexCollector.statLocalDirectory(localFolder).toString(),
+"a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/u1");
 checkContains(false,
 DescriptorIndexCollector.statLocalDirectory(localFolder).toString(),
 "a/b/y2","a/b/x2");
@@ -51,22 +56,26 @@ public class DescriptorIndexCollectorTest {
 DescriptorCollector dc = new DescriptorIndexCollector();
 dc.collectDescriptors(indexFile.toURL().toString(),
 new String[]{"a/b", "a"}, 1451606400_000L, localFolder, false);
+
+// verify that files in 'a/b' were fetched
 checkContains(true,
 DescriptorIndexCollector.statLocalDirectory(localFolder).toString(),
 "a/b/x1", "a/b/y1", "a/b/y2","a/b/x2", "a/b/c/w1", "a/b/c/z1");
+
+// verify that files in 'a/b/c' were not fetched.
 checkContains(false,
 DescriptorIndexCollector.statLocalDirectory(localFolder).toString(),
-"a/b/c/w2","a/b/c/z2");
+"a/b/c/u2");
   }
 
   private void makeStructure(File folder, String suffix) throws IOException {
 File dir = makeDirs(folder.toString(), "a", "b");
 makeFiles(dir, "x" + suffix, "y" + suffix);
 File subdir = makeDirs(dir.toString(), "c");
-makeFiles(subdir, "w" + suffix, "z" + suffix);
+makeFiles(subdir, "u" + suffix, "w" + suffix, "z" + suffix);
 SortedMap local = DescriptorIndexCollector
 .statLocalDirectory(folder);
-assertEquals("found " + local, 4, local.size());
+assertEquals("found " + local, 5, local.size());
   }
 
   private File makeDirs(String first, String ... dirs) throws IOException {
@@ -97,11 +106,20 @@ public class DescriptorIndexCollectorTest {
   private File newIndexFile(String name, String remoteDirectory)
   throws Exception {
 SortedSet fm = new TreeSet<>();
-fm.add(new FileNode("w2", 0L, "2100-01-01 01:01"));
+
+// 'u2' should be fetched when the path is included.
+fm.add(new FileNode("u2", 0L, "2100-01-01 01:02"));
+
+// 'w2' should not be fetched, b/c of wrong filesize
+fm.add(new FileNode("w2", 100L, "2100-01-01 01:01"));
+
+// 'z2' should not be fetched, b/c of being too old.
 fm.add(new FileNode("z2", 0L, "1900-01-01 01:02"));
 SortedSet dm = new TreeSet<>();
 dm.add(new DirectoryNode("c", fm, null));
 fm = new TreeSet<>();
+
+// 'x2' and 'y2' should be fetched when their path is included.
 fm.add(new FileNode("x2", 0L, "2100-01-01 01:01"));
 fm.add(new FileNode("y2", 0L, "2100-01-01 01:02"));
 DirectoryNode dnb = new DirectoryNode("b", fm, dm);
@@ -127,19 +145,33 @@ public class DescriptorIndexCollectorTest {
 
 File indexFile = newIndexFile("testindexDelete.json",
 remoteDirectory.toURL().toString());
+
+// verify precondition for test.
+checkContains(true,
+DescriptorIndexCollector.statLocalDirectory(localFolder).toString(),
+"a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/u1");
 checkContains(false,
 DescriptorIndexCollector.statLocalDirectory(localFolder).toString(),
 "a/b/y2","a/b/x2");
 
 new DescriptorIndexCollector()
 .collectDescriptors(indexFile.toURL().toString(),
-new String[]{"a/b"}, 1451606400_000L, localFolder, true);
+new String[]{"a/b", "a/b/c"}, 1451606400_000L, localFolder, true);
+
+// verify file addition.
 checkContains(true,
 DescriptorIndexCollector.statLocalDirectory(localFolder).toString(),
-"a/b/y2","a/b/x2");
+"a/b/y2", "a/b/x2", "a/b/c/u2");
+
+// verify that invalid files weren't fetched.
+checkContains(false,
+DescriptorIndexCollector.statLocalDirectory(localFolder).toString(),
+"a/b/c/w2", "a/b/c/z2");
+
+// verify file deletion.
 checkContains(false,
 DescriptorIndexCollector.statLocalDirectory(localFolder).toString(),
-"a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/w2", "a/b/c/z2");
+"a/b/x1", "a/b/y1", "a/b/c/w1", "a/b/c/z1", "a/b/c/u1");
   }
 
   @Test()


[tor-commits] [metrics-lib/master] Corrected test file size.

2016-08-30 Thread karsten
commit 9cdce8c53ed9d313a59388c0365ed0446e7dcf0d
Author: iwakeh 
Date:   Wed Aug 24 22:47:38 2016 +0200

Corrected test file size.
---
 .../descriptor/index/DescriptorIndexCollectorTest.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git 
a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
 
b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
index 6968ff8..8f14ec7 100644
--- 
a/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
+++ 
b/src/test/java/org/torproject/descriptor/index/DescriptorIndexCollectorTest.java
@@ -97,13 +97,13 @@ public class DescriptorIndexCollectorTest {
   private File newIndexFile(String name, String remoteDirectory)
   throws Exception {
 SortedSet fm = new TreeSet<>();
-fm.add(new FileNode("w2", 100L, "2100-01-01 01:01"));
-fm.add(new FileNode("z2", 2L, "1900-01-01 01:02"));
+fm.add(new FileNode("w2", 0L, "2100-01-01 01:01"));
+fm.add(new FileNode("z2", 0L, "1900-01-01 01:02"));
 SortedSet dm = new TreeSet<>();
 dm.add(new DirectoryNode("c", fm, null));
 fm = new TreeSet<>();
-fm.add(new FileNode("x2", 2L, "2100-01-01 01:01"));
-fm.add(new FileNode("y2", 2L, "2100-01-01 01:02"));
+fm.add(new FileNode("x2", 0L, "2100-01-01 01:01"));
+fm.add(new FileNode("y2", 0L, "2100-01-01 01:02"));
 DirectoryNode dnb = new DirectoryNode("b", fm, dm);
 dm = new TreeSet<>();
 dm.add(dnb);
@@ -133,7 +133,7 @@ public class DescriptorIndexCollectorTest {
 
 new DescriptorIndexCollector()
 .collectDescriptors(indexFile.toURL().toString(),
-new String[]{"a/b", "a/b/c"}, 1451606400_000L, localFolder, true);
+new String[]{"a/b"}, 1451606400_000L, localFolder, true);
 checkContains(true,
 DescriptorIndexCollector.statLocalDirectory(localFolder).toString(),
 "a/b/y2","a/b/x2");



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [metrics-lib/master] Tweak change log for upcoming 1.4.0 release.

2016-08-30 Thread karsten
commit c4076089f269a1d6151a0e067bde010347d54019
Author: Karsten Loesing 
Date:   Wed Aug 24 20:36:15 2016 +0200

Tweak change log for upcoming 1.4.0 release.
---
 CHANGELOG.md | 18 +-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11d123b..b4eef28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,23 @@
 # Changes in version 1.4.0 - 2016-08-24
 
+ * Major changes
+   - Add the Simple Logging Facade for Java (slf4j) for logging
+ support rather than printing warnings to stderr.  Applications
+ must provide slf4j-api-1.7.7.jar or higher as dependency and can
+ optionally provide a compatible logging framework of their choice
+ (java.util.logging, logback, log4j).
+
+ * Medium changes
+   - Add an alpha version of a DescriptorCollector implementation that
+ is not enabled by default and that uses CollecTor's index.json
+ file to determine which descriptor files to fetch.  Applications
+ can enable this implementation by providing gson-2.2.4.jar or
+ higher as dependency and setting property descriptor.collector to
+ org.torproject.descriptor.index.DescriptorIndexCollector.
+
  * Minor changes
-   - Add slf4j for logging support.
+   - Include resource files in src/*/resources/ in the release
+ tarball.
 
 
 # Changes in version 1.3.1 - 2016-08-01



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-messenger-build/master] Update version number to 0.2.0b1

2016-08-30 Thread sukhbir
commit 61231d818fba5296469c5f92eab641518e9a2d13
Author: Sukhbir Singh 
Date:   Tue Aug 30 09:23:36 2016 -0400

Update version number to 0.2.0b1
---
 rbm.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rbm.conf b/rbm.conf
index f45309f..caf7a43 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -6,7 +6,7 @@ output_dir: "out/[% project %]"
 pkg_type: build
 
 var:
-  tormessenger_version: '0.2.0-beta'
+  tormessenger_version: '0.2.0b1'
   build_id: '[% sha256(c("var/build_id_txt")).substr(0, 6) %]'
   build_id_txt: |
 [% c("version") %]

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [torspec/master] Replaced a vague may with RFC-ish MAY

2016-08-30 Thread nickm
commit 4adc21feb4eea16f17aa4ad964554a1a9244ebc7
Author: Ivan Markin 
Date:   Thu Jun 23 15:22:55 2016 +

Replaced a vague may with RFC-ish MAY
---
 dir-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index fb7ee9a..6ba05bc 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -516,7 +516,7 @@
 
A curve25519 public key used for the ntor circuit extended
handshake.  It's the standard encoding of the OR's curve25519
-   public key, encoded in base 64.  The trailing = sign may be
+   public key, encoded in base 64.  The trailing '=' sign MAY be
omitted from the base64 encoding.  The key MUST be accepted
for at least 1 week after any new key is published in a
subsequent descriptor.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [torspec/master] Fix a typo in rend-spec.txt

2016-08-30 Thread nickm
commit 29c7d98eaf8e720a13e546abc8cdf121a6d852f7
Author: Ivan Markin 
Date:   Sun Aug 28 13:39:09 2016 +

Fix a typo in rend-spec.txt
---
 rend-spec.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rend-spec.txt b/rend-spec.txt
index d4dfefe..cf32f2b 100644
--- a/rend-spec.txt
+++ b/rend-spec.txt
@@ -747,7 +747,7 @@
match the value in the RENDEZVOUS2 cell, the client must close the
circuit.
 
-   Subsequently, the rendezvous point passes relay cells, unchanged, from
+   Subsequently, the rendezvous point passes RELAY cells, unchanged, from
each of the two circuits to the other.  When Alice's OP sends RELAY cells
along the circuit, it authenticates with Df, and encrypts them with the
Kf, then with all of the keys for the ORs in Alice's side of the circuit;

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2016-08-30 Thread translation
commit a0648a11583e2d5cf81284fb3867caa147481224
Author: Translation commit bot 
Date:   Tue Aug 30 10:16:14 2016 +

Update translations for tails-misc
---
 hr_HR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr_HR.po b/hr_HR.po
index 938bcb1..7c5a967 100644
--- a/hr_HR.po
+++ b/hr_HR.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-31 10:43+0200\n"
-"PO-Revision-Date: 2016-08-30 09:45+\n"
+"PO-Revision-Date: 2016-08-30 09:52+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2016-08-30 Thread translation
commit 74a587f27455c1296ce22b53135336348f7bfcdb
Author: Translation commit bot 
Date:   Tue Aug 30 10:15:27 2016 +

Update translations for liveusb-creator
---
 hr_HR/hr_HR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 7f5874c..7ea540e 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-08-30 09:45+\n"
+"PO-Revision-Date: 2016-08-30 09:53+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -261,7 +261,7 @@ msgstr "Pobrinite se da je Vaš USB uključen i formatiran 
u FAT formatu"
 #: ../liveusb/creator.py:859
 #, python-format
 msgid "Mount %s exists after unmounting"
-msgstr "%s je postavljen i nakon odmontiranja"
+msgstr "Pogon %s postoji i nakon odmontiranja"
 
 #: ../liveusb/gui.py:588
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2016-08-30 Thread translation
commit b3a8e4445fde161e0e2a0cbfa630b96afffdd3c7
Author: Translation commit bot 
Date:   Tue Aug 30 10:15:30 2016 +

Update translations for liveusb-creator_completed
---
 hr_HR/hr_HR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 7f5874c..7ea540e 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-08-30 09:45+\n"
+"PO-Revision-Date: 2016-08-30 09:53+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -261,7 +261,7 @@ msgstr "Pobrinite se da je Vaš USB uključen i formatiran 
u FAT formatu"
 #: ../liveusb/creator.py:859
 #, python-format
 msgid "Mount %s exists after unmounting"
-msgstr "%s je postavljen i nakon odmontiranja"
+msgstr "Pogon %s postoji i nakon odmontiranja"
 
 #: ../liveusb/gui.py:588
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2016-08-30 Thread translation
commit 384b128f2901bead191a2f1f727024badbb94ae2
Author: Translation commit bot 
Date:   Tue Aug 30 10:16:18 2016 +

Update translations for tails-misc_completed
---
 hr_HR.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr_HR.po b/hr_HR.po
index 938bcb1..7c5a967 100644
--- a/hr_HR.po
+++ b/hr_HR.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-31 10:43+0200\n"
-"PO-Revision-Date: 2016-08-30 09:45+\n"
+"PO-Revision-Date: 2016-08-30 09:52+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2016-08-30 Thread translation
commit 0bfbe0ec9c69e40387e15ab78495785045650422
Author: Translation commit bot 
Date:   Tue Aug 30 10:15:33 2016 +

Update translations for tails-persistence-setup
---
 hr_HR/hr_HR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 319917e..a9d8840 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-08-30 09:45+\n"
+"PO-Revision-Date: 2016-08-30 09:52+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -211,7 +211,7 @@ msgstr "Izaberite lozinku kako bi zaštitili trajni pogon"
 msgid ""
 "A %s persistent volume will be created on the %s %s device. Data on "
 "this volume will be stored in an encrypted form protected by a passphrase."
-msgstr "%s trajni pogon će biti stvoren na uređaju %s %s. Podatci na 
ovom pogonu će biti pohranjeni u enkriptiranom obliku i zaštićeni lozinkom."
+msgstr "Trajni pogon %s će biti stvoren na uređaju %s %s. Podatci na 
ovom pogonu će biti pohranjeni u enkriptiranom obliku i zaštićeni lozinkom."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66
 msgid "Create"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2016-08-30 Thread translation
commit 0eb23e77079ffb9e998227380aac09117b75029c
Author: Translation commit bot 
Date:   Tue Aug 30 10:15:37 2016 +

Update translations for tails-persistence-setup_completed
---
 hr_HR/hr_HR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 319917e..a9d8840 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-08-30 09:45+\n"
+"PO-Revision-Date: 2016-08-30 09:52+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -211,7 +211,7 @@ msgstr "Izaberite lozinku kako bi zaštitili trajni pogon"
 msgid ""
 "A %s persistent volume will be created on the %s %s device. Data on "
 "this volume will be stored in an encrypted form protected by a passphrase."
-msgstr "%s trajni pogon će biti stvoren na uređaju %s %s. Podatci na 
ovom pogonu će biti pohranjeni u enkriptiranom obliku i zaštićeni lozinkom."
+msgstr "Trajni pogon %s će biti stvoren na uređaju %s %s. Podatci na 
ovom pogonu će biti pohranjeni u enkriptiranom obliku i zaštićeni lozinkom."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66
 msgid "Create"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

2016-08-30 Thread translation
commit 9d3b877ed5052bd5deeb6ec2d37b3066b38e02d8
Author: Translation commit bot 
Date:   Tue Aug 30 09:48:35 2016 +

Update translations for tails-openpgp-applet_completed
---
 hr_HR/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr_HR/openpgp-applet.pot b/hr_HR/openpgp-applet.pot
index 844ac05..e5a7a46 100644
--- a/hr_HR/openpgp-applet.pot
+++ b/hr_HR/openpgp-applet.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2016-08-29 12:33+\n"
+"PO-Revision-Date: 2016-08-30 09:42+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

2016-08-30 Thread translation
commit cb1f72ee8721e4aaad4747dcdbce9b3da8b82971
Author: Translation commit bot 
Date:   Tue Aug 30 09:48:32 2016 +

Update translations for tails-openpgp-applet
---
 hr_HR/openpgp-applet.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr_HR/openpgp-applet.pot b/hr_HR/openpgp-applet.pot
index 844ac05..e5a7a46 100644
--- a/hr_HR/openpgp-applet.pot
+++ b/hr_HR/openpgp-applet.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: ta...@boum.org\n"
 "POT-Creation-Date: 2015-08-10 15:55+0200\n"
-"PO-Revision-Date: 2016-08-29 12:33+\n"
+"PO-Revision-Date: 2016-08-30 09:42+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-08-30 Thread translation
commit 6dc15956e3f7982dbdcee6f043f375ce8378bf18
Author: Translation commit bot 
Date:   Tue Aug 30 09:46:44 2016 +

Update translations for torbutton-torbuttondtd
---
 hr_HR/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hr_HR/torbutton.dtd b/hr_HR/torbutton.dtd
index 1722b7b..9969162 100644
--- a/hr_HR/torbutton.dtd
+++ b/hr_HR/torbutton.dtd
@@ -38,7 +38,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbirdy_completed] Update translations for torbirdy_completed

2016-08-30 Thread translation
commit 14f36297a22b6480cd003f96aafe6f2ad462aff2
Author: Translation commit bot 
Date:   Tue Aug 30 09:45:55 2016 +

Update translations for torbirdy_completed
---
 hr_HR/torbirdy.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd
index 0148cea..6674e10 100644
--- a/hr_HR/torbirdy.dtd
+++ b/hr_HR/torbirdy.dtd
@@ -36,11 +36,11 @@
 
 
 
-
+
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2016-08-30 Thread translation
commit 9f358fef97968f2024f2bed096dba83fa3d1cc48
Author: Translation commit bot 
Date:   Tue Aug 30 09:46:19 2016 +

Update translations for tails-misc
---
 hr_HR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR.po b/hr_HR.po
index a87e7bf..938bcb1 100644
--- a/hr_HR.po
+++ b/hr_HR.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-31 10:43+0200\n"
-"PO-Revision-Date: 2016-08-29 12:39+\n"
+"PO-Revision-Date: 2016-08-30 09:45+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Nijedan ključ nije izabran "
 msgid ""
 "You must select a private key to sign the message, or some public keys to "
 "encrypt the message, or both."
-msgstr "Morate izabrati privatni ključ da biste potpisali poruku , ili neke 
javne ključeve da biste enkriptirali poruku, ili oboje."
+msgstr "Morate izabrati privatni ključ da biste potpisali poruku, ili neke 
javne ključeve da biste enkriptirali poruku, ili oboje."
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:621
 msgid "No keys available"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

2016-08-30 Thread translation
commit d48a6613a7bd5b588013b4d8cde493c0798b97b1
Author: Translation commit bot 
Date:   Tue Aug 30 09:46:23 2016 +

Update translations for tails-misc_completed
---
 hr_HR.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR.po b/hr_HR.po
index a87e7bf..938bcb1 100644
--- a/hr_HR.po
+++ b/hr_HR.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-31 10:43+0200\n"
-"PO-Revision-Date: 2016-08-29 12:39+\n"
+"PO-Revision-Date: 2016-08-30 09:45+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -203,7 +203,7 @@ msgstr "Nijedan ključ nije izabran "
 msgid ""
 "You must select a private key to sign the message, or some public keys to "
 "encrypt the message, or both."
-msgstr "Morate izabrati privatni ključ da biste potpisali poruku , ili neke 
javne ključeve da biste enkriptirali poruku, ili oboje."
+msgstr "Morate izabrati privatni ključ da biste potpisali poruku, ili neke 
javne ključeve da biste enkriptirali poruku, ili oboje."
 
 #: config/chroot_local-includes/usr/local/bin/gpgApplet:621
 msgid "No keys available"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-persistence-setup] Update translations for tails-persistence-setup

2016-08-30 Thread translation
commit 064fcb88e544c1dc1c4e4340ed9cf270e17a3282
Author: Translation commit bot 
Date:   Tue Aug 30 09:45:38 2016 +

Update translations for tails-persistence-setup
---
 hr_HR/hr_HR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 227fce8..319917e 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-08-29 12:28+\n"
+"PO-Revision-Date: 2016-08-30 09:45+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -184,7 +184,7 @@ msgstr "Uređaj %s je optički."
 #: ../lib/Tails/Persistence/Setup.pm:422
 #, perl-format
 msgid "Device %s was not created using Tails Installer."
-msgstr "Uređaj %s nije stvoren Tails-ovim instalerom."
+msgstr "Uređaj %s nije stvoren Tailsovim instalerom."
 
 #: ../lib/Tails/Persistence/Setup.pm:668
 msgid "Persistence wizard - Finished"
@@ -195,7 +195,7 @@ msgid ""
 "Any changes you have made will only take effect after restarting Tails.\n"
 "\n"
 "You may now close this application."
-msgstr "Bilo kakve promjene koje ste napravili imati će učinka tek nakon 
ponovnog pokretanja Tails-a.\n\nSad smijete zatvoriti ovu aplikaciju."
+msgstr "Bilo kakve promjene koje ste napravili imati će učinka tek nakon 
ponovnog pokretanja Tailsa.\n\nSad smijete zatvoriti ovu aplikaciju."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54
 msgid "Persistence wizard - Persistent volume creation"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed

2016-08-30 Thread translation
commit 07d3b9d6eb00508f6663d6acbcb209ab0c581701
Author: Translation commit bot 
Date:   Tue Aug 30 09:45:41 2016 +

Update translations for tails-persistence-setup_completed
---
 hr_HR/hr_HR.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index 227fce8..319917e 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -12,7 +12,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2016-05-25 02:27+0200\n"
-"PO-Revision-Date: 2016-08-29 12:28+\n"
+"PO-Revision-Date: 2016-08-30 09:45+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -184,7 +184,7 @@ msgstr "Uređaj %s je optički."
 #: ../lib/Tails/Persistence/Setup.pm:422
 #, perl-format
 msgid "Device %s was not created using Tails Installer."
-msgstr "Uređaj %s nije stvoren Tails-ovim instalerom."
+msgstr "Uređaj %s nije stvoren Tailsovim instalerom."
 
 #: ../lib/Tails/Persistence/Setup.pm:668
 msgid "Persistence wizard - Finished"
@@ -195,7 +195,7 @@ msgid ""
 "Any changes you have made will only take effect after restarting Tails.\n"
 "\n"
 "You may now close this application."
-msgstr "Bilo kakve promjene koje ste napravili imati će učinka tek nakon 
ponovnog pokretanja Tails-a.\n\nSad smijete zatvoriti ovu aplikaciju."
+msgstr "Bilo kakve promjene koje ste napravili imati će učinka tek nakon 
ponovnog pokretanja Tailsa.\n\nSad smijete zatvoriti ovu aplikaciju."
 
 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54
 msgid "Persistence wizard - Persistent volume creation"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbirdy] Update translations for torbirdy

2016-08-30 Thread translation
commit 063b792f4524bb35951fe6301216198586c26478
Author: Translation commit bot 
Date:   Tue Aug 30 09:45:51 2016 +

Update translations for torbirdy
---
 hr_HR/torbirdy.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR/torbirdy.dtd b/hr_HR/torbirdy.dtd
index 0148cea..6674e10 100644
--- a/hr_HR/torbirdy.dtd
+++ b/hr_HR/torbirdy.dtd
@@ -36,11 +36,11 @@
 
 
 
-
+
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

2016-08-30 Thread translation
commit fbe7cd46a3971576f42b55c7507b2d1d8f7292a8
Author: Translation commit bot 
Date:   Tue Aug 30 09:45:34 2016 +

Update translations for liveusb-creator_completed
---
 hr_HR/hr_HR.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index fb23682..7f5874c 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-08-29 12:29+\n"
+"PO-Revision-Date: 2016-08-30 09:45+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -229,7 +229,7 @@ msgstr "Instalacija dovršena! (%s)"
 
 #: ../liveusb/gui.py:646
 msgid "Installation was completed. Press OK to close this program."
-msgstr "instalacija je dovršena. Pritisnite „OK“ kako bi zatvorili ovaj 
program."
+msgstr "Instalacija je dovršena. Pritisnite OK kako bi zatvorili ovaj 
program."
 
 #: ../liveusb/creator.py:990 ../liveusb/creator.py:1313
 msgid "Installing bootloader..."
@@ -245,7 +245,7 @@ msgstr "Nemoguće je nadograditi uređaj %(pretty_name)s 
jer nije stvoren koriš
 
 #: ../liveusb/gui.py:270
 msgid "LiveUSB creation failed!"
-msgstr "Stvaranje ŽivogUSB‑a neuspjelo!"
+msgstr "Stvaranje ŽivogUSB‑a nije uspjelo!"
 
 #: ../liveusb/creator.py:1408
 msgid ""
@@ -256,7 +256,7 @@ msgstr "Raspakirajte cijelu liveusb-creator ZIP datoteku 
prije pokretanja ovoga
 #: ../liveusb/creator.py:1284
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
-msgstr "Pobrinite se da je Vaš USB uključen i formatiran u FAT formatu."
+msgstr "Pobrinite se da je Vaš USB uključen i formatiran u FAT formatu"
 
 #: ../liveusb/creator.py:859
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2016-08-30 Thread translation
commit 52905210714d5e1e08eca6e45a1bfc1d03839cdd
Author: Translation commit bot 
Date:   Tue Aug 30 09:45:29 2016 +

Update translations for liveusb-creator
---
 hr_HR/hr_HR.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/hr_HR/hr_HR.po b/hr_HR/hr_HR.po
index fb23682..7f5874c 100644
--- a/hr_HR/hr_HR.po
+++ b/hr_HR/hr_HR.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-11-02 21:23+0100\n"
-"PO-Revision-Date: 2016-08-29 12:29+\n"
+"PO-Revision-Date: 2016-08-30 09:45+\n"
 "Last-Translator: Igor \n"
 "Language-Team: Croatian (Croatia) 
(http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
 "MIME-Version: 1.0\n"
@@ -229,7 +229,7 @@ msgstr "Instalacija dovršena! (%s)"
 
 #: ../liveusb/gui.py:646
 msgid "Installation was completed. Press OK to close this program."
-msgstr "instalacija je dovršena. Pritisnite „OK“ kako bi zatvorili ovaj 
program."
+msgstr "Instalacija je dovršena. Pritisnite OK kako bi zatvorili ovaj 
program."
 
 #: ../liveusb/creator.py:990 ../liveusb/creator.py:1313
 msgid "Installing bootloader..."
@@ -245,7 +245,7 @@ msgstr "Nemoguće je nadograditi uređaj %(pretty_name)s 
jer nije stvoren koriš
 
 #: ../liveusb/gui.py:270
 msgid "LiveUSB creation failed!"
-msgstr "Stvaranje ŽivogUSB‑a neuspjelo!"
+msgstr "Stvaranje ŽivogUSB‑a nije uspjelo!"
 
 #: ../liveusb/creator.py:1408
 msgid ""
@@ -256,7 +256,7 @@ msgstr "Raspakirajte cijelu liveusb-creator ZIP datoteku 
prije pokretanja ovoga
 #: ../liveusb/creator.py:1284
 msgid ""
 "Make sure your USB key is plugged in and formatted with the FAT filesystem"
-msgstr "Pobrinite se da je Vaš USB uključen i formatiran u FAT formatu."
+msgstr "Pobrinite se da je Vaš USB uključen i formatiran u FAT formatu"
 
 #: ../liveusb/creator.py:859
 #, python-format

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor_animation] Update translations for tor_animation

2016-08-30 Thread translation
commit 1ec7635984c61b96695bfff01ceb70dca6d70f3d
Author: Translation commit bot 
Date:   Tue Aug 30 08:46:50 2016 +

Update translations for tor_animation
---
 la.srt | 35 +++
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/la.srt b/la.srt
index 8a10b3e..b96fa77 100644
--- a/la.srt
+++ b/la.srt
@@ -45,56 +45,51 @@ qui eam informationem pro explosione de te usare possint.
 
 12
 00:00:34,500 --> 00:00:37,000
-But not if you're using Tor!
+Sed non, si Tor usas!
 
 13
 00:00:37,140 --> 00:00:40,840
-Tor Browser protects our privacy
-and identity on the Internet.
+Tor Navis abdititudinem personamque nostram in coniunctione computatorum 
protegit.
 
 14
 00:00:41,560 --> 00:00:44,760
-Tor secures your connection
-with three layers of encryption
+Tor coniunctionem tuam tribus ordinibus latendi certior facit.
 
 15
 00:00:44,940 --> 00:00:49,760
-and passes it through three voluntarily
-operated servers around the world,
+et per tres depositiones
+voluntate initos in mundo it.
 
 16
 00:00:50,280 --> 00:00:53,520
-which enables us to communicate
-anonymously over the Internet.
+quomodo sine nomine in coniunctione computatorum navigare potes.
 
 17
 00:00:56,560 --> 00:00:58,280
-Tor also protects our data
+Tor etiam informaitonem nostram protegit
 
 18
 00:00:58,400 --> 00:01:01,900
-against corporate or government targeted
-and mass surveillance.
+contra visionem magnam
 
 19
 00:01:02,880 --> 00:01:07,340
-Perhaps you live in a repressive country
-which tries to control and surveil the Internet.
+Fortasse in civitate repressiva vivis,
+quae coniunctionem computatorum mutare videreque vult.
 
 20
 00:01:07,900 --> 00:01:11,800
-Or perhaps you don't want big corporations
-taking advantage of your personal information.
+Aut fortasse constructiones magnas non vis
+informationem tuam scire.
 
 21
 00:01:12,880 --> 00:01:15,640
-Tor makes all of its users
-to look the same
+Tore omnes usatores aequale videti sunt
 
 22
 00:01:15,920 --> 00:01:18,800
-which confuses the observer
-and makes you anonymous.
+quomodo visor informationem nescit
+et tu sine nomine es.
 
 23
 00:01:19,500 --> 00:01:22,980

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-aboutdialogdtd_completed] Update translations for torbutton-aboutdialogdtd_completed

2016-08-30 Thread translation
commit deada55b67d1d9fc86049980339ec6c8a114af31
Author: Translation commit bot 
Date:   Tue Aug 30 08:17:12 2016 +

Update translations for torbutton-aboutdialogdtd_completed
---
 la/aboutdialog.dtd | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/la/aboutdialog.dtd b/la/aboutdialog.dtd
new file mode 100644
index 000..561393f
--- /dev/null
+++ b/la/aboutdialog.dtd
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-brandproperties] Update translations for torbutton-brandproperties

2016-08-30 Thread translation
commit bb4ad4af95fd6ac905ae2eefb88cb4cd634d56ca
Author: Translation commit bot 
Date:   Tue Aug 30 08:16:27 2016 +

Update translations for torbutton-brandproperties
---
 la/brand.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/la/brand.properties b/la/brand.properties
index 732c157..d3ec676 100644
--- a/la/brand.properties
+++ b/la/brand.properties
@@ -2,10 +2,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShorterName=Tor Browser
-brandShortName=Tor Browser
-brandFullName=Tor Browser
-vendorShortName=Tor Project
+brandShorterName=Tor navis
+brandShortName=Tor navis
+brandFullName=Tor navis
+vendorShortName=Tor Programma
 
 homePageSingleStartMain=Firefox Start, a fast home page with built-in search
 homePageImport=Import your home page from %S

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2016-08-30 Thread translation
commit efd6b16fb22021c979a73bf0b7710138f75eef84
Author: Translation commit bot 
Date:   Tue Aug 30 08:17:09 2016 +

Update translations for torbutton-aboutdialogdtd
---
 la/aboutdialog.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/la/aboutdialog.dtd b/la/aboutdialog.dtd
index 996adb5..561393f 100644
--- a/la/aboutdialog.dtd
+++ b/la/aboutdialog.dtd
@@ -1,19 +1,19 @@
 
 
 
-
+
 
-
+
 
-
-
+
+
 
-
+
 
 
-
+
 
-
+
 
-
-
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor-and-https] Update translations for tor-and-https

2016-08-30 Thread translation
commit 9de7c2cde04965b0782a5ca59fa900a1ad1b7e3d
Author: Translation commit bot 
Date:   Tue Aug 30 08:16:57 2016 +

Update translations for tor-and-https
---
 la.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/la.po b/la.po
index 2af15f6..e986484 100644
--- a/la.po
+++ b/la.po
@@ -1,12 +1,13 @@
 # 
 # Translators:
+# Alisa P , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2014-05-21 08:40+\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: Latin 
(http://www.transifex.com/projects/p/torproject/language/la/)\n"
+"PO-Revision-Date: 2016-08-30 08:00+\n"
+"Last-Translator: Alisa P \n"
+"Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,7 +20,7 @@ msgstr ""
 #. languages (e.g. Arabic or Hebrew).
 #: C/tor-and-https.svg:3
 msgid "ltr"
-msgstr ""
+msgstr "ltr"
 
 #. (itstool) path: svg/title
 #: C/tor-and-https.svg:14

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2016-08-30 Thread translation
commit db4cb1583dd3f4df24817bb9613b781278fa3e88
Author: Translation commit bot 
Date:   Tue Aug 30 08:16:43 2016 +

Update translations for torbutton-torbuttondtd
---
 la/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/la/torbutton.dtd b/la/torbutton.dtd
index 0720208..45c2ba7 100644
--- a/la/torbutton.dtd
+++ b/la/torbutton.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tor_animation] Update translations for tor_animation

2016-08-30 Thread translation
commit 379c6e3cf9769b93437981069d9cc8440243a99f
Author: Translation commit bot 
Date:   Tue Aug 30 08:17:03 2016 +

Update translations for tor_animation
---
 la.srt | 82 +++---
 1 file changed, 38 insertions(+), 44 deletions(-)

diff --git a/la.srt b/la.srt
index 78c998d..8a10b3e 100644
--- a/la.srt
+++ b/la.srt
@@ -1,165 +1,159 @@
 1
 00:00:00,660 --> 00:00:02,780
-We've gotten very used to the Internet.
+Coniuntionem computatorum saepe petimus.
 
 2
 00:00:03,120 --> 00:00:07,700
-We are constantly sharing information
-about ourselves and our private lives:
+Constante informationem de nobis vitisque nostris damus.
 
 3
 00:00:08,000 --> 00:00:09,960
-food we eat, people we meet,
+cibi, quos comedimus, personae, quas invenimus
 
 4
 00:00:10,180 --> 00:00:12,480
-places we go, and the stuff we read.
+ubi imus, quid legimus.
 
 5
 00:00:13,280 --> 00:00:14,640
-Let me explain it better.
+Explanem melior.
 
 6
 00:00:14,920 --> 00:00:17,740
-Right at this moment,
-if someone attempts to look you up,
+Nunc statim,
+si aliquis te quaerere temptat,
 
 7
 00:00:18,060 --> 00:00:22,480
-they'll see your real identity,
-precise location, operating system,
+personam tuam veram, locum exactum, systematem agendi videt,
 
 8
 00:00:22,800 --> 00:00:26,500
-all the sites you've visited,
-the browser you use to surf the web,
+omnes paginas, quas visitavisti, navem, quam pro navigatione in coniunctione 
computatorum usas
 
 9
 00:00:26,700 --> 00:00:29,140
-and so much more information
-about you and your life
+etiam magis informationis de te vitaque tua
 
 10
-00:00:29,620 --> 00:00:32,460
-which you probably didn't mean
-to share with unknown strangers,
+00:00:29,200 --> 00:00:31,500
+quam verisimile non ad nescitos ostendere voluisti,
 
 11
-00:00:32,920 --> 00:00:35,840
-who could easily use this data
-to exploit you.
+00:00:31,700 --> 00:00:34,000
+qui eam informationem pro explosione de te usare possint.
 
 12
-00:00:36,220 --> 00:00:38,120
+00:00:34,500 --> 00:00:37,000
 But not if you're using Tor!
 
 13
-00:00:39,140 --> 00:00:42,840
+00:00:37,140 --> 00:00:40,840
 Tor Browser protects our privacy
 and identity on the Internet.
 
 14
-00:00:43,560 --> 00:00:46,760
+00:00:41,560 --> 00:00:44,760
 Tor secures your connection
 with three layers of encryption
 
 15
-00:00:46,940 --> 00:00:51,760
+00:00:44,940 --> 00:00:49,760
 and passes it through three voluntarily
 operated servers around the world,
 
 16
-00:00:52,280 --> 00:00:55,520
+00:00:50,280 --> 00:00:53,520
 which enables us to communicate
 anonymously over the Internet.
 
 17
-00:00:58,560 --> 00:01:00,280
+00:00:56,560 --> 00:00:58,280
 Tor also protects our data
 
 18
-00:01:00,400 --> 00:01:03,900
+00:00:58,400 --> 00:01:01,900
 against corporate or government targeted
 and mass surveillance.
 
 19
-00:01:04,880 --> 00:01:09,340
+00:01:02,880 --> 00:01:07,340
 Perhaps you live in a repressive country
 which tries to control and surveil the Internet.
 
 20
-00:01:09,900 --> 00:01:13,800
+00:01:07,900 --> 00:01:11,800
 Or perhaps you don't want big corporations
 taking advantage of your personal information.
 
 21
-00:01:14,880 --> 00:01:17,640
+00:01:12,880 --> 00:01:15,640
 Tor makes all of its users
 to look the same
 
 22
-00:01:17,920 --> 00:01:20,800
+00:01:15,920 --> 00:01:18,800
 which confuses the observer
 and makes you anonymous.
 
 23
-00:01:21,500 --> 00:01:24,980
+00:01:19,500 --> 00:01:22,980
 So, the more people use the Tor network,
 the stronger it gets
 
 24
-00:01:25,140 --> 00:01:29,800
+00:01:23,140 --> 00:01:27,800
 as it's easier to hide in a crowd
 of people who look exactly the same.
 
 25
-00:01:30,700 --> 00:01:33,240
+00:01:28,700 --> 00:01:31,240
 You can bypass the censorship
 without being worried about
 
 26
-00:01:33,400 --> 00:01:36,100
+00:01:31,400 --> 00:01:34,100
 the censor knowing what you do
 on the Internet.
 
 27
-00:01:38,540 --> 00:01:41,440
+00:01:36,540 --> 00:01:39,440
 The ads won't follow you
 everywhere for months,
 
 28
-00:01:41,640 --> 00:01:43,300
+00:01:39,640 --> 00:01:41,300
 starting when you first
 clicked on a product.
 
 29
-00:01:45,880 --> 00:01:49,380
+00:01:43,880 --> 00:01:47,380
 By using Tor, the sites you visit
 won't even know who you are,
 
 30
-00:01:49,540 --> 00:01:51,760
+00:01:47,540 --> 00:01:49,760
 from what part of the world
 you're visiting them,
 
 31
-00:01:51,920 --> 00:01:53,920
+00:01:49,920 --> 00:01:51,920
 unless you login and tell them so.
 
 32
-00:01:56,200 --> 00:01:57,840
+00:01:54,200 --> 00:01:55,840
 By downloading and using Tor,
 
 33
-00:01:58,200 --> 00:02:00,560
+00:01:56,200 --> 00:01:58,560
 you can protect the people
 who need anonymity,
 
 34
-00:02:00,880 --> 00:02:03,640
+00:01:58,880 --> 00:02:01,640
 like activists, journalists and bloggers.
 
 35
-00:02:04,000 --> 00:02:09,000
+00:02:02,000 --> 00:02:07,000
 Download and use Tor! Or run a relay!
 

[tor-commits] [translation/torbutton-branddtd_completed] Update translations for torbutton-branddtd_completed

2016-08-30 Thread translation
commit 30d29b76689a1cd38d0bb78faed5bd7b22d6bff1
Author: Translation commit bot 
Date:   Tue Aug 30 08:16:37 2016 +

Update translations for torbutton-branddtd_completed
---
 la/brand.dtd | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/la/brand.dtd b/la/brand.dtd
new file mode 100644
index 000..5edd48b
--- /dev/null
+++ b/la/brand.dtd
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-branddtd] Update translations for torbutton-branddtd

2016-08-30 Thread translation
commit a64a0b63127c40cc3fa60e8b113a12c6f185135c
Author: Translation commit bot 
Date:   Tue Aug 30 08:16:33 2016 +

Update translations for torbutton-branddtd
---
 la/brand.dtd | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/la/brand.dtd b/la/brand.dtd
index 3df1a08..5edd48b 100644
--- a/la/brand.dtd
+++ b/la/brand.dtd
@@ -2,14 +2,14 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-
-
-
-
-
+
+
+
+
+
 
 
-
-
-
-
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2016-08-30 Thread translation
commit 6ede6a124be7a55c1f44892083cb8369db97558e
Author: Translation commit bot 
Date:   Tue Aug 30 08:16:19 2016 +

Update translations for abouttor-homepage
---
 la/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/la/aboutTor.dtd b/la/aboutTor.dtd
index 19b080e..d5dbfba 100644
--- a/la/aboutTor.dtd
+++ b/la/aboutTor.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2016-08-30 Thread translation
commit 125b657122717b6dd52e86e296d95ba04e0b037d
Author: Translation commit bot 
Date:   Tue Aug 30 08:16:23 2016 +

Update translations for abouttor-homepage_completed
---
 la/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/la/aboutTor.dtd b/la/aboutTor.dtd
index 19b080e..d5dbfba 100644
--- a/la/aboutTor.dtd
+++ b/la/aboutTor.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/tails-misc] Update translations for tails-misc

2016-08-30 Thread translation
commit 708207bfb694816e2ae7e3d584c95e68dbbdf343
Author: Translation commit bot 
Date:   Tue Aug 30 08:16:13 2016 +

Update translations for tails-misc
---
 la.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/la.po b/la.po
index c605370..85ee347 100644
--- a/la.po
+++ b/la.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Alisa P , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-07-31 10:43+0200\n"
-"PO-Revision-Date: 2016-08-07 10:14+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-08-30 07:59+\n"
+"Last-Translator: Alisa P \n"
 "Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,7 +20,7 @@ msgstr ""
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
 msgid "Tor is ready"
-msgstr ""
+msgstr "Tor adest."
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
@@ -537,7 +538,7 @@ msgstr ""
 
 #: 
../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:1
 msgid "Tor Browser"
-msgstr ""
+msgstr "Tor navis"
 
 #: 
../config/chroot_local-includes/usr/share/applications/tor-browser.desktop.in.h:2
 msgid "Anonymous Web Browser"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torcheck] Update translations for torcheck

2016-08-30 Thread translation
commit 823e8b33a2134bd1aca5b0e85b2e470ab029f716
Author: Translation commit bot 
Date:   Tue Aug 30 08:15:10 2016 +

Update translations for torcheck
---
 la/torcheck.po | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/la/torcheck.po b/la/torcheck.po
index 63b705a..1ce6810 100644
--- a/la/torcheck.po
+++ b/la/torcheck.po
@@ -2,12 +2,13 @@
 # Copyright (C) 2008-2013 The Tor Project, Inc
 # 
 # Translators:
+# Alisa P , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-08-30 07:34+\n"
-"Last-Translator: runasand \n"
+"PO-Revision-Date: 2016-08-30 07:59+\n"
+"Last-Translator: Alisa P \n"
 "Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Congratulations. This browser is configured to use Tor."
-msgstr ""
+msgstr "Bene. Ea navis Tor usare potest."
 
 msgid ""
 "Please refer to the https://www.torproject.org/\;>Tor website "

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-abouttorproperties_completed] Update translations for torbutton-abouttorproperties_completed

2016-08-30 Thread translation
commit ea867403842433e1c13a752062c390cd527a68f7
Author: Translation commit bot 
Date:   Tue Aug 30 07:47:08 2016 +

Update translations for torbutton-abouttorproperties_completed
---
 la/abouttor.properties | 21 +
 1 file changed, 21 insertions(+)

diff --git a/la/abouttor.properties b/la/abouttor.properties
new file mode 100644
index 000..3fa6e10
--- /dev/null
+++ b/la/abouttor.properties
@@ -0,0 +1,21 @@
+# Copyright (c) 2014, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+aboutTor.searchSP.privacy=Quaerere certe cum Startpage
+# The following string is a link which replaces %1$S above.
+aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchSP.search.link=https://startpage.com/
+
+aboutTor.searchDDG.privacy=Quaerere certe cum DuckDuckGo
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDDG.search.link=https://duckduckgo.com/
+
+aboutTor.searchDC.privacy=Quaerere certe cum Disconnect.me
+# The following string is a link which replaces %1$S above.
+aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
+# The following string is a link which replaces %2$S above.
+aboutTor.searchDC.search.link=https://search.disconnect.me/

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-abouttorproperties] Update translations for torbutton-abouttorproperties

2016-08-30 Thread translation
commit ec9c64916428348d108c34ec6c0a0d7b245649e5
Author: Translation commit bot 
Date:   Tue Aug 30 07:47:05 2016 +

Update translations for torbutton-abouttorproperties
---
 la/abouttor.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/la/abouttor.properties b/la/abouttor.properties
index d607324..3fa6e10 100644
--- a/la/abouttor.properties
+++ b/la/abouttor.properties
@@ -2,19 +2,19 @@
 # See LICENSE for licensing information.
 # vim: set sw=2 sts=2 ts=8 et:
 
-aboutTor.searchSP.privacy=Search securely with Startpage.
+aboutTor.searchSP.privacy=Quaerere certe cum Startpage
 # The following string is a link which replaces %1$S above.
 aboutTor.searchSP.privacy.link=https://startpage.com/eng/protect-privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchSP.search.link=https://startpage.com/
 
-aboutTor.searchDDG.privacy=Search securely with DuckDuckGo.
+aboutTor.searchDDG.privacy=Quaerere certe cum DuckDuckGo
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDDG.privacy.link=https://duckduckgo.com/privacy.html
 # The following string is a link which replaces %2$S above.
 aboutTor.searchDDG.search.link=https://duckduckgo.com/
 
-aboutTor.searchDC.privacy=Search securely with Disconnect.me.
+aboutTor.searchDC.privacy=Quaerere certe cum Disconnect.me
 # The following string is a link which replaces %1$S above.
 aboutTor.searchDC.privacy.link=https://disconnect.me/privacy
 # The following string is a link which replaces %2$S above.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed

2016-08-30 Thread translation
commit b49b3ab67a7fa6feab5dd031bc5f7ecf608cb341
Author: Translation commit bot 
Date:   Tue Aug 30 07:46:20 2016 +

Update translations for abouttor-homepage_completed
---
 la/aboutTor.dtd | 49 +
 1 file changed, 49 insertions(+)

diff --git a/la/aboutTor.dtd b/la/aboutTor.dtd
new file mode 100644
index 000..19b080e
--- /dev/null
+++ b/la/aboutTor.dtd
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+https://startpage.com/rth/search;>
+https://duckduckgo.com/html/;>
+https://search.disconnect.me/searchTerms/search?ses=Googlelocation_option=USsource=tor;>
+
+
+
+
+
+
+
+
+https://www.torproject.org/download/download.html.en#warning;>
+
+
+
+https://www.torproject.org/docs/tor-doc-relay.html.en;>
+
+https://www.torproject.org/getinvolved/volunteer.html.en;>
+
+https://www.torproject.org/donate/donate.html.en;>
+
+
+
+https://www.torproject.org/about/overview.html.en;>

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torbutton-aboutdialogdtd] Update translations for torbutton-aboutdialogdtd

2016-08-30 Thread translation
commit ac9f2c230bf2ffd5cbad14df40163d751381df54
Author: Translation commit bot 
Date:   Tue Aug 30 07:46:58 2016 +

Update translations for torbutton-aboutdialogdtd
---
 la/aboutdialog.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/la/aboutdialog.dtd b/la/aboutdialog.dtd
index 5099ad7..996adb5 100644
--- a/la/aboutdialog.dtd
+++ b/la/aboutdialog.dtd
@@ -1,6 +1,6 @@
-
+
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2016-08-30 Thread translation
commit e76664c391de03baf94a6838f672b575712911da
Author: Translation commit bot 
Date:   Tue Aug 30 07:46:17 2016 +

Update translations for abouttor-homepage
---
 la/aboutTor.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/la/aboutTor.dtd b/la/aboutTor.dtd
index 8f026d2..19b080e 100644
--- a/la/aboutTor.dtd
+++ b/la/aboutTor.dtd
@@ -37,13 +37,13 @@
 https://www.torproject.org/download/download.html.en#warning;>
 
 
-
+
 https://www.torproject.org/docs/tor-doc-relay.html.en;>
-
+
 https://www.torproject.org/getinvolved/volunteer.html.en;>
-
+
 https://www.torproject.org/donate/donate.html.en;>
 
-
-
+
+
 https://www.torproject.org/about/overview.html.en;>

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [translation/torcheck] Update translations for torcheck

2016-08-30 Thread translation
commit 079a3c3d378feccfa00eeabdfa2f7beca7e25726
Author: Translation commit bot 
Date:   Tue Aug 30 07:45:10 2016 +

Update translations for torcheck
---
 la/torcheck.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/la/torcheck.po b/la/torcheck.po
index ae39a11..63b705a 100644
--- a/la/torcheck.po
+++ b/la/torcheck.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2015-02-14 08:38+\n"
+"PO-Revision-Date: 2016-08-30 07:34+\n"
 "Last-Translator: runasand \n"
-"Language-Team: Latin 
(http://www.transifex.com/projects/p/torproject/language/la/)\n"
+"Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -66,7 +66,7 @@ msgstr ""
 msgid ""
 "The Tor Project is a US 501(c)(3) non-profit dedicated to the research, "
 "development, and education of online anonymity and privacy."
-msgstr ""
+msgstr "Tor Programma est US  501(c)(3) non-proferitionis ad quaestiones, 
processum, doctionem navigandi sine nomine in coniunctione computatorum."
 
 msgid "Learn More "
 msgstr ""

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits


[tor-commits] [tor-browser/tor-browser-45.3.0esr-6.5-1] Bug 1211567 - Enable domain socket support for SOCKS; r=bagder

2016-08-30 Thread gk
commit cde73b2295b75898ca435ed9f78541eccf6c34cb
Author: Liang-Heng Chen 
Date:   Thu Jun 30 11:23:40 2016 +0800

Bug 1211567 - Enable domain socket support for SOCKS; r=bagder

MozReview-Commit-ID: 9yMFckwPf6C

--HG--
extra : rebase_source : 17f006f17f97f015403153879cd8b50e482cfc8c
---
 netwerk/base/nsProtocolProxyService.cpp |  22 +--
 netwerk/base/nsProtocolProxyService.h   |   5 +-
 netwerk/socket/nsSOCKSIOLayer.cpp   | 101 ++--
 3 files changed, 104 insertions(+), 24 deletions(-)

diff --git a/netwerk/base/nsProtocolProxyService.cpp 
b/netwerk/base/nsProtocolProxyService.cpp
index 593d0af..5d8dc4b 100644
--- a/netwerk/base/nsProtocolProxyService.cpp
+++ b/netwerk/base/nsProtocolProxyService.cpp
@@ -398,6 +398,16 @@ proxy_GetBoolPref(nsIPrefBranch *aPrefBranch,
 aResult = temp;
 }
 
+static inline bool
+IsHostDomainSocket(const nsACString& aHost)
+{
+#ifdef XP_UNIX
+return Substring(aHost, 0, 5) == "file:";
+#else
+return false;
+#endif // XP_UNIX
+}
+
 //
 
 static const int32_t PROXYCONFIG_DIRECT4X = 3;
@@ -623,7 +633,7 @@ nsProtocolProxyService::PrefsChanged(nsIPrefBranch 
*prefBranch,
 proxy_GetIntPref(prefBranch, PROXY_PREF("ftp_port"), mFTPProxyPort);
 
 if (!pref || !strcmp(pref, PROXY_PREF("socks")))
-proxy_GetStringPref(prefBranch, PROXY_PREF("socks"), mSOCKSProxyHost);
+proxy_GetStringPref(prefBranch, PROXY_PREF("socks"), 
mSOCKSProxyTarget);
 
 if (!pref || !strcmp(pref, PROXY_PREF("socks_port")))
 proxy_GetIntPref(prefBranch, PROXY_PREF("socks_port"), 
mSOCKSProxyPort);
@@ -1871,8 +1881,9 @@ nsProtocolProxyService::Resolve_Internal(nsIChannel 
*channel,
 uint32_t proxyFlags = 0;
 
 if ((flags & RESOLVE_PREFER_SOCKS_PROXY) &&
-!mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) {
-  host = 
+!mSOCKSProxyTarget.IsEmpty() &&
+(IsHostDomainSocket(mSOCKSProxyTarget) || mSOCKSProxyPort > 0)) {
+  host = 
   if (mSOCKSProxyVersion == 4)
   type = kProxyType_SOCKS4;
   else
@@ -1908,8 +1919,9 @@ nsProtocolProxyService::Resolve_Internal(nsIChannel 
*channel,
 type = kProxyType_HTTP;
 port = mFTPProxyPort;
 }
-else if (!mSOCKSProxyHost.IsEmpty() && mSOCKSProxyPort > 0) {
-host = 
+else if (!mSOCKSProxyTarget.IsEmpty() &&
+(IsHostDomainSocket(mSOCKSProxyTarget) || mSOCKSProxyPort > 0)) {
+host = 
 if (mSOCKSProxyVersion == 4)
 type = kProxyType_SOCKS4;
 else
diff --git a/netwerk/base/nsProtocolProxyService.h 
b/netwerk/base/nsProtocolProxyService.h
index e9813c8..1e1ea7d 100644
--- a/netwerk/base/nsProtocolProxyService.h
+++ b/netwerk/base/nsProtocolProxyService.h
@@ -382,8 +382,9 @@ protected:
 
 nsCStringmHTTPSProxyHost;
 int32_t  mHTTPSProxyPort;
-
-nsCStringmSOCKSProxyHost;
+
+// mSOCKSProxyTarget could be a host or a domain socket path.
+nsCStringmSOCKSProxyTarget;
 int32_t  mSOCKSProxyPort;
 int32_t  mSOCKSProxyVersion;
 bool mSOCKSProxyRemoteDNS;
diff --git a/netwerk/socket/nsSOCKSIOLayer.cpp 
b/netwerk/socket/nsSOCKSIOLayer.cpp
index 568c700..b26408d 100644
--- a/netwerk/socket/nsSOCKSIOLayer.cpp
+++ b/netwerk/socket/nsSOCKSIOLayer.cpp
@@ -19,8 +19,10 @@
 #include "nsIDNSListener.h"
 #include "nsICancelable.h"
 #include "nsThreadUtils.h"
+#include "nsIURL.h"
 #include "mozilla/Logging.h"
 #include "mozilla/net/DNS.h"
+#include "mozilla/unused.h"
 
 using mozilla::LogLevel;
 using namespace mozilla::net;
@@ -113,6 +115,54 @@ private:
 PRStatus ReadFromSocket(PRFileDesc *fd);
 PRStatus WriteToSocket(PRFileDesc *fd);
 
+bool IsHostDomainSocket()
+{
+#ifdef XP_UNIX
+nsAutoCString proxyHost;
+mProxy->GetHost(proxyHost);
+return Substring(proxyHost, 0, 5) == "file:";
+#else
+return false;
+#endif // XP_UNIX
+}
+
+nsresult SetDomainSocketPath(const nsACString& aDomainSocketPath,
+ NetAddr* aProxyAddr)
+{
+#ifdef XP_UNIX
+nsresult rv;
+MOZ_ASSERT(aProxyAddr);
+
+nsCOMPtr url = do_CreateInstance(NS_STANDARDURL_CONTRACTID, 
);
+if (NS_WARN_IF(NS_FAILED(rv))) {
+return rv;
+}
+
+if (NS_WARN_IF(NS_FAILED(rv = url->SetSpec(aDomainSocketPath {
+return rv;
+}
+
+nsAutoCString path;
+if (NS_WARN_IF(NS_FAILED(rv = url->GetPath(path {
+return rv;
+}
+
+if (sizeof(aProxyAddr->local.path) <= path.Length()) {
+NS_WARNING("domain socket path too long.");
+return NS_ERROR_FAILURE;
+}
+
+aProxyAddr->raw.family = AF_UNIX;
+

[tor-commits] [translation/abouttor-homepage] Update translations for abouttor-homepage

2016-08-30 Thread translation
commit 9299d032cac06874ab7e97c842b714568774fc7d
Author: Translation commit bot 
Date:   Tue Aug 30 07:16:15 2016 +

Update translations for abouttor-homepage
---
 la/aboutTor.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/la/aboutTor.dtd b/la/aboutTor.dtd
index 9eca384..8f026d2 100644
--- a/la/aboutTor.dtd
+++ b/la/aboutTor.dtd
@@ -35,8 +35,8 @@
 
 
 https://www.torproject.org/download/download.html.en#warning;>
-
-
+
+
 
 https://www.torproject.org/docs/tor-doc-relay.html.en;>
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits