date:20161017

[tor-commits] [user-manual/master] Update downloading.page to include review feedback

2016-10-17 Thread colin

commit f83a1c44e1e064800f972ad8287c0874d61b4b36
Author: Colin Childs 
Date:   Mon Oct 17 23:20:55 2016 -0500

Update downloading.page to include review feedback
---
 C/downloading.page | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/C/downloading.page b/C/downloading.page
index 85653e8..51848d1 100644
--- a/C/downloading.page
+++ b/C/downloading.page
@@ -12,9 +12,8 @@
 
 The safest and simplest way to download Tor Browser is from the official
 Tor Project website at https://www.torproject.org. Your connection to
-the site will be secured using
-HTTPS, so you can be sure that no
-one is tampering with your copy of the software while you download it.
+the site will be secured usingHTTPS,
+which makes it much harder for somebody to tamper with.
 
 
 
@@ -69,7 +68,7 @@ below.
  
 
  
- To use GetTor via XMPP:
+ To use GetTor via Jabber/XMPP (Tor Messenger, Jitsi, CoyIM):
  
  
   

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

[tor-commits] [user-manual/master] Drop instructions to contact help-desk

2016-10-17 Thread colin

commit a1ebe3d3f2a2b399fab2bab084b700c8da48b0f3
Author: Colin Childs 
Date:   Mon Oct 17 23:15:38 2016 -0500

Drop instructions to contact help-desk
---
 C/downloading.page | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/C/downloading.page b/C/downloading.page
index 4479c2a..85653e8 100644
--- a/C/downloading.page
+++ b/C/downloading.page
@@ -133,7 +133,7 @@ below.
  
 
 
-
+
 
 

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

[tor-commits] [user-manual/master] List gettor before Satori

2016-10-17 Thread colin

commit e81b577996b38afd2130af2736e3fbd1532eb398
Author: Colin Childs 
Date:   Mon Oct 17 23:03:08 2016 -0500

List gettor before Satori
---
 C/downloading.page | 104 ++---
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/C/downloading.page b/C/downloading.page
index f0d3e15..4479c2a 100644
--- a/C/downloading.page
+++ b/C/downloading.page
@@ -24,58 +24,6 @@ happens, you can use one of the alternative download methods 
listed
 below.
 
 
-
-Satori
- 
- Satori is an add-on for the Chrome or Chromium browsers that allows you
- to download several security and privacy programs from different
- sources.
- 
- 
- To download Tor Browser using Satori:
- 
- 
-  
-  
-  Install Satori from the Chrome App Store.
-  
-  
-  
-  
-  Select Satori from your browserâs Apps menu.
-  
-  
-  
-  
-  When Satori opens, click on your preferred language. A menu will open
-  listing the available downloads for that language. Find the entry for
-  Tor Browser under the name of your operating system. Select
-  either âAâ or âBâ after the name of the program â each one 
represents
-  a different source from which to get the software. Your download will
-  then begin.
-  
-  
-  
-  
-  Wait for your download to finish, then find the âGenerate Hashâ
-  section in Satoriâs menu and click âSelect Filesâ.
-  
-  
-  
-  
-  Select the downloaded Tor Browser file. Satori will display the
-  checksum of the file, which you should compare with the softwareâs
-  original checksum: you can find this by clicking the word âchecksumâ
-  after the link you clicked on to start the download. If the checksums
-  match, your download was successful, and you can
-  begin using Tor Browser. If they do not
-  match, you may need to try downloading again, or from a different
-  source.
-  
-  
- 
-
-
 
 GetTor
  
@@ -133,6 +81,58 @@ below.
  
 
 
+
+Satori
+ 
+ Satori is an add-on for the Chrome or Chromium browsers that allows you
+ to download several security and privacy programs from different
+ sources.
+ 
+ 
+ To download Tor Browser using Satori:
+ 
+ 
+  
+  
+  Install Satori from the Chrome App Store.
+  
+  
+  
+  
+  Select Satori from your browserâs Apps menu.
+  
+  
+  
+  
+  When Satori opens, click on your preferred language. A menu will open
+  listing the available downloads for that language. Find the entry for
+  Tor Browser under the name of your operating system. Select
+  either âAâ or âBâ after the name of the program â each one 
represents
+  a different source from which to get the software. Your download will
+  then begin.
+  
+  
+  
+  
+  Wait for your download to finish, then find the âGenerate Hashâ
+  section in Satoriâs menu and click âSelect Filesâ.
+  
+  
+  
+  
+  Select the downloaded Tor Browser file. Satori will display the
+  checksum of the file, which you should compare with the softwareâs
+  original checksum: you can find this by clicking the word âchecksumâ
+  after the link you clicked on to start the download. If the checksums
+  match, your download was successful, and you can
+  begin using Tor Browser. If they do not
+  match, you may need to try downloading again, or from a different
+  source.
+  
+  
+ 
+
+
 
 Tor website mirrors
  



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

[tor-commits] [user-manual/master] Clean up some phrasing based on feedback

2016-10-17 Thread colin

commit ebdc5f876f347f0d2bc804a0e27a1762c1da4559
Author: Colin Childs 
Date:   Mon Oct 17 23:10:34 2016 -0500

Clean up some phrasing based on feedback
---
 C/about-tor-browser.page | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/C/about-tor-browser.page b/C/about-tor-browser.page
index 97e960a..b0b551b 100644
--- a/C/about-tor-browser.page
+++ b/C/about-tor-browser.page
@@ -16,10 +16,9 @@
 
   
 
-  Your internet activity, including the names and addresses of
-  the websites you visit, will be hidden from your Internet
-  service provider and from anyone watching your connection
-  locally.
+ Your internet service provider, and anyone watching your connection
+ locally, will not be able to track your internet activity, including
+ the names and addresses of the websites you visit.
 
   
   
@@ -43,7 +42,7 @@
   is exited or a New
   Identity is requested).
 
-
+
 
 
@@ -60,9 +59,9 @@
 
 
   The image above illustrates a user browsing to different websites
-  over Tor. The green monitors represent relays in the Tor network,
-  while the three keys represent the layers of encryption between the
-  user and each relay.
+  over Tor. The green middle computers represent relays in the Tor
+  network, while the three keys represent the layers of encryption
+  between the user and each relay.
 
   
 

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

[user-manual/master] Correcting XMPP gettor address⇧

2016-10-17 Thread colin

commit da78f6b8ddfd1c559ba76e8414fccfdc104937fa
Author: Colin Childs 
Date:   Mon Oct 17 23:00:51 2016 -0500

Correcting XMPP gettor addressâ§
---
 C/downloading.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/C/downloading.page b/C/downloading.page
index 2820c66..f0d3e15 100644
--- a/C/downloading.page
+++ b/C/downloading.page
@@ -127,7 +127,7 @@ below.
   
   
   To get links for downloading Tor Browser in Chinese for Linux, send a
-  message to get_...@riseup.net with the words "linux zh" in it.
+  message to get...@torproject.org with the words "linux zh" in it.
   
   
  

___
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-10-17 Thread translation

commit 42abc6d12dbc2aa2a82418b49bc30136b3ec16c5
Author: Translation commit bot 
Date:   Mon Oct 17 21:16:35 2016 +

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

diff --git a/lt/torbutton.dtd b/lt/torbutton.dtd
index 4b54c80..46bf6df 100644
--- a/lt/torbutton.dtd
+++ b/lt/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 

___
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-10-17 Thread translation

commit 3bd6c940f7c550cbebe1d2b704d40339c00929d3
Author: Translation commit bot 
Date:   Mon Oct 17 20:46:36 2016 +

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

diff --git a/lv/torbutton.dtd b/lv/torbutton.dtd
index e641778..5b215b8 100644
--- a/lv/torbutton.dtd
+++ b/lv/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 

___
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] s/Bug/Trac/ in changelog

2016-10-17 Thread arlo

commit f9a66e773f810c8a5fc732aedcef828f8fb0e233
Author: Arlo Breault 
Date:   Mon Oct 17 13:44:10 2016 -0700

s/Bug/Trac/ in changelog
---
 ChangeLog | 82 +++
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fa2811f..68ec887 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,44 +2,44 @@ Tor Messenger 0.2.0b3 --
  * All Platforms
* Use the tor-browser-45.4.0esr-6.0-1 branch on tor-browser
* Use the THUNDERBIRD_45_4_0_RELEASE tag on comm-esr45
-   * Bug 16536: Investigate Tor Browser patches relevant to Tor Messenger
-   * Bug 20208: Put conversations on hold by default
+   * Trac 16536: Investigate Tor Browser patches relevant to Tor Messenger
+   * Trac 20208: Put conversations on hold by default
* Properly handle incoming xmpp server messages (bugzilla 1246431)
-   * Bug 20276: Fix toggling sounds
-   * Bug 17480: Make url linkification toggleable
+   * Trac 20276: Fix toggling sounds
+   * Trac 17480: Make url linkification toggleable
* Update ctypes-otr to 00e4e80a
-   * Bug 20231: Remove incomplete translations
+   * Trac 20231: Remove incomplete translations
  * Mac
-   * Bug 20206: Avoid prompting to download font "Osaka" on macOS Sierra
-   * Bug 20204: Windows don't drag on macOS Sierra
+   * Trac 20206: Avoid prompting to download font "Osaka" on macOS Sierra
+   * Trac 20204: Windows don't drag on macOS Sierra
 
 Tor Messenger 0.2.0b2 -- September 06, 2016
  * Mac
-   * Bug 19269: Fix OS X file permissions
+   * Trac 19269: Fix OS X file permissions
* Fix OS X profile when application is not placed in /Applications
 
 Tor Messenger 0.2.0b1 -- September 02, 2016
  * 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 19053: Display plaintext in notifications
-   * Bug 17363: Remove redundant Tor Messenger folders
-   * Bug 14388: Secure automatic updates for Tor Messenger
-   * Bug 13861: Preserve user profiles after updates
+   * Trac 19053: Display plaintext in notifications
+   * Trac 17363: Remove redundant Tor Messenger folders
+   * Trac 14388: Secure automatic updates for Tor Messenger
+   * Trac 13861: Preserve user profiles after updates
* Update libgcrypt to 1.6.6 for CVE-2016-6316
* Update ctypes-otr to 0.0.2
  * Linux
-   * Bug 18634: Switch to building Tor Messenger on Debian Wheezy
+   * Trac 18634: Switch to building Tor Messenger on Debian Wheezy
  * Mac
-   * Bug 13861: Profile directory stored in ~/Library/Application\ 
Support/TorMessenger-Data
-   * Bug 17460: Add graphics for OS X drag and drop to Applications
-   * Bug 17648: Fix update service error in error console
+   * Trac 13861: Profile directory stored in ~/Library/Application\ 
Support/TorMessenger-Data
+   * Trac 17460: Add graphics for OS X drag and drop to Applications
+   * Trac 17648: Fix update service error in error console
 
 Tor Messenger 0.1.0b6 -- April 06, 2016
  * All Platforms
* Use the THUNDERBIRD_45_0b3_RELEASE tag on mozilla-esr45
* Use the THUNDERBIRD_45_0b3_RELEASE tag on comm-esr45
-   * Bug 18533: Disable sending fonts or colors as part of messages
+   * Trac 18533: Disable sending fonts or colors as part of messages
* ctypes-otr
  * GH 68: Don't close notification bar until verification succeeds (patch 
by Elias Rohrer)
  * GH 71: Improve verifying from the fingerprint manager (patch by Vu Quoc 
Huy)
@@ -47,37 +47,37 @@ Tor Messenger 0.1.0b6 -- April 06, 2016
 
 Tor Messenger 0.1.0b5 -- March 09, 2016
  * All Platforms
-   * Bug 13795: Remove SPI root certificate because Debian no longer ships it
-   * Bug 18094: Remove references to torbutton from start-tor-messenger script
-   * Bug 18235: Disable Facebook as they no longer support XMPP
-   * Bug 17494: Better error reporting for failed outgoing messages
-   * Bug 17749: Show version information in the "About" window
-   * Bug 13312: Add support for OTR over Twitter DMs
+   * Trac 13795: Remove SPI root certificate because Debian no longer ships it
+   * Trac 18094: Remove references to torbutton from start-tor-messenger script
+   * Trac 18235: Disable Facebook as they no longer support XMPP
+   * Trac 17494: Better error reporting for failed outgoing messages
+   * Trac 17749: Show version information in the "About" window
+   * Trac 13312: Add support for OTR over Twitter DMs
  * Mac
-   * Bug 17896: Add Edit menu to the conversation window on OS X
+   * Trac 17896: Add Edit menu to the conversation window on OS X
  * Windows
* ctypes-otr
  * GH 65: Support Unicode paths on Windows
 
 Tor Messenger 0.1.0b4 -- November 22 2015
  * All Platforms
-   * Bug 17492: Include default bridges configuration
+   * Trac 17492: Include default bridges configuration
* Use tor and the pluggable transports from tor-browser 5.0.4
-   * Bug 17552: Instantbird throwing on XMPP non-MUC

[tor-commits] [tor-messenger-build/master] Bump ctypes-otr for trac 20231

2016-10-17 Thread arlo

commit 28b57bb120af499ebf6d17b64f0e335ed94c29c3
Author: Arlo Breault 
Date:   Mon Oct 17 13:41:44 2016 -0700

Bump ctypes-otr for trac 20231

 * Incomplete translations causing throws
---
 ChangeLog  | 2 ++
 projects/ctypes-otr/config | 6 ++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 352cca4..fa2811f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,8 @@ Tor Messenger 0.2.0b3 --
* Properly handle incoming xmpp server messages (bugzilla 1246431)
* Bug 20276: Fix toggling sounds
* Bug 17480: Make url linkification toggleable
+   * Update ctypes-otr to 00e4e80a
+   * Bug 20231: Remove incomplete translations
  * Mac
* Bug 20206: Avoid prompting to download font "Osaka" on macOS Sierra
* Bug 20204: Windows don't drag on macOS Sierra
diff --git a/projects/ctypes-otr/config b/projects/ctypes-otr/config
index de47d55..6d1373d 100644
--- a/projects/ctypes-otr/config
+++ b/projects/ctypes-otr/config
@@ -1,9 +1,7 @@
 # vim: filetype=yaml sw=2
-version: 0.0.2
+version: '[% c("abbrev") %]'
 git_url: https://github.com/arlolra/ctypes-otr
-git_hash: '[% c("version") %]'
-gpg_keyring: arlolra.gpg
-tag_gpg_id: 1
+git_hash: 00e4e80abe07ac2067ffadbe3d63e3205bbcd8dd
 filename: 'ctypes-otr-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %].tar.gz'
 var:
   lib_glob: 'lib/*.so*'



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

[tor-commits] [webwml/master] New tor releases.

2016-10-17 Thread nickm

commit daaf7f933c574d1672e145fbede07ac396d7761d
Author: Nick Mathewson 
Date:   Mon Oct 17 16:43:59 2016 -0400

New tor releases.
---
 Makefile | 4 ++--
 include/versions.wmi | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f7c5377..cceee41 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@
 # branch to your personal webwml repository, open a trac ticket in the
 # website component, and set it to needs_review.
 
-export STABLETAG=tor-0.2.8.8
-export DEVTAG=tor-0.2.9.3-alpha
+export STABLETAG=tor-0.2.8.9
+export DEVTAG=tor-0.2.9.4-alpha
 
 
 WMLBASE=.
diff --git a/include/versions.wmi b/include/versions.wmi
index 4aed911..044bb6d 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
-0.2.8.8
-0.2.9.3-alpha
+0.2.8.9
+0.2.9.4-alpha
 
 0.2.8.7
 

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

[tor-commits] [tor/maint-0.2.8] Bump to 0.2.8.9-dev

2016-10-17 Thread nickm

commit b0f1241a1d9319387eb536c1edd0b4c15d1e8ac3
Author: Nick Mathewson 
Date:   Mon Oct 17 16:32:11 2016 -0400

Bump to 0.2.8.9-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 37827d6..fb91f34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.9])
+AC_INIT([tor],[0.2.8.9-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 59cb381..4a4bc9b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.9"
+!define VERSION "0.2.8.9-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 2b98d1c..689f36e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.9"
+#define VERSION "0.2.8.9-dev"
 
 
 

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

[tor-commits] [tor/release-0.2.8] Bump to 0.2.8.9-dev

2016-10-17 Thread nickm

commit b0f1241a1d9319387eb536c1edd0b4c15d1e8ac3
Author: Nick Mathewson 
Date:   Mon Oct 17 16:32:11 2016 -0400

Bump to 0.2.8.9-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 37827d6..fb91f34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.9])
+AC_INIT([tor],[0.2.8.9-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 59cb381..4a4bc9b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.9"
+!define VERSION "0.2.8.9-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 2b98d1c..689f36e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.9"
+#define VERSION "0.2.8.9-dev"
 
 
 



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

[tor-commits] [tor/master] Bump to 0.2.8.9-dev

2016-10-17 Thread nickm

commit b0f1241a1d9319387eb536c1edd0b4c15d1e8ac3
Author: Nick Mathewson 
Date:   Mon Oct 17 16:32:11 2016 -0400

Bump to 0.2.8.9-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 37827d6..fb91f34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.9])
+AC_INIT([tor],[0.2.8.9-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 59cb381..4a4bc9b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.9"
+!define VERSION "0.2.8.9-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 2b98d1c..689f36e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.9"
+#define VERSION "0.2.8.9-dev"
 
 
 



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

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-10-17 Thread nickm

commit badc444f7adce748fd4c4171a3748fc08f001022
Merge: 44c5fc6 b0f1241
Author: Nick Mathewson 
Date:   Mon Oct 17 16:32:17 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

2016-10-17 Thread nickm

commit 6e823a27f114523c566b99a4deb3900764570954
Merge: 702c1dc b0f1241
Author: Nick Mathewson 
Date:   Mon Oct 17 16:32:31 2016 -0400

Merge branch 'maint-0.2.8'

"ours" commit to avoid bumping version.

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

[tor-commits] [tor/master] Bump master to 0.2.9.4-alpha-dev

2016-10-17 Thread nickm

commit 702c1dcf7b4b659a94c8cc5f1d81d34fc1aeae3f
Author: Nick Mathewson 
Date:   Mon Oct 17 16:31:40 2016 -0400

Bump master to 0.2.9.4-alpha-dev
---
 ChangeLog   | 25 +
 configure.ac|  2 +-
 contrib/win32build/tor-mingw.nsi.in |  2 +-
 src/win32/orconfig.h|  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa9aace..7a10a7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+Changes in version 0.2.9.5-rc - 2016-1?-??
+
+
+Changes in version 0.2.8.9 - 2016-10-17
+  Tor 0.2.8.9 backports a fix for a security hole in previous versions
+  of Tor that would allow a remote attacker to crash a Tor client,
+  hidden service, relay, or authority. All Tor users should upgrade to
+  this version, or to 0.2.9.4-alpha. Patches will be released for older
+  versions of Tor.
+
+  o Major features (security fixes, also in 0.2.9.4-alpha):
+- Prevent a class of security bugs caused by treating the contents
+  of a buffer chunk as if they were a NUL-terminated string. At
+  least one such bug seems to be present in all currently used
+  versions of Tor, and would allow an attacker to remotely crash
+  most Tor instances, especially those compiled with extra compiler
+  hardening. With this defense in place, such bugs can't crash Tor,
+  though we should still fix them as they occur. Closes ticket
+  20384 (TROVE-2016-10-001).
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the October 4 2016 Maxmind GeoLite2
+  Country database.
+
+
 Changes in version 0.2.9.4-alpha - 2016-10-17
   Tor 0.2.9.4-alpha fixes a security hole in previous versions of Tor
   that would allow a remote attacker to crash a Tor client, hidden
diff --git a/configure.ac b/configure.ac
index 9bad7b4..d35f83c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.4-alpha])
+AC_INIT([tor],[0.2.9.4-alpha-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index d24e902..94bbfe2 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.4-alpha"
+!define VERSION "0.2.9.4-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3c13ff2..d902423 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.4-alpha"
+#define VERSION "0.2.9.4-alpha-dev"
 
 
 



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

[tor-commits] [tor/master] Update the buffer sentinel fix to work with our #20081 fix.

2016-10-17 Thread nickm

commit 66ecdcdd7573f1dafbdb1e14a7ef375f04be812c
Author: Nick Mathewson 
Date:   Mon Oct 17 14:52:44 2016 -0400

Update the buffer sentinel fix to work with our #20081 fix.
---
 src/or/buffers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/buffers.c b/src/or/buffers.c
index a7b46bf..8981fd2 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -205,7 +205,7 @@ chunk_grow(chunk_t *chunk, size_t sz)
 STATIC size_t
 preferred_chunk_size(size_t target)
 {
-  tor_assert(target <= SIZE_T_CEILING - CHUNK_HEADER_LEN);
+  tor_assert(target <= SIZE_T_CEILING - CHUNK_OVERHEAD);
   if (CHUNK_ALLOC_SIZE(target) >= MAX_CHUNK_ALLOC)
 return CHUNK_ALLOC_SIZE(target);
   size_t sz = MIN_CHUNK_ALLOC;



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

[tor-commits] [tor/release-0.2.8] Add a one-word sentinel value of 0x0 at the end of each buf_t chunk

2016-10-17 Thread nickm

commit 3cea86eb2fbb65949673eb4ba8ebb695c87a57ce
Author: Nick Mathewson 
Date:   Fri Oct 14 09:38:12 2016 -0400

Add a one-word sentinel value of 0x0 at the end of each buf_t chunk

This helps protect against bugs where any part of a buf_t's memory
is passed to a function that expects a NUL-terminated input.

It also closes TROVE-2016-10-001 (aka bug 20384).
---
 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/changes/buf-sentinel b/changes/buf-sentinel
new file mode 100644
index 000..7c5b829
--- /dev/null
+++ b/changes/buf-sentinel
@@ -0,0 +1,11 @@
+  o Major features (security fixes):
+
+- Prevent a class of security bugs caused by treating the contents
+  of a buffer chunk as if they were a NUL-terminated string.  At
+  least one such bug seems to be present in all currently used
+  versions of Tor, and would allow an attacker to remotely crash
+  most Tor instances, especially those compiled with extra compiler
+  hardening. With this defense in place, such bugs can't crash Tor,
+  though we should still fix them as they occur. Closes ticket 20384
+  (TROVE-2016-10-001).
+
diff --git a/src/or/buffers.c b/src/or/buffers.c
index be99744..74aebcc 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -69,12 +69,33 @@ static int parse_socks_client(const uint8_t *data, size_t 
datalen,
 
 #define CHUNK_HEADER_LEN STRUCT_OFFSET(chunk_t, mem[0])
 
+/* We leave this many NUL bytes at the end of the buffer. */
+#define SENTINEL_LEN 4
+
+/* Header size plus NUL bytes at the end */
+#define CHUNK_OVERHEAD (CHUNK_HEADER_LEN + SENTINEL_LEN)
+
 /** Return the number of bytes needed to allocate a chunk to hold
  * memlen bytes. */
-#define CHUNK_ALLOC_SIZE(memlen) (CHUNK_HEADER_LEN + (memlen))
+#define CHUNK_ALLOC_SIZE(memlen) (CHUNK_OVERHEAD + (memlen))
 /** Return the number of usable bytes in a chunk allocated with
  * malloc(memlen). */
-#define CHUNK_SIZE_WITH_ALLOC(memlen) ((memlen) - CHUNK_HEADER_LEN)
+#define CHUNK_SIZE_WITH_ALLOC(memlen) ((memlen) - CHUNK_OVERHEAD)
+
+#define DEBUG_SENTINEL
+
+#ifdef DEBUG_SENTINEL
+#define DBG_S(s) s
+#else
+#define DBG_S(s) (void)0
+#endif
+
+#define CHUNK_SET_SENTINEL(chunk, alloclen) do {\
+uint8_t *a = (uint8_t*) &(chunk)->mem[(chunk)->memlen]; \
+DBG_S(uint8_t *b = &((uint8_t*)(chunk))[(alloclen)-SENTINEL_LEN]);  \
+DBG_S(tor_assert(a == b));  \
+memset(a,0,SENTINEL_LEN);   \
+  } while (0)
 
 /** Return the next character in chunk onto which data can be appended.
  * If the chunk is full, this might be off the end of chunk->mem. */
@@ -131,6 +152,7 @@ chunk_new_with_alloc_size(size_t alloc)
   ch->memlen = CHUNK_SIZE_WITH_ALLOC(alloc);
   total_bytes_allocated_in_chunks += alloc;
   ch->data = >mem[0];
+  CHUNK_SET_SENTINEL(ch, alloc);
   return ch;
 }
 
@@ -140,18 +162,20 @@ static INLINE chunk_t *
 chunk_grow(chunk_t *chunk, size_t sz)
 {
   off_t offset;
-  size_t memlen_orig = chunk->memlen;
+  const size_t memlen_orig = chunk->memlen;
+  const size_t orig_alloc = CHUNK_ALLOC_SIZE(memlen_orig);
+  const size_t new_alloc = CHUNK_ALLOC_SIZE(sz);
   tor_assert(sz > chunk->memlen);
   offset = chunk->data - chunk->mem;
-  chunk = tor_realloc(chunk, CHUNK_ALLOC_SIZE(sz));
+  chunk = tor_realloc(chunk, new_alloc);
   chunk->memlen = sz;
   chunk->data = chunk->mem + offset;
 #ifdef DEBUG_CHUNK_ALLOC
-  tor_assert(chunk->DBG_alloc == CHUNK_ALLOC_SIZE(memlen_orig));
-  chunk->DBG_alloc = CHUNK_ALLOC_SIZE(sz);
+  tor_assert(chunk->DBG_alloc == orig_alloc);
+  chunk->DBG_alloc = new_alloc;
 #endif
-  total_bytes_allocated_in_chunks +=
-CHUNK_ALLOC_SIZE(sz) - CHUNK_ALLOC_SIZE(memlen_orig);
+  total_bytes_allocated_in_chunks += new_alloc - orig_alloc;
+  CHUNK_SET_SENTINEL(chunk, new_alloc);
   return chunk;
 }
 



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

[tor-commits] [tor/master] release-notes for 0.2.8.9

2016-10-17 Thread nickm

commit 8b0755c9bb296ae210e83b88e099d52e40b6f2aa
Author: Nick Mathewson 
Date:   Mon Oct 17 15:00:58 2016 -0400

release-notes for 0.2.8.9
---
 ReleaseNotes | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/ReleaseNotes b/ReleaseNotes
index 5361787..af61a4d 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,28 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
+Changes in version 0.2.8.9 - 2016-10-17
+  Tor 0.2.8.9 backports a fix for a security hole in previous versions
+  of Tor that would allow a remote attacker to crash a Tor client,
+  hidden service, relay, or authority. All Tor users should upgrade to
+  this version, or to 0.2.9.4-alpha. Patches will be released for older
+  versions of Tor.
+
+  o Major features (security fixes, also in 0.2.9.4-alpha):
+- Prevent a class of security bugs caused by treating the contents
+  of a buffer chunk as if they were a NUL-terminated string. At
+  least one such bug seems to be present in all currently used
+  versions of Tor, and would allow an attacker to remotely crash
+  most Tor instances, especially those compiled with extra compiler
+  hardening. With this defense in place, such bugs can't crash Tor,
+  though we should still fix them as they occur. Closes ticket
+  20384 (TROVE-2016-10-001).
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the October 4 2016 Maxmind GeoLite2
+  Country database.
+
+
 Changes in version 0.2.8.8 - 2016-09-23
   Tor 0.2.8.8 fixes two crash bugs present in previous versions of the
   0.2.8.x series. Relays running 0.2.8.x should upgrade, as should users

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

[tor-commits] [tor/release-0.2.8] bump to 0.2.8.9

2016-10-17 Thread nickm

commit 0fa3811c787ed4d80f395bbf464271d3cbb2852e
Author: Nick Mathewson 
Date:   Mon Oct 17 14:57:26 2016 -0400

bump to 0.2.8.9
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3c80e71..37827d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.8-dev])
+AC_INIT([tor],[0.2.8.9])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 25998d4..59cb381 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.8-dev"
+!define VERSION "0.2.8.9"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 56def12..2b98d1c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.8-dev"
+#define VERSION "0.2.8.9"
 
 
 



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

[tor-commits] [tor/release-0.2.8] Changelog and releasenotes for 0.2.8.9

2016-10-17 Thread nickm

commit 44c5fc6878d91d6069ed8c58ba6ad3b1f9b2963b
Author: Nick Mathewson 
Date:   Mon Oct 17 15:00:46 2016 -0400

Changelog and releasenotes for 0.2.8.9
---
 ChangeLog | 22 ++
 ReleaseNotes  | 21 +
 changes/buf-sentinel  | 11 ---
 changes/geoip-october2016 |  4 
 4 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e3d410e..7fe2b2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+Changes in version 0.2.8.9 - 2016-10-17
+  Tor 0.2.8.9 backports a fix for a security hole in previous versions
+  of Tor that would allow a remote attacker to crash a Tor client,
+  hidden service, relay, or authority. All Tor users should upgrade to
+  this version, or to 0.2.9.4-alpha. Patches will be released for older
+  versions of Tor.
+
+  o Major features (security fixes, also in 0.2.9.4-alpha):
+- Prevent a class of security bugs caused by treating the contents
+  of a buffer chunk as if they were a NUL-terminated string. At
+  least one such bug seems to be present in all currently used
+  versions of Tor, and would allow an attacker to remotely crash
+  most Tor instances, especially those compiled with extra compiler
+  hardening. With this defense in place, such bugs can't crash Tor,
+  though we should still fix them as they occur. Closes ticket
+  20384 (TROVE-2016-10-001).
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the October 4 2016 Maxmind GeoLite2
+  Country database.
+
+
 Changes in version 0.2.8.8 - 2016-09-23
   Tor 0.2.8.8 fixes two crash bugs present in previous versions of the
   0.2.8.x series. Relays running 0.2.8.x should upgrade, as should users
diff --git a/ReleaseNotes b/ReleaseNotes
index 1ff4c3b..3984363 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,27 @@ This document summarizes new features and bugfixes in each 
stable release
 of Tor. If you want to see more detailed descriptions of the changes in
 each development snapshot, see the ChangeLog file.
 
+Changes in version 0.2.8.9 - 2016-10-17
+  Tor 0.2.8.9 backports a fix for a security hole in previous versions
+  of Tor that would allow a remote attacker to crash a Tor client,
+  hidden service, relay, or authority. All Tor users should upgrade to
+  this version, or to 0.2.9.4-alpha. Patches will be released for older
+  versions of Tor.
+
+  o Major features (security fixes, also in 0.2.9.4-alpha):
+- Prevent a class of security bugs caused by treating the contents
+  of a buffer chunk as if they were a NUL-terminated string. At
+  least one such bug seems to be present in all currently used
+  versions of Tor, and would allow an attacker to remotely crash
+  most Tor instances, especially those compiled with extra compiler
+  hardening. With this defense in place, such bugs can't crash Tor,
+  though we should still fix them as they occur. Closes ticket
+  20384 (TROVE-2016-10-001).
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the October 4 2016 Maxmind GeoLite2
+  Country database.
+
 
 Changes in version 0.2.8.8 - 2016-09-23
   Tor 0.2.8.8 fixes two crash bugs present in previous versions of the
diff --git a/changes/buf-sentinel b/changes/buf-sentinel
deleted file mode 100644
index 7c5b829..000
--- a/changes/buf-sentinel
+++ /dev/null
@@ -1,11 +0,0 @@
-  o Major features (security fixes):
-
-- Prevent a class of security bugs caused by treating the contents
-  of a buffer chunk as if they were a NUL-terminated string.  At
-  least one such bug seems to be present in all currently used
-  versions of Tor, and would allow an attacker to remotely crash
-  most Tor instances, especially those compiled with extra compiler
-  hardening. With this defense in place, such bugs can't crash Tor,
-  though we should still fix them as they occur. Closes ticket 20384
-  (TROVE-2016-10-001).
-
diff --git a/changes/geoip-october2016 b/changes/geoip-october2016
deleted file mode 100644
index fff9a1e..000
--- a/changes/geoip-october2016
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-- Update geoip and geoip6 to the October 4 2016 Maxmind GeoLite2
-  Country database.
-

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

[tor-commits] [tor/master] Add a one-word sentinel value of 0x0 at the end of each buf_t chunk

2016-10-17 Thread nickm

commit 3cea86eb2fbb65949673eb4ba8ebb695c87a57ce
Author: Nick Mathewson 
Date:   Fri Oct 14 09:38:12 2016 -0400

Add a one-word sentinel value of 0x0 at the end of each buf_t chunk

This helps protect against bugs where any part of a buf_t's memory
is passed to a function that expects a NUL-terminated input.

It also closes TROVE-2016-10-001 (aka bug 20384).
---
 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/changes/buf-sentinel b/changes/buf-sentinel
new file mode 100644
index 000..7c5b829
--- /dev/null
+++ b/changes/buf-sentinel
@@ -0,0 +1,11 @@
+  o Major features (security fixes):
+
+- Prevent a class of security bugs caused by treating the contents
+  of a buffer chunk as if they were a NUL-terminated string.  At
+  least one such bug seems to be present in all currently used
+  versions of Tor, and would allow an attacker to remotely crash
+  most Tor instances, especially those compiled with extra compiler
+  hardening. With this defense in place, such bugs can't crash Tor,
+  though we should still fix them as they occur. Closes ticket 20384
+  (TROVE-2016-10-001).
+
diff --git a/src/or/buffers.c b/src/or/buffers.c
index be99744..74aebcc 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -69,12 +69,33 @@ static int parse_socks_client(const uint8_t *data, size_t 
datalen,
 
 #define CHUNK_HEADER_LEN STRUCT_OFFSET(chunk_t, mem[0])
 
+/* We leave this many NUL bytes at the end of the buffer. */
+#define SENTINEL_LEN 4
+
+/* Header size plus NUL bytes at the end */
+#define CHUNK_OVERHEAD (CHUNK_HEADER_LEN + SENTINEL_LEN)
+
 /** Return the number of bytes needed to allocate a chunk to hold
  * memlen bytes. */
-#define CHUNK_ALLOC_SIZE(memlen) (CHUNK_HEADER_LEN + (memlen))
+#define CHUNK_ALLOC_SIZE(memlen) (CHUNK_OVERHEAD + (memlen))
 /** Return the number of usable bytes in a chunk allocated with
  * malloc(memlen). */
-#define CHUNK_SIZE_WITH_ALLOC(memlen) ((memlen) - CHUNK_HEADER_LEN)
+#define CHUNK_SIZE_WITH_ALLOC(memlen) ((memlen) - CHUNK_OVERHEAD)
+
+#define DEBUG_SENTINEL
+
+#ifdef DEBUG_SENTINEL
+#define DBG_S(s) s
+#else
+#define DBG_S(s) (void)0
+#endif
+
+#define CHUNK_SET_SENTINEL(chunk, alloclen) do {\
+uint8_t *a = (uint8_t*) &(chunk)->mem[(chunk)->memlen]; \
+DBG_S(uint8_t *b = &((uint8_t*)(chunk))[(alloclen)-SENTINEL_LEN]);  \
+DBG_S(tor_assert(a == b));  \
+memset(a,0,SENTINEL_LEN);   \
+  } while (0)
 
 /** Return the next character in chunk onto which data can be appended.
  * If the chunk is full, this might be off the end of chunk->mem. */
@@ -131,6 +152,7 @@ chunk_new_with_alloc_size(size_t alloc)
   ch->memlen = CHUNK_SIZE_WITH_ALLOC(alloc);
   total_bytes_allocated_in_chunks += alloc;
   ch->data = >mem[0];
+  CHUNK_SET_SENTINEL(ch, alloc);
   return ch;
 }
 
@@ -140,18 +162,20 @@ static INLINE chunk_t *
 chunk_grow(chunk_t *chunk, size_t sz)
 {
   off_t offset;
-  size_t memlen_orig = chunk->memlen;
+  const size_t memlen_orig = chunk->memlen;
+  const size_t orig_alloc = CHUNK_ALLOC_SIZE(memlen_orig);
+  const size_t new_alloc = CHUNK_ALLOC_SIZE(sz);
   tor_assert(sz > chunk->memlen);
   offset = chunk->data - chunk->mem;
-  chunk = tor_realloc(chunk, CHUNK_ALLOC_SIZE(sz));
+  chunk = tor_realloc(chunk, new_alloc);
   chunk->memlen = sz;
   chunk->data = chunk->mem + offset;
 #ifdef DEBUG_CHUNK_ALLOC
-  tor_assert(chunk->DBG_alloc == CHUNK_ALLOC_SIZE(memlen_orig));
-  chunk->DBG_alloc = CHUNK_ALLOC_SIZE(sz);
+  tor_assert(chunk->DBG_alloc == orig_alloc);
+  chunk->DBG_alloc = new_alloc;
 #endif
-  total_bytes_allocated_in_chunks +=
-CHUNK_ALLOC_SIZE(sz) - CHUNK_ALLOC_SIZE(memlen_orig);
+  total_bytes_allocated_in_chunks += new_alloc - orig_alloc;
+  CHUNK_SET_SENTINEL(chunk, new_alloc);
   return chunk;
 }
 



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

[tor-commits] [tor/master] Fold 20384 into changelog

2016-10-17 Thread nickm

commit 52b2b2c82f304629eb1128ed46fdd6edeba7eb67
Author: Nick Mathewson 
Date:   Mon Oct 17 14:55:05 2016 -0400

Fold 20384 into changelog
---
 ChangeLog| 30 +++---
 changes/buf-sentinel | 11 ---
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5bf4ebd..aa9aace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,27 @@
 Changes in version 0.2.9.4-alpha - 2016-10-17
-  Tor 0.2.9.4-alpha adds numerous small features and fix-ups to previous
-  versions of Tor, including the implementation of a feature to future-
-  proof the Tor ecosystem against protocol changes, some bug fixes
-  necessary for Tor Browser to use unix domain sockets correctly, and
-  several portability improvements. We anticipate that this will be the
-  last alpha in the Tor 0.2.9 series, and that the next release will be
-  a release candidate.
+  Tor 0.2.9.4-alpha fixes a security hole in previous versions of Tor
+  that would allow a remote attacker to crash a Tor client, hidden
+  service, relay, or authority. All Tor users should upgrade to this
+  version, or to 0.2.8.9. Patches will be released for older versions
+  of Tor.
+
+  Tor 0.2.9.4-alpha also adds numerous small features and fix-ups to
+  previous versions of Tor, including the implementation of a feature to
+  future- proof the Tor ecosystem against protocol changes, some bug
+  fixes necessary for Tor Browser to use unix domain sockets correctly,
+  and several portability improvements. We anticipate that this will be
+  the last alpha in the Tor 0.2.9 series, and that the next release will
+  be a release candidate.
+
+  o Major features (security fixes):
+- Prevent a class of security bugs caused by treating the contents
+  of a buffer chunk as if they were a NUL-terminated string. At
+  least one such bug seems to be present in all currently used
+  versions of Tor, and would allow an attacker to remotely crash
+  most Tor instances, especially those compiled with extra compiler
+  hardening. With this defense in place, such bugs can't crash Tor,
+  though we should still fix them as they occur. Closes ticket
+  20384 (TROVE-2016-10-001).
 
   o Major features (subprotocol versions):
 - Tor directory authorities now vote on a set of recommended
diff --git a/changes/buf-sentinel b/changes/buf-sentinel
deleted file mode 100644
index 7c5b829..000
--- a/changes/buf-sentinel
+++ /dev/null
@@ -1,11 +0,0 @@
-  o Major features (security fixes):
-
-- Prevent a class of security bugs caused by treating the contents
-  of a buffer chunk as if they were a NUL-terminated string.  At
-  least one such bug seems to be present in all currently used
-  versions of Tor, and would allow an attacker to remotely crash
-  most Tor instances, especially those compiled with extra compiler
-  hardening. With this defense in place, such bugs can't crash Tor,
-  though we should still fix them as they occur. Closes ticket 20384
-  (TROVE-2016-10-001).
-



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

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-10-17 Thread nickm

commit 4d1e39b21b961c574a8832d2698c66dc0f9614fa
Merge: d579528 1df1143
Author: Nick Mathewson 
Date:   Mon Oct 17 14:51:29 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 insertions(+), 8 deletions(-)



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

[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

2016-10-17 Thread nickm

commit 3e920a3468f5c99bff6a3045133f001a1871d0fe
Merge: 4d1e39b 0fa3811
Author: Nick Mathewson 
Date:   Mon Oct 17 14:57:33 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



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

[tor-commits] [tor/release-0.2.8] Merge branch 'buf_sentinel_026_v2' into maint-0.2.8

2016-10-17 Thread nickm

commit 1df114330e6c11865f0283772395ef02359ba5a0
Merge: ab98c43 3cea86e
Author: Nick Mathewson 
Date:   Mon Oct 17 14:51:06 2016 -0400

Merge branch 'buf_sentinel_026_v2' into maint-0.2.8

 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 insertions(+), 8 deletions(-)




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

[tor-commits] [tor/master] bump to 0.2.8.9

2016-10-17 Thread nickm

commit 0fa3811c787ed4d80f395bbf464271d3cbb2852e
Author: Nick Mathewson 
Date:   Mon Oct 17 14:57:26 2016 -0400

bump to 0.2.8.9
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3c80e71..37827d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.8-dev])
+AC_INIT([tor],[0.2.8.9])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 25998d4..59cb381 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.8-dev"
+!define VERSION "0.2.8.9"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 56def12..2b98d1c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.8-dev"
+#define VERSION "0.2.8.9"
 
 
 



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

[tor-commits] [tor/maint-0.2.8] bump to 0.2.8.9

2016-10-17 Thread nickm

commit 0fa3811c787ed4d80f395bbf464271d3cbb2852e
Author: Nick Mathewson 
Date:   Mon Oct 17 14:57:26 2016 -0400

bump to 0.2.8.9
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3c80e71..37827d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.8-dev])
+AC_INIT([tor],[0.2.8.9])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 25998d4..59cb381 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.8.8-dev"
+!define VERSION "0.2.8.9"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 56def12..2b98d1c 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -229,7 +229,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.8.8-dev"
+#define VERSION "0.2.8.9"
 
 
 

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

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

2016-10-17 Thread nickm

commit 3b6f924e507d15fc7290649738048db9c79ec70d
Merge: 52b2b2c 0fa3811
Author: Nick Mathewson 
Date:   Mon Oct 17 14:57:44 2016 -0400

Merge branch 'maint-0.2.8'

("ours" merge to avoid taking version bump)




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

[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

2016-10-17 Thread nickm

commit 1a7488106326d2327fc24f32b13979b7029b813b
Merge: eae0c00 1df1143
Author: Nick Mathewson 
Date:   Mon Oct 17 14:51:45 2016 -0400

Merge branch 'maint-0.2.8'

 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 insertions(+), 8 deletions(-)




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

[tor-commits] [tor/master] Merge branch 'buf_sentinel_026_v2' into maint-0.2.8

2016-10-17 Thread nickm

commit 1df114330e6c11865f0283772395ef02359ba5a0
Merge: ab98c43 3cea86e
Author: Nick Mathewson 
Date:   Mon Oct 17 14:51:06 2016 -0400

Merge branch 'buf_sentinel_026_v2' into maint-0.2.8

 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 insertions(+), 8 deletions(-)




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

[tor-commits] [tor/maint-0.2.8] Add a one-word sentinel value of 0x0 at the end of each buf_t chunk

2016-10-17 Thread nickm

commit 3cea86eb2fbb65949673eb4ba8ebb695c87a57ce
Author: Nick Mathewson 
Date:   Fri Oct 14 09:38:12 2016 -0400

Add a one-word sentinel value of 0x0 at the end of each buf_t chunk

This helps protect against bugs where any part of a buf_t's memory
is passed to a function that expects a NUL-terminated input.

It also closes TROVE-2016-10-001 (aka bug 20384).
---
 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/changes/buf-sentinel b/changes/buf-sentinel
new file mode 100644
index 000..7c5b829
--- /dev/null
+++ b/changes/buf-sentinel
@@ -0,0 +1,11 @@
+  o Major features (security fixes):
+
+- Prevent a class of security bugs caused by treating the contents
+  of a buffer chunk as if they were a NUL-terminated string.  At
+  least one such bug seems to be present in all currently used
+  versions of Tor, and would allow an attacker to remotely crash
+  most Tor instances, especially those compiled with extra compiler
+  hardening. With this defense in place, such bugs can't crash Tor,
+  though we should still fix them as they occur. Closes ticket 20384
+  (TROVE-2016-10-001).
+
diff --git a/src/or/buffers.c b/src/or/buffers.c
index be99744..74aebcc 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -69,12 +69,33 @@ static int parse_socks_client(const uint8_t *data, size_t 
datalen,
 
 #define CHUNK_HEADER_LEN STRUCT_OFFSET(chunk_t, mem[0])
 
+/* We leave this many NUL bytes at the end of the buffer. */
+#define SENTINEL_LEN 4
+
+/* Header size plus NUL bytes at the end */
+#define CHUNK_OVERHEAD (CHUNK_HEADER_LEN + SENTINEL_LEN)
+
 /** Return the number of bytes needed to allocate a chunk to hold
  * memlen bytes. */
-#define CHUNK_ALLOC_SIZE(memlen) (CHUNK_HEADER_LEN + (memlen))
+#define CHUNK_ALLOC_SIZE(memlen) (CHUNK_OVERHEAD + (memlen))
 /** Return the number of usable bytes in a chunk allocated with
  * malloc(memlen). */
-#define CHUNK_SIZE_WITH_ALLOC(memlen) ((memlen) - CHUNK_HEADER_LEN)
+#define CHUNK_SIZE_WITH_ALLOC(memlen) ((memlen) - CHUNK_OVERHEAD)
+
+#define DEBUG_SENTINEL
+
+#ifdef DEBUG_SENTINEL
+#define DBG_S(s) s
+#else
+#define DBG_S(s) (void)0
+#endif
+
+#define CHUNK_SET_SENTINEL(chunk, alloclen) do {\
+uint8_t *a = (uint8_t*) &(chunk)->mem[(chunk)->memlen]; \
+DBG_S(uint8_t *b = &((uint8_t*)(chunk))[(alloclen)-SENTINEL_LEN]);  \
+DBG_S(tor_assert(a == b));  \
+memset(a,0,SENTINEL_LEN);   \
+  } while (0)
 
 /** Return the next character in chunk onto which data can be appended.
  * If the chunk is full, this might be off the end of chunk->mem. */
@@ -131,6 +152,7 @@ chunk_new_with_alloc_size(size_t alloc)
   ch->memlen = CHUNK_SIZE_WITH_ALLOC(alloc);
   total_bytes_allocated_in_chunks += alloc;
   ch->data = >mem[0];
+  CHUNK_SET_SENTINEL(ch, alloc);
   return ch;
 }
 
@@ -140,18 +162,20 @@ static INLINE chunk_t *
 chunk_grow(chunk_t *chunk, size_t sz)
 {
   off_t offset;
-  size_t memlen_orig = chunk->memlen;
+  const size_t memlen_orig = chunk->memlen;
+  const size_t orig_alloc = CHUNK_ALLOC_SIZE(memlen_orig);
+  const size_t new_alloc = CHUNK_ALLOC_SIZE(sz);
   tor_assert(sz > chunk->memlen);
   offset = chunk->data - chunk->mem;
-  chunk = tor_realloc(chunk, CHUNK_ALLOC_SIZE(sz));
+  chunk = tor_realloc(chunk, new_alloc);
   chunk->memlen = sz;
   chunk->data = chunk->mem + offset;
 #ifdef DEBUG_CHUNK_ALLOC
-  tor_assert(chunk->DBG_alloc == CHUNK_ALLOC_SIZE(memlen_orig));
-  chunk->DBG_alloc = CHUNK_ALLOC_SIZE(sz);
+  tor_assert(chunk->DBG_alloc == orig_alloc);
+  chunk->DBG_alloc = new_alloc;
 #endif
-  total_bytes_allocated_in_chunks +=
-CHUNK_ALLOC_SIZE(sz) - CHUNK_ALLOC_SIZE(memlen_orig);
+  total_bytes_allocated_in_chunks += new_alloc - orig_alloc;
+  CHUNK_SET_SENTINEL(chunk, new_alloc);
   return chunk;
 }
 



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

[tor-commits] [tor/maint-0.2.8] Merge branch 'buf_sentinel_026_v2' into maint-0.2.8

2016-10-17 Thread nickm

commit 1df114330e6c11865f0283772395ef02359ba5a0
Merge: ab98c43 3cea86e
Author: Nick Mathewson 
Date:   Mon Oct 17 14:51:06 2016 -0400

Merge branch 'buf_sentinel_026_v2' into maint-0.2.8

 changes/buf-sentinel | 11 +++
 src/or/buffers.c | 40 
 2 files changed, 43 insertions(+), 8 deletions(-)




___
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-10-17 Thread translation

commit a0c719e0442b1a0b957b8cc1053fa43ae72ae52b
Author: Translation commit bot 
Date:   Mon Oct 17 18:45:28 2016 +

Update translations for liveusb-creator
---
 lo/lo.po | 32 
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lo/lo.po b/lo/lo.po
index 3c233d4..db19673 100644
--- a/lo/lo.po
+++ b/lo/lo.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Sisouvan Sangbouaboulom , 2014-2015
+# Sisouvan Sangbouaboulom , 2014-2016
 msgid ""
 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-03-21 16:31+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-10-17 18:30+\n"
+"Last-Translator: Sisouvan Sangbouaboulom \n"
 "Language-Team: Lao (http://www.transifex.com/otf/torproject/language/lo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,11 +20,11 @@ msgstr ""
 
 #: ../liveusb/gui.py:451
 msgid "\"Clone & Install\""
-msgstr ""
+msgstr "\"à»àºàº¥àº & àºàº´àºàºàº±à»àº\""
 
 #: ../liveusb/gui.py:453
 msgid "\"Install from ISO\""
-msgstr ""
+msgstr "\"àºàº´àºàºàº±à»àºàºàº²àº ISO\""
 
 #: ../liveusb/dialog.py:157 ../liveusb/launcher_ui.py:153
 #, python-format
@@ -178,7 +178,7 @@ msgstr "àºàº´àºàºàº²àº: 
àºà»à»àºªàº²àº¡àº²àºàºà»àº²àºà»àº²àºàºàº·
 msgid ""
 "Error: The SHA1 of your Live CD is invalid.  You can run this program with "
 "the --noverify argument to bypass this verification check."
-msgstr "àºà»à»àºàº´àºàºàº²àº: SHA1 àºàºàº LiveCD àºà»à»àº²àº 
à»àºà»àºà»à»à»àºà». 
àºà»àº²àºàºªàº²àº¡àº²àºà»àº¥à»àºà»àºàº£à»àºàº£àº¡àºàºµà» 
àºà»àº§àºàºàº³àºªàº±à»àºàºà»à»à»àº«à»àºàº´àºªàº¹àº --noverify 
argument 
à»àºàº·à»àºà»àº«à»àºà»àº²àºàºàº²àºàºàº§àºàºªàºàºàºàºµà»à»àºà»àº¥àºµàº."
+msgstr ""
 
 #: ../liveusb/creator.py:155
 msgid "Extracting live image to the target device..."
@@ -207,7 +207,7 @@ msgstr ""
 msgid ""
 "Install\n"
 "by cloning"
-msgstr ""
+msgstr "àºàº´àºàºàº±à»àº\nà»àºàºàºàº²àºà»àºàº¥àº"
 
 #: ../liveusb/dialog.py:172
 msgid "Install Tails"
@@ -280,7 +280,7 @@ msgstr "àºàº²àºàºàº´à»àºàºµàº à»àº¡à»àº FAT16; 
àºàº²àºàºªàº°à»àºàº
 
 #: ../liveusb/gui.py:565
 msgid "Partition is FAT32; Restricting overlay size to 4G"
-msgstr ""
+msgstr "àºàº²àºàºàº´à»àºàºµàº à»àºàº±àº FAT32; 
àºàº³àºàº±àºàºàº°àº«àºàº²àºàºàº§àº²àº¡àºàº³àºàº±àºàºà»àºàºàº®àºàº
 4G"
 
 #: ../liveusb/creator.py:236 ../liveusb/creator.py:866
 #, python-format
@@ -293,11 +293,11 @@ msgstr 
"à»à»àº§àºà»àºàº±àºàºà»à»àº¡àº¹àºàºàº²àº§àºàº"
 
 #: ../liveusb/dialog.py:168
 msgid "Persistent Storage (0 MB)"
-msgstr ""
+msgstr "àºà»àºàºàºªàº³àº®àºàºàºà»à»àº¡àº¹àºàºàº»àºàºàºµà» (0 MB)"
 
 #: ../liveusb/gui.py:698 ../liveusb/gui.py:727
 msgid "Please confirm your device selection"
-msgstr ""
+msgstr 
"àºàº°àº¥àº¸àºàº²àº¢àº·àºàº¢àº±àºàºàº²àºà»àº¥àº·àºàºàºàº¸àºàº°àºàºàºàºàºàºàºà»àº²àº"
 
 #: ../liveusb/gui.py:481
 msgid "Refreshing releases..."
@@ -343,11 +343,11 @@ msgstr 
"àºàº°à»àºàºàºàºàºà»àº«àº¼à»àºàºà»à»àº¡àº¹àº àºà»à»àºª
 
 #: ../liveusb/creator.py:1220
 msgid "Synchronizing data on disk..."
-msgstr ""
+msgstr "àºàº°àºªàº²àºàºàº½àºàºà»à»àº¡àº¹àºà»àºàºàºµàºª"
 
 #: ../liveusb/dialog.py:166
 msgid "Target Device"
-msgstr ""
+msgstr "àºàº¸àºàº°àºàºàºà»àºàº»à»àº²àº«àº¡àº²àº"
 
 #: ../liveusb/gui.py:438
 #, python-format
@@ -367,7 +367,7 @@ msgstr ""
 msgid ""
 "There was a problem executing the following command: `%(command)s`.\n"
 "A more detailed error log has been written to '%(filename)s'."
-msgstr "àº¡àºµàºàº±àºàº«àº²à»àºàºàº²àºà»àº¥à»àºàºàº³àºªàº±à»àº 
àºàº±à»àºàºà»à»à»àºàºàºµà»:  
`%(command)s`.\nàº¥àº²àºàº¥àº°àºàº½àºà»àºàºµà»àº¡ àºàºàº 
àºà»à»àºàº´àºàºàº²àº à»àºà»àºàº±àºàºàº¶àºàº¥àº»àºà»àº  
'%(filename)s' à»àº¥à»àº§."
+msgstr ""
 
 #: ../liveusb/dialog.py:158
 msgid ""
@@ -477,7 +477,7 @@ msgstr ""
 
 #: ../liveusb/creator.py:399
 msgid "Unknown ISO, skipping checksum verification"
-msgstr "àºà»à»àº®àº¹à»àºàº±àº ISO àºàºµà», 
àºàº³àº¥àº±àºàºàº§à»àº²àº¡ 
àºàº²àºàºàº´àºªàº¹àºàºàº²àºàºàº§àºàºªàºàºàºàºµà»à»àº"
+msgstr ""
 
 #: ../liveusb/creator.py:810
 #, python-format
@@ -547,11 +547,11 @@ msgstr "àºà»àº²àº¥àº±àºàºàº´àºªàº¹àº 
àºàº²àºàºàº§àºàºªàºàº ISO MD5"
 
 #: ../liveusb/creator.py:373
 msgid "Verifying SHA1 checksum of LiveCD image..."
-msgstr "àºà»àº²àº¥àº±àº àºàº´àºªàº¹àº àºàº²àºàºàº§àºàºªàºàº SHA1 
àºàºàº LiveCD image..."
+msgstr ""
 
 #: ../liveusb/creator.py:377
 msgid "Verifying SHA256 checksum of LiveCD image..."
-msgstr "àºà»àº²àº¥àº±àº

[tor-commits] [translation/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2016-10-17 Thread translation

commit 8176f90b35128b4bbd6bfc88788d3bed4ae708d6
Author: Translation commit bot 
Date:   Mon Oct 17 18:18:16 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 lo/prefs.dtd | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lo/prefs.dtd b/lo/prefs.dtd
index d03e2b4..5c3f3fb 100644
--- a/lo/prefs.dtd
+++ b/lo/prefs.dtd
@@ -1,4 +1,6 @@
 
+
+
 
 
 
@@ -10,4 +12,11 @@
 
 
 
-
\ No newline at end of file
+
+
+
+
+
+
+
+
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-10-17 Thread translation

commit 6e425eb670ff42e4a2281e6e57bb053445c660c1
Author: Translation commit bot 
Date:   Mon Oct 17 18:18:03 2016 +

Update translations for tor-messenger-prefsdtd
---
 lo/prefs.dtd | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lo/prefs.dtd b/lo/prefs.dtd
index 13dde4d..5c3f3fb 100644
--- a/lo/prefs.dtd
+++ b/lo/prefs.dtd
@@ -13,10 +13,10 @@
 
 
 
-
-
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
+
+
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-10-17 Thread translation

commit a236f7ee7a5456f90ea02fe3b259ffd5593e9884
Author: Translation commit bot 
Date:   Mon Oct 17 18:17:48 2016 +

Update translations for tor-messenger-ircproperties
---
 lo/irc.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lo/irc.properties b/lo/irc.properties
index 0311b6b..491d78d 100644
--- a/lo/irc.properties
+++ b/lo/irc.properties
@@ -26,7 +26,7 @@ joinChat.password=_Password
 #   These are the protocol specific options shown in the account manager and
 #   account wizard windows.
 options.server=Server
-options.port=Port
+options.port=àºàº°àºàº¹à»àºàº·à»àºàº¡àºà»à»
 options.ssl=Use SSL
 options.encoding=Character Set
 options.quitMessage=Quit message

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

[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2016-10-17 Thread translation

commit 95bb44d32acd3044bc3bf648ecd69b3de5de11f1
Author: Translation commit bot 
Date:   Mon Oct 17 18:15:51 2016 +

Update translations for tor-launcher-properties
---
 lo/torlauncher.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lo/torlauncher.properties b/lo/torlauncher.properties
index bdbcf16..9959bfb 100644
--- a/lo/torlauncher.properties
+++ b/lo/torlauncher.properties
@@ -48,7 +48,7 @@ torlauncher.bootstrapStatus.loading_status=Loading network 
status
 torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
 torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
 torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.conn_or=Connecting to the Tor network
+torlauncher.bootstrapStatus.conn_or=àºàº³àº¥àº±àºà»àºàº·à»àºàº¡àºà»à»à»àºàº»à»àº²àºàº±àºà»àºàº·àºàºà»àº²àº
 Tor
 torlauncher.bootstrapStatus.handshake_or=Establishing a Tor circuit
 torlauncher.bootstrapStatus.done=Connected to the Tor network!
 

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

[tor-commits] [translation/tor-launcher-progress] Update translations for tor-launcher-progress

2016-10-17 Thread translation

commit bd1d98ef2749af93a314fd9aac0d482ca5b15160
Author: Translation commit bot 
Date:   Mon Oct 17 18:15:57 2016 +

Update translations for tor-launcher-progress
---
 lo/progress.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lo/progress.dtd b/lo/progress.dtd
index fb3aeb4..14b98fe 100644
--- a/lo/progress.dtd
+++ b/lo/progress.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-launcher-progress_completed] Update translations for tor-launcher-progress_completed

2016-10-17 Thread translation

commit b40ad0529a29abe4487b4486b76ddf3ae519db7b
Author: Translation commit bot 
Date:   Mon Oct 17 18:16:01 2016 +

Update translations for tor-launcher-progress_completed
---
 lo/progress.dtd | 4 
 1 file changed, 4 insertions(+)

diff --git a/lo/progress.dtd b/lo/progress.dtd
new file mode 100644
index 000..14b98fe
--- /dev/null
+++ b/lo/progress.dtd
@@ -0,0 +1,4 @@
+
+
+
+

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

[tor-commits] [tor/master] changelog typo fixes from Rubiate

2016-10-17 Thread nickm

commit eae0c00ddaa8ee29c345b08773db28dd29005e42
Author: Nick Mathewson 
Date:   Mon Oct 17 14:06:20 2016 -0400

changelog typo fixes from Rubiate
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 068ef68..5bf4ebd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,7 +11,7 @@ Changes in version 0.2.9.4-alpha - 2016-10-17
 - Tor directory authorities now vote on a set of recommended
   subprotocol versions, and on a set of required subprotocol
   versions. Clients and relays that lack support for a _required_
-  suprotocol version will not start; those that lack support for a
+  subprotocol version will not start; those that lack support for a
   _recommended_ subprotocol version will warn the user to upgrade.
   Closes ticket 19958; implements part of proposal 264.
 - Tor now uses "subprotocol versions" to indicate compatibility.
@@ -59,7 +59,7 @@ Changes in version 0.2.9.4-alpha - 2016-10-17
   on 0.2.4.7-alpha.
 
   o Minor bugfixes (address discovery):
-- Stop reordering IP addresses returned by the OS. This makes is
+- Stop reordering IP addresses returned by the OS. This makes it
   more likely that Tor will guess the same relay IP address every
   time. Fixes issue 20163; bugfix on 0.2.7.1-alpha, ticket 17027.
   Reported by RenÃ© Mayrhofer, patch by "cypherpunks".

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

[tor-commits] [tor/master] Bump version to 0.2.9.4-alpha.

2016-10-17 Thread nickm

commit edcad379cf7d74de141547b44d4fe17f14e76605
Author: Nick Mathewson 
Date:   Mon Oct 17 14:05:42 2016 -0400

Bump version to 0.2.9.4-alpha.
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index af42896..9bad7b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.3-alpha-dev])
+AC_INIT([tor],[0.2.9.4-alpha])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 71dca97..d24e902 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.3-alpha-dev"
+!define VERSION "0.2.9.4-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 17c7e01..3c13ff2 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.3-alpha-dev"
+#define VERSION "0.2.9.4-alpha"
 
 
 

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

[tor-commits] [tor/master] edits to changelog from kate and david

2016-10-17 Thread nickm

commit 80530f706ace4e5061770c2163fa0bdde2f4a6bd
Author: Nick Mathewson 
Date:   Mon Oct 17 14:03:48 2016 -0400

edits to changelog from kate and david
---
 ChangeLog | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a014a5c..068ef68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,9 +19,9 @@ Changes in version 0.2.9.4-alpha - 2016-10-17
   a relay to tell whether they could use a given feature. Now, they
   should be able to rely on its declared subprotocol versions. This
   change allows compatible implementations of the Tor protocol(s) to
-  exist without declaring compatibility with pretending to be
-  particular releases of Tor itself. Closes ticket 19958; implements
-  part of proposal 264.
+  exist without pretending to be 100% bug-compatible with particular
+  releases of Tor itself. Closes ticket 19958; implements part of
+  proposal 264.
 
   o Minor feature (fallback directories):
 - Remove broken fallbacks from the hard-coded fallback directory
@@ -34,7 +34,7 @@ Changes in version 0.2.9.4-alpha - 2016-10-17
   proposal 272.
 
   o Minor features (compilation, portability):
-- Tor now compiles correctly on MacOS 10.12 (aka "Sierra"). Closes
+- Compile correctly on MacOS 10.12 (aka "Sierra"). Closes
   ticket 20241.
 
   o Minor features (development tools, etags):
@@ -81,7 +81,7 @@ Changes in version 0.2.9.4-alpha - 2016-10-17
 
   o Minor bugfixes (getpass):
 - Defensively fix a non-triggerable heap corruption at do_getpass()
-  tow protect ourselves from mistakes in the future. Fixes bug
+  to protect ourselves from mistakes in the future. Fixes bug
   #19223; bugfix on 0.2.7.3-rc. Bug found by Guido Vranken, patch
   by nherring.
 
@@ -91,8 +91,8 @@ Changes in version 0.2.9.4-alpha - 2016-10-17
   on 0.2.4.7-alpha.
 
   o Documentation:
-- Added module-level internal documentation for 36 C files that
-  previously didn't have a high-level overview.
+- Add module-level internal documentation for 36 C files that
+  previously didn't have a high-level overview. Closes ticket #20385.
 
   o Required libraries:
 - When building with OpenSSL, Tor now requires version 1.0.1 or

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

[tor-commits] [torspec/master] prop224: Add a section on the number of introduction points

2016-10-17 Thread dgoulet

commit 6d968a1507ae074ab17f914522f25b68138efd42
Author: David Goulet 
Date:   Mon Oct 17 12:05:09 2016 -0400

prop224: Add a section on the number of introduction points

Acked-by: George Kadianakis 
Signed-off-by: David Goulet 
---
 proposals/224-rend-spec-ng.txt | 19 ++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt
index 558cf1f..1fe738d 100644
--- a/proposals/224-rend-spec-ng.txt
+++ b/proposals/224-rend-spec-ng.txt
@@ -37,6 +37,7 @@ Table of contents:
 2.3.2. Hidden services and changing shared random values
 2.4. Hidden service descriptors: outer wrapper [DESC-OUTER]
 2.5. Hidden service descriptors: encryption format [ENCRYPTED-DATA]
+2.5.1. Number of introduction points [NUM_INTRO_POINT]
 3. The introduction protocol
 3.1. Registering an introduction point [REG_INTRO_POINT]
 3.1.1. Extensible ESTABLISH_INTRO protocol. [EST_INTRO]
@@ -999,7 +1000,8 @@ Table of contents:
   able to contact the host. Recognized types are: 'password' and
   'ed25519'. See [INTRO-AUTH] below.
 
- Followed by zero or more introduction points as follows:
+ Followed by zero or more introduction points as follows (see section
+ [NUM_INTRO_POINT] below for accepted values):
 
 "introduction-point" SP link-specifiers NL
 
@@ -1058,6 +1060,21 @@ Table of contents:
Other encryption and authentication key formats are allowed; clients
should ignore ones they do not recognize.
 
+2.5.1. Number of introduction points [NUM_INTRO_POINT]
+
+   This section defines how many introduction points an hidden service
+   descriptor can have at minimum, by default and the maximum:
+
+  Minimum: 0 - Default: 3 - Maximum: 20
+
+   A value of 0 would means that the service is still alive but doesn't want
+   to be reached by any client at the moment. Note that the descriptor size
+   increases considerably as more introduction points are added.
+
+   The reason for a maximum value of 20 is to give enough scalability to tools
+   like OnionBalance to be able to load balance up to 120 servers (20 x 6
+   HSDirs) but also in order for the descriptor size to not overwhelmed hidden
+   service directories with user defined values that could be gigantic.
 
 3. The introduction protocol
 

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

[tor-commits] [tor/master] Wrap the changelog, add a blurb

2016-10-17 Thread nickm

commit 949bfaf22b7becd683bd32e7385407dca7691f2a
Author: Nick Mathewson 
Date:   Mon Oct 17 11:04:11 2016 -0400

Wrap the changelog, add a blurb
---
 ChangeLog | 99 ++-
 1 file changed, 53 insertions(+), 46 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ef4cb6e..a014a5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,31 +1,37 @@
 Changes in version 0.2.9.4-alpha - 2016-10-17
-  Foo bar
+  Tor 0.2.9.4-alpha adds numerous small features and fix-ups to previous
+  versions of Tor, including the implementation of a feature to future-
+  proof the Tor ecosystem against protocol changes, some bug fixes
+  necessary for Tor Browser to use unix domain sockets correctly, and
+  several portability improvements. We anticipate that this will be the
+  last alpha in the Tor 0.2.9 series, and that the next release will be
+  a release candidate.
 
   o Major features (subprotocol versions):
-- Tor directory authorities now vote on a set of recommended subprotocol
-  versions, and on a set of required subprotocol versions. Clients and
-  relays that lack support for a _required_ suprotocol version will not
-  start; those that lack support for a _recommended_ subprotocol version
-  will warn the user to upgrade. Closes ticket 19958; implements part of
-  proposal 264.
-- Tor now uses "subprotocol versions" to indicate
-  compatibility. Previously, versions of Tor looked at the declared Tor
-  version of a relay to tell whether they could use a given feature.
-  Now, they should be able to rely on its declared subprotocol versions.
-  This change allows compatible implementations of the Tor protocol(s) to
-  exist without declaring compatibility with pretending to be particular
-  releases of Tor itself. Closes ticket 19958; implements part of
-  proposal 264.
+- Tor directory authorities now vote on a set of recommended
+  subprotocol versions, and on a set of required subprotocol
+  versions. Clients and relays that lack support for a _required_
+  suprotocol version will not start; those that lack support for a
+  _recommended_ subprotocol version will warn the user to upgrade.
+  Closes ticket 19958; implements part of proposal 264.
+- Tor now uses "subprotocol versions" to indicate compatibility.
+  Previously, versions of Tor looked at the declared Tor version of
+  a relay to tell whether they could use a given feature. Now, they
+  should be able to rely on its declared subprotocol versions. This
+  change allows compatible implementations of the Tor protocol(s) to
+  exist without declaring compatibility with pretending to be
+  particular releases of Tor itself. Closes ticket 19958; implements
+  part of proposal 264.
 
   o Minor feature (fallback directories):
-- Remove broken fallbacks from the hard-coded fallback directory list.
-  Closes ticket 20190; patch by teor.
+- Remove broken fallbacks from the hard-coded fallback directory
+  list. Closes ticket 20190; patch by teor.
 
   o Minor features (client, directory):
-- Since authorities now omit all routers that lack the Running and Valid
-  flags, we assume that any relay listed in the consensus must
-  have those flags. Closes ticket 20001; implements part of proposal
-  272.
+- Since authorities now omit all routers that lack the Running and
+  Valid flags, we assume that any relay listed in the consensus must
+  have those flags. Closes ticket 20001; implements part of
+  proposal 272.
 
   o Minor features (compilation, portability):
 - Tor now compiles correctly on MacOS 10.12 (aka "Sierra"). Closes
@@ -36,32 +42,32 @@ Changes in version 0.2.9.4-alpha - 2016-10-17
   "MOCK_IMPL" function definitions. Patch from nherring; closes
   ticket 16869.
 
-  o Minor features (unix domain sockets):
-- When configuring a unix domain socket for a SocksPort,
-  ControlPort, or Hidden service, you can now wrap the address
-  in quotes, using C-style escapes inside the quotes. This
-  allows unix domain socket paths to contain spaces.
-
   o Minor features (geoip):
 - Update geoip and geoip6 to the October 4 2016 Maxmind GeoLite2
   Country database.
 
+  o Minor features (unix domain sockets):
+- When configuring a unix domain socket for a SocksPort,
+  ControlPort, or Hidden service, you can now wrap the address in
+  quotes, using C-style escapes inside the quotes. This allows unix
+  domain socket paths to contain spaces.
+
   o Minor features (virtual addresses):
-- Increase the maximum number of bits for the IPv6 virtual network prefix
-  from 16 to 104. In this way, the condition for address allocation is less
-  restrictive.
-  Closes ticket 20151; feature on 0.2.4.7-alpha.
+- Increase the maximum number of bits for the IPv6 virtual

[tor-commits] [tor/master] Start on an 0.2.9.4-alpha changelog

2016-10-17 Thread nickm

commit 20e9220d3d6981adf847e1a098f3c451d76b3916
Author: Nick Mathewson 
Date:   Mon Oct 17 10:57:50 2016 -0400

Start on an 0.2.9.4-alpha changelog
---
 ChangeLog| 95 
 changes/16869|  4 --
 changes/20163|  6 ---
 changes/broken-028-fallbacks |  3 --
 changes/bug18357 |  5 ---
 changes/bug19167 |  4 --
 changes/bug19223 |  4 --
 changes/bug19904 |  4 --
 changes/bug20261 |  4 --
 changes/feature18753 |  6 ---
 changes/geoip-october2016|  4 --
 changes/mod_docs |  3 --
 changes/no_openssl_100   |  4 --
 changes/prop264  | 18 -
 changes/ticket20001  |  6 ---
 changes/ticket20151  |  7 
 changes/ticket20241  |  3 --
 17 files changed, 95 insertions(+), 85 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c1f40dc..ef4cb6e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,98 @@
+Changes in version 0.2.9.4-alpha - 2016-10-17
+  Foo bar
+
+  o Major features (subprotocol versions):
+- Tor directory authorities now vote on a set of recommended subprotocol
+  versions, and on a set of required subprotocol versions. Clients and
+  relays that lack support for a _required_ suprotocol version will not
+  start; those that lack support for a _recommended_ subprotocol version
+  will warn the user to upgrade. Closes ticket 19958; implements part of
+  proposal 264.
+- Tor now uses "subprotocol versions" to indicate
+  compatibility. Previously, versions of Tor looked at the declared Tor
+  version of a relay to tell whether they could use a given feature.
+  Now, they should be able to rely on its declared subprotocol versions.
+  This change allows compatible implementations of the Tor protocol(s) to
+  exist without declaring compatibility with pretending to be particular
+  releases of Tor itself. Closes ticket 19958; implements part of
+  proposal 264.
+
+  o Minor feature (fallback directories):
+- Remove broken fallbacks from the hard-coded fallback directory list.
+  Closes ticket 20190; patch by teor.
+
+  o Minor features (client, directory):
+- Since authorities now omit all routers that lack the Running and Valid
+  flags, we assume that any relay listed in the consensus must
+  have those flags. Closes ticket 20001; implements part of proposal
+  272.
+
+  o Minor features (compilation, portability):
+- Tor now compiles correctly on MacOS 10.12 (aka "Sierra"). Closes
+  ticket 20241.
+
+  o Minor features (development tools, etags):
+- Teach the "make tags" Makefile target how to correctly find
+  "MOCK_IMPL" function definitions. Patch from nherring; closes
+  ticket 16869.
+
+  o Minor features (unix domain sockets):
+- When configuring a unix domain socket for a SocksPort,
+  ControlPort, or Hidden service, you can now wrap the address
+  in quotes, using C-style escapes inside the quotes. This
+  allows unix domain socket paths to contain spaces.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the October 4 2016 Maxmind GeoLite2
+  Country database.
+
+  o Minor features (virtual addresses):
+- Increase the maximum number of bits for the IPv6 virtual network prefix
+  from 16 to 104. In this way, the condition for address allocation is less
+  restrictive.
+  Closes ticket 20151; feature on 0.2.4.7-alpha.
+
+  o Minor bugfixes (address discovery):
+- Stop reordering IP addresses returned by the OS.
+  This makes is more likely that Tor will guess the same relay IP address 
every time.
+  Fixes issue 20163; bugfix on 0.2.7.1-alpha, ticket 17027.
+  Reported by RenÃ© Mayrhofer, patch by "cypherpunks".
+
+  o Minor bugfixes (client, unix domain sockets):
+- Disable IsolateClientAddr when using AF_UNIX backed SocksPorts
+  as the client address is meaningless. Fixes bug 20261; bugfix on
+  0.2.6.3-alpha.
+
+  o Minor bugfixes (compilation, OpenBSD):
+- Detect Libevent2 functions correctly on systems that provide
+  libevent2, but where libevent1 is linked with -levent. Fixes bug
+  19904; bugfix on 0.2.2.24-alpha. Patch from Rubiate.
+
+  o Minor bugfixes (configuration):
+- When parsing quoted configuration values from the torrc file,
+  handle windows line endings correctly. Fixes bug 19167; bugfix on
+  0.2.0.16-alpha.  Patch from "Pingl".
+
+  o Minor bugfixes (getpass):
+- Defensively fix a non-triggerable heap corruption at do_getpass() tow
+  protect ourselves from mistakes in the future. Fixes bug #19223; bugfix
+  on 0.2.7.3-rc. Bug found by Guido Vranken, patch by nherring.
+
+  o Minor bugfixes (hidden service):
+- Allow hidden services to run on IPv6 addresses even when the
+  IPv6Exit option is not set. Fixes bug

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

2016-10-17 Thread translation

commit 2524f5f66d1622aa322c9898f83965c61bf1aef6
Author: Translation commit bot 
Date:   Mon Oct 17 14:46:37 2016 +

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

diff --git a/it/torbutton.dtd b/it/torbutton.dtd
index 3222861..b79f811 100644
--- a/it/torbutton.dtd
+++ b/it/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [tor/master] Fix a syntax problem

2016-10-17 Thread nickm

commit f3174428e25d9f7c5fe000581ff2bcf7fa93bee3
Author: Nick Mathewson 
Date:   Mon Oct 17 10:25:13 2016 -0400

Fix a syntax problem
---
 src/common/crypto_curve25519.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c
index 0a744ef..fcbee3a 100644
--- a/src/common/crypto_curve25519.c
+++ b/src/common/crypto_curve25519.c
@@ -182,7 +182,6 @@ curve25519_public_key_generate(curve25519_public_key_t 
*key_out,
  * Construct a new keypair in *keypair_out. If extra_strong
  * is true, this key is possibly going to get used more than once, so
  * use a better-than-usual RNG. Return 0 on success, -1 on failure. */
- */
 int
 curve25519_keypair_generate(curve25519_keypair_t *keypair_out,
 int extra_strong)

___
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-10-17 Thread translation

commit 123e5e0915306384df4fcea4a266ecff7ba8db4f
Author: Translation commit bot 
Date:   Mon Oct 17 14:15:36 2016 +

Update translations for tails-persistence-setup
---
 nl/nl.po | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/nl/nl.po b/nl/nl.po
index b3d9384..887ce94 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -6,11 +6,12 @@
 # AndrÃ© Koot , 2016
 # cialenhh , 2013
 # gjlajfklajdkladj kasldfjaslkf <1bsuaz+3xy1gedeys...@sharklasers.com>, 2015
+# Nathan Follens, 2016
 # Oussama El Bachiri , 2013
 # Richard E. van der Luit , 2012
 # Shondoit Walker , 2013
 # T. Des Maison , 2014
-# ThijsRay , 2014
+# ThijsRay, 2014
 # Tonko Mulder , 2015
 # Volluta , 2015
 msgid ""
@@ -18,8 +19,8 @@ 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-06-06 08:15+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-10-17 13:46+\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,11 +70,11 @@ msgstr "Icedove profielen en lokaal opgeslagen e-mail"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
-msgstr "GNOME sleutelring"
+msgstr "GNOME-sleuteblos"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Secrets stored by GNOME Keyring"
-msgstr "Secrets opgeslagen GNOME sleutelring"
+msgstr "Geheimen opgeslagen door GNOME-sleutelbos"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:108
 msgid "Network Connections"
@@ -85,11 +86,11 @@ msgstr "Configuratie van netwerkapparaten en verbindingen"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:118
 msgid "Browser bookmarks"
-msgstr "Browser favorieten"
+msgstr "Browserbladwijzers"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:120
 msgid "Bookmarks saved in the Tor Browser"
-msgstr "Bladwijzer opgeslagen in de Tor Browser"
+msgstr "Bladwijzer opgeslagen in de Tor-browser"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:128
 msgid "Printers"
@@ -97,15 +98,15 @@ msgstr "Printers"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:130
 msgid "Printers configuration"
-msgstr "Printers configuratie"
+msgstr "Printerconfiguratie"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:138
 msgid "Bitcoin client"
-msgstr "Bitcoin client"
+msgstr "Bitcoin-cliÃ«nt"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:140
 msgid "Electrum's bitcoin wallet and configuration"
-msgstr "Electrum's bitcoin portemonnee en configuratie"
+msgstr "Electrums bitcoinportemonnee en -configuratie"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:148
 msgid "APT Packages"
@@ -113,7 +114,7 @@ msgstr "APT-pakketten"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Packages downloaded by APT"
-msgstr "Pakketten door APT gedownload"
+msgstr "Pakketten gedownload door APT"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:158
 msgid "APT Lists"

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

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

2016-10-17 Thread translation

commit d2619d1a93f592273dffdee8ca65068512a2bbd1
Author: Translation commit bot 
Date:   Mon Oct 17 14:15:19 2016 +

Update translations for whisperback_completed
---
 nl/nl.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nl/nl.po b/nl/nl.po
index 83739db..773fdbd 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -6,6 +6,7 @@
 # AndrÃ© Koot , 2016
 # JerBen , 2012
 # Jeroen Baert , 2015
+# Nathan Follens, 2016
 # Shondoit Walker , 2012
 # Marco Brohet , 2012
 # Tim E , 2013
@@ -15,8 +16,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-12-16 19:54+0100\n"
-"PO-Revision-Date: 2016-05-06 09:26+\n"
-"Last-Translator: AndrÃ© Koot \n"
+"PO-Revision-Date: 2016-10-17 13:48+\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -117,7 +118,7 @@ msgstr "WhisperBack"
 
 #: ../whisperBack/gui.py:380 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
-msgstr "Stuur feedback in een versleutelde mail."
+msgstr "Stuur terugkoppeling in een versleutelde mail."
 
 #: ../whisperBack/gui.py:383
 msgid "Copyright Â© 2009-2012 Tails developpers (ta...@boum.org)"
@@ -125,15 +126,15 @@ msgstr "Copyright Â© 2009-2012 Tails-ontwikkelaars 
(ta...@boum.org)"
 
 #: ../whisperBack/gui.py:384
 msgid "Tails developers "
-msgstr "Tails ontwikkelaars "
+msgstr "Tails-ontwikkelaars "
 
 #: ../whisperBack/gui.py:385
 msgid "translator-credits"
-msgstr "vertaler credits"
+msgstr "AndrÃ© Koot\nNathan Follens"
 
 #: ../whisperBack/gui.py:412
 msgid "This doesn't seem to be a valid URL or OpenPGP key."
-msgstr "Dit lijkt geen geldige URL of OpenPGP sleutel te zijn."
+msgstr "Dit lijkt geen geldige URL of OpenPGP-sleutel te zijn."
 
 #: ../data/whisperback.ui.h:1
 msgid "Copyright Â© 2009-2012 ta...@boum.org"
@@ -160,7 +161,7 @@ msgid ""
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see .\n"
-msgstr "WhisperBack - Stuur terugkoppeling in een versleutelde 
email.\nCopyright (C) 2009-2012 Tails ontwikkelaars \n\nDit 
programma is vrije programmatuur; je mag het verspreiden en/of aanpassen\nonder 
de voorwaarden van de GNU General Public License zoals gepubliceerd door\nThe 
Free Software Foundation; ofwel versie 3 van de Licentie, of (naar\nkeuze) elke 
latere versie.\n\nDit programma wordt gedistribueerd in de hoop dat het nuttig 
zal zijn, maar\nZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie 
van\nVERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU\nGeneral 
Public License voor meer details.\n\nJe hebt samen met dit programma een kopie 
moeten ontvangen van de GNU General Public License. Zo niet, zie 
.\n"
+msgstr "WhisperBack - Stuur terugkoppeling in een versleutelde 
e-mail.\nCopyright (C) 2009-2012 Tails ontwikkelaars \n\nDit 
programma is vrije software; je mag het verspreiden en/of aanpassen\nonder de 
voorwaarden van de GNU General Public License zoals gepubliceerd door\nde Free 
Software Foundation; ofwel versie 3 van de Licentie, of (naar\nkeuze) elke 
latere versie.\n\nDit programma wordt gedistribueerd in de hoop dat het nuttig 
zal zijn, maar\nZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie 
van\nVERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU\nGeneral 
Public License voor meer details.\n\nJe hebt samen met dit programma een kopie 
moeten ontvangen van de GNU General Public License. Zo niet, zie 
.\n"
 
 #: ../data/whisperback.ui.h:20
 msgid ""

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

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

2016-10-17 Thread translation

commit b104f8aa30a6bc80c695feed5c4544a871202ed2
Author: Translation commit bot 
Date:   Mon Oct 17 14:15:15 2016 +

Update translations for whisperback
---
 nl/nl.po | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/nl/nl.po b/nl/nl.po
index 83739db..773fdbd 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -6,6 +6,7 @@
 # AndrÃ© Koot , 2016
 # JerBen , 2012
 # Jeroen Baert , 2015
+# Nathan Follens, 2016
 # Shondoit Walker , 2012
 # Marco Brohet , 2012
 # Tim E , 2013
@@ -15,8 +16,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-12-16 19:54+0100\n"
-"PO-Revision-Date: 2016-05-06 09:26+\n"
-"Last-Translator: AndrÃ© Koot \n"
+"PO-Revision-Date: 2016-10-17 13:48+\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -117,7 +118,7 @@ msgstr "WhisperBack"
 
 #: ../whisperBack/gui.py:380 ../data/whisperback.ui.h:2
 msgid "Send feedback in an encrypted mail."
-msgstr "Stuur feedback in een versleutelde mail."
+msgstr "Stuur terugkoppeling in een versleutelde mail."
 
 #: ../whisperBack/gui.py:383
 msgid "Copyright Â© 2009-2012 Tails developpers (ta...@boum.org)"
@@ -125,15 +126,15 @@ msgstr "Copyright Â© 2009-2012 Tails-ontwikkelaars 
(ta...@boum.org)"
 
 #: ../whisperBack/gui.py:384
 msgid "Tails developers "
-msgstr "Tails ontwikkelaars "
+msgstr "Tails-ontwikkelaars "
 
 #: ../whisperBack/gui.py:385
 msgid "translator-credits"
-msgstr "vertaler credits"
+msgstr "AndrÃ© Koot\nNathan Follens"
 
 #: ../whisperBack/gui.py:412
 msgid "This doesn't seem to be a valid URL or OpenPGP key."
-msgstr "Dit lijkt geen geldige URL of OpenPGP sleutel te zijn."
+msgstr "Dit lijkt geen geldige URL of OpenPGP-sleutel te zijn."
 
 #: ../data/whisperback.ui.h:1
 msgid "Copyright Â© 2009-2012 ta...@boum.org"
@@ -160,7 +161,7 @@ msgid ""
 "\n"
 "You should have received a copy of the GNU General Public License\n"
 "along with this program.  If not, see .\n"
-msgstr "WhisperBack - Stuur terugkoppeling in een versleutelde 
email.\nCopyright (C) 2009-2012 Tails ontwikkelaars \n\nDit 
programma is vrije programmatuur; je mag het verspreiden en/of aanpassen\nonder 
de voorwaarden van de GNU General Public License zoals gepubliceerd door\nThe 
Free Software Foundation; ofwel versie 3 van de Licentie, of (naar\nkeuze) elke 
latere versie.\n\nDit programma wordt gedistribueerd in de hoop dat het nuttig 
zal zijn, maar\nZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie 
van\nVERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU\nGeneral 
Public License voor meer details.\n\nJe hebt samen met dit programma een kopie 
moeten ontvangen van de GNU General Public License. Zo niet, zie 
.\n"
+msgstr "WhisperBack - Stuur terugkoppeling in een versleutelde 
e-mail.\nCopyright (C) 2009-2012 Tails ontwikkelaars \n\nDit 
programma is vrije software; je mag het verspreiden en/of aanpassen\nonder de 
voorwaarden van de GNU General Public License zoals gepubliceerd door\nde Free 
Software Foundation; ofwel versie 3 van de Licentie, of (naar\nkeuze) elke 
latere versie.\n\nDit programma wordt gedistribueerd in de hoop dat het nuttig 
zal zijn, maar\nZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie 
van\nVERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU\nGeneral 
Public License voor meer details.\n\nJe hebt samen met dit programma een kopie 
moeten ontvangen van de GNU General Public License. Zo niet, zie 
.\n"
 
 #: ../data/whisperback.ui.h:20
 msgid ""

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

[tor-commits] [tor/master] Write a bunch of module documentation.

2016-10-17 Thread nickm

commit aae034d13e458dfe82b503d3a1b54b0e5200b6b8
Author: Nick Mathewson 
Date:   Fri Oct 14 20:08:51 2016 -0400

Write a bunch of module documentation.

This commit adds or improves the module-level documenation for:

  buffers.c circuitstats.c command.c connection_edge.c control.c
  cpuworker.c crypto_curve25519.c crypto_curve25519.h
  crypto_ed25519.c crypto_format.c dircollate.c dirserv.c dns.c
  dns_structs.h fp_pair.c geoip.c hibernate.c keypin.c ntmain.c
  onion.c onion_fast.c onion_ntor.c onion_tap.c periodic.c
  protover.c protover.h reasons.c rephist.c replaycache.c
  routerlist.c routerparse.c routerset.c statefile.c status.c
  tor_main.c workqueue.c

In particular, I've tried to explain (for each documented module)
what each module does, what's in it, what the big idea is, why it
belongs in Tor, and who calls it.  In a few cases, I've added TODO
notes about refactoring opportunities.

I've also renamed an argument, and fixed a few DOCDOC comments.
---
 src/common/crypto_curve25519.c | 52 +++--
 src/common/crypto_curve25519.h | 12 +-
 src/common/crypto_ed25519.c| 29 +-
 src/common/crypto_format.c |  7 
 src/common/workqueue.c | 14 +++
 src/or/buffers.c   | 20 --
 src/or/circuitstats.c  | 13 ++-
 src/or/command.c   | 20 ++
 src/or/connection_edge.c   | 45 ++
 src/or/control.c   | 26 -
 src/or/cpuworker.c |  6 ++-
 src/or/dircollate.c| 34 +++--
 src/or/dirserv.c   | 18 +
 src/or/dns.c   | 53 --
 src/or/dns_structs.h   | 12 ++
 src/or/fp_pair.c   |  8 
 src/or/geoip.c | 18 +
 src/or/hibernate.c | 24 +---
 src/or/keypin.c| 12 ++
 src/or/ntmain.c| 10 -
 src/or/onion.c | 52 +
 src/or/onion_fast.c| 18 +
 src/or/onion_ntor.c| 11 ++
 src/or/onion_tap.c | 12 ++
 src/or/periodic.c  |  4 ++
 src/or/protover.c  | 24 
 src/or/protover.h  |  7 
 src/or/reasons.c   |  6 +++
 src/or/rephist.c   | 70 +-
 src/or/replaycache.c   | 12 ++
 src/or/routerlist.c| 86 +-
 src/or/routerparse.c   | 63 +++
 src/or/routerset.c | 14 +++
 src/or/statefile.c | 17 +
 src/or/status.c|  8 +++-
 src/or/tor_main.c  |  6 ++-
 36 files changed, 801 insertions(+), 42 deletions(-)

diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c
index 58ec923..0a744ef 100644
--- a/src/common/crypto_curve25519.c
+++ b/src/common/crypto_curve25519.c
@@ -5,6 +5,14 @@
  * \file crypto_curve25519.c
  *
  * \brief Wrapper code for a curve25519 implementation.
+ *
+ * Curve25519 is an Elliptic-Curve Diffie Hellman handshake, designed by
+ * Dan Bernstein.  For more information, see https://cr.yp.to/ecdh.html
+ *
+ * Tor uses Curve25519 as the basis of its "ntor" circuit extension
+ * handshake, and in related code.  The functions in this module are
+ * used to find the most suitable available Curve25519 implementation,
+ * to provide wrappers around it, and so on.
  */
 
 #define CRYPTO_CURVE25519_PRIVATE
@@ -39,15 +47,23 @@ int curve25519_donna(uint8_t *mypublic,
 
 static void pick_curve25519_basepoint_impl(void);
 
+/** This is set to 1 if we have an optimized Ed25519-based
+ * implementation for multiplying a value by the basepoint; to 0 if we
+ * don't, and to -1 if we haven't checked. */
 static int curve25519_use_ed = -1;
 
+/**
+ * Helper function: call the most appropriate backend to compute the
+ * scalar "secret" times the point "point".  Store the result in
+ * "output".  Return 0 on success, negative on failure.
+ **/
 STATIC int
 curve25519_impl(uint8_t *output, const uint8_t *secret,
-const uint8_t *basepoint)
+const uint8_t *point)
 {
   uint8_t bp[CURVE25519_PUBKEY_LEN];
   int r;
-  memcpy(bp, basepoint, CURVE25519_PUBKEY_LEN);
+  memcpy(bp, point, CURVE25519_PUBKEY_LEN);
   /* Clear the high bit, in case our backend foolishly looks at it. */
   bp[31] &= 0x7f;
 #ifdef USE_CURVE25519_DONNA
@@ -61,6 +77,11 @@ curve25519_impl(uint8_t *output, const uint8_t *secret,
   return r;
 }
 
+/**
+ * Helper function: Multiply the scalar "secret" by the Curve25519
+ * basepoint (X=9), and store the result in "output".  Return 0 on
+ * success, -1 on false.
+ */
 STATIC int
 curve25519_basepoint_impl(uint8_t *output, const uint8_t *secret)
 {
@@ -85,6 +106,10 @@

[tor-commits] [tor/master] changes file for module docs

2016-10-17 Thread nickm

commit efe6fc8b0370fe9cb83755a7f6ec5a8604b5340c
Author: Nick Mathewson 
Date:   Mon Oct 17 10:18:45 2016 -0400

changes file for module docs
---
 changes/mod_docs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/mod_docs b/changes/mod_docs
new file mode 100644
index 000..57e4cae
--- /dev/null
+++ b/changes/mod_docs
@@ -0,0 +1,3 @@
+  o Documentation:
+- Added module-level internal documentation for 36 C files that
+  previously didn't have a high-level overview.

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

[tor-commits] [tor/master] Merge branch 'module_docs_1'

2016-10-17 Thread nickm

commit fd9a1045d8262d9d788198693788cead7a6e2dfe
Merge: df84536 aae034d
Author: Nick Mathewson 
Date:   Mon Oct 17 10:17:32 2016 -0400

Merge branch 'module_docs_1'

 src/common/crypto_curve25519.c | 52 +++--
 src/common/crypto_curve25519.h | 12 +-
 src/common/crypto_ed25519.c| 29 +-
 src/common/crypto_format.c |  7 
 src/common/workqueue.c | 14 +++
 src/or/buffers.c   | 20 --
 src/or/circuitstats.c  | 13 ++-
 src/or/command.c   | 20 ++
 src/or/connection_edge.c   | 45 ++
 src/or/control.c   | 26 -
 src/or/cpuworker.c |  6 ++-
 src/or/dircollate.c| 34 +++--
 src/or/dirserv.c   | 18 +
 src/or/dns.c   | 53 --
 src/or/dns_structs.h   | 12 ++
 src/or/fp_pair.c   |  8 
 src/or/geoip.c | 18 +
 src/or/hibernate.c | 24 +---
 src/or/keypin.c| 12 ++
 src/or/ntmain.c| 10 -
 src/or/onion.c | 52 +
 src/or/onion_fast.c| 18 +
 src/or/onion_ntor.c| 11 ++
 src/or/onion_tap.c | 12 ++
 src/or/periodic.c  |  4 ++
 src/or/protover.c  | 24 
 src/or/protover.h  |  7 
 src/or/reasons.c   |  6 +++
 src/or/rephist.c   | 70 +-
 src/or/replaycache.c   | 12 ++
 src/or/routerlist.c| 86 +-
 src/or/routerparse.c   | 63 +++
 src/or/routerset.c | 14 +++
 src/or/statefile.c | 17 +
 src/or/status.c|  8 +++-
 src/or/tor_main.c  |  6 ++-
 36 files changed, 801 insertions(+), 42 deletions(-)



___
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_completed] Update translations for tor-and-https_completed

2016-10-17 Thread translation

commit 0d9fa061b36e55398263660168825e82c4fa7747
Author: Translation commit bot 
Date:   Mon Oct 17 14:16:57 2016 +

Update translations for tor-and-https_completed
---
 nl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nl.po b/nl.po
index 62bd9c0..8305142 100644
--- a/nl.po
+++ b/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2016-08-22 13:29+\n"
+"PO-Revision-Date: 2016-10-17 13:49+\n"
 "Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "locatie"
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "WiFi"
-msgstr "WiFi"
+msgstr "wifi"
 
 #. (itstool) path: defs/text
 #. Keep it short: 4em max.
@@ -111,7 +111,7 @@ msgstr "NSA"
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Tor relay"
-msgstr "Tor relay"
+msgstr "Tor-relay"
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:363

___
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-10-17 Thread translation

commit affd065ae6c4dd72d1cac39c5e9bdc9c7c059db4
Author: Translation commit bot 
Date:   Mon Oct 17 14:16:40 2016 +

Update translations for torbutton-torbuttondtd
---
 de/torbutton.dtd | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/de/torbutton.dtd b/de/torbutton.dtd
index b1a7f19..df8746b 100644
--- a/de/torbutton.dtd
+++ b/de/torbutton.dtd
@@ -1,8 +1,8 @@
 
-
+
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 
@@ -25,18 +25,18 @@
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
 
-
+
 
 
 
@@ -46,7 +46,7 @@
 
 
 
-
+
 
 
 
@@ -54,7 +54,7 @@
 
 
 
-
+
 
 
 

___
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-10-17 Thread translation

commit 34c7c7b3461587f63f2a2f0468054824a459110d
Author: Translation commit bot 
Date:   Mon Oct 17 14:16:53 2016 +

Update translations for tor-and-https
---
 nl.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nl.po b/nl.po
index 62bd9c0..8305142 100644
--- a/nl.po
+++ b/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2014-07-17 14:23+\n"
-"PO-Revision-Date: 2016-08-22 13:29+\n"
+"PO-Revision-Date: 2016-10-17 13:49+\n"
 "Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -63,7 +63,7 @@ msgstr "locatie"
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "WiFi"
-msgstr "WiFi"
+msgstr "wifi"
 
 #. (itstool) path: defs/text
 #. Keep it short: 4em max.
@@ -111,7 +111,7 @@ msgstr "NSA"
 #: C/tor-and-https.svg:363
 #, no-wrap
 msgid "Tor relay"
-msgstr "Tor relay"
+msgstr "Tor-relay"
 
 #. (itstool) path: defs/text
 #: C/tor-and-https.svg:363

___
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-10-17 Thread translation

commit 6747332c8f3beaa30de9b60ad111a8d4f155c282
Author: Translation commit bot 
Date:   Mon Oct 17 14:15:39 2016 +

Update translations for tails-persistence-setup_completed
---
 nl/nl.po | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/nl/nl.po b/nl/nl.po
index b3d9384..887ce94 100644
--- a/nl/nl.po
+++ b/nl/nl.po
@@ -6,11 +6,12 @@
 # AndrÃ© Koot , 2016
 # cialenhh , 2013
 # gjlajfklajdkladj kasldfjaslkf <1bsuaz+3xy1gedeys...@sharklasers.com>, 2015
+# Nathan Follens, 2016
 # Oussama El Bachiri , 2013
 # Richard E. van der Luit , 2012
 # Shondoit Walker , 2013
 # T. Des Maison , 2014
-# ThijsRay , 2014
+# ThijsRay, 2014
 # Tonko Mulder , 2015
 # Volluta , 2015
 msgid ""
@@ -18,8 +19,8 @@ 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-06-06 08:15+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-10-17 13:46+\n"
+"Last-Translator: Nathan Follens\n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,11 +70,11 @@ msgstr "Icedove profielen en lokaal opgeslagen e-mail"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "GNOME Keyring"
-msgstr "GNOME sleutelring"
+msgstr "GNOME-sleuteblos"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:100
 msgid "Secrets stored by GNOME Keyring"
-msgstr "Secrets opgeslagen GNOME sleutelring"
+msgstr "Geheimen opgeslagen door GNOME-sleutelbos"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:108
 msgid "Network Connections"
@@ -85,11 +86,11 @@ msgstr "Configuratie van netwerkapparaten en verbindingen"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:118
 msgid "Browser bookmarks"
-msgstr "Browser favorieten"
+msgstr "Browserbladwijzers"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:120
 msgid "Bookmarks saved in the Tor Browser"
-msgstr "Bladwijzer opgeslagen in de Tor Browser"
+msgstr "Bladwijzer opgeslagen in de Tor-browser"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:128
 msgid "Printers"
@@ -97,15 +98,15 @@ msgstr "Printers"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:130
 msgid "Printers configuration"
-msgstr "Printers configuratie"
+msgstr "Printerconfiguratie"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:138
 msgid "Bitcoin client"
-msgstr "Bitcoin client"
+msgstr "Bitcoin-cliÃ«nt"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:140
 msgid "Electrum's bitcoin wallet and configuration"
-msgstr "Electrum's bitcoin portemonnee en configuratie"
+msgstr "Electrums bitcoinportemonnee en -configuratie"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:148
 msgid "APT Packages"
@@ -113,7 +114,7 @@ msgstr "APT-pakketten"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:150
 msgid "Packages downloaded by APT"
-msgstr "Pakketten door APT gedownload"
+msgstr "Pakketten gedownload door APT"
 
 #: ../lib/Tails/Persistence/Configuration/Presets.pm:158
 msgid "APT Lists"

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

[tor-commits] [torsocks/master] close: Prefix debug messages with [close]

2016-10-17 Thread dgoulet

commit 0aac61f3d737da5c6973b56be8dcd00227de389c
Author: David Goulet 
Date:   Sun Oct 16 18:50:44 2016 -0400

close: Prefix debug messages with [close]

Signed-off-by: David Goulet 
---
 src/lib/close.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/close.c b/src/lib/close.c
index 23c80e6..4381514 100644
--- a/src/lib/close.c
+++ b/src/lib/close.c
@@ -30,7 +30,7 @@ LIBC_CLOSE_RET_TYPE tsocks_close(LIBC_CLOSE_SIG)
 {
struct connection *conn;
 
-   DBG("Close caught for fd %d", fd);
+   DBG("[close] Close caught for fd %d", fd);
 
connection_registry_lock();
conn = connection_find(fd);
@@ -48,7 +48,7 @@ LIBC_CLOSE_RET_TYPE tsocks_close(LIBC_CLOSE_SIG)
 * connection pointer is destroyed.
 */
if (conn) {
-   DBG("Close connection putting back ref");
+   DBG("[close] Close connection putting back ref");
connection_put_ref(conn);
}
 

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

[tor-commits] [torsocks/master] Quote the non-zero length check of $getcap.

2016-10-17 Thread dgoulet

commit 173107baf54b71743570140026bf25073ef722fd
Author: Alexander FÃ¦rÃ¸y 
Date:   Sun Oct 16 20:48:00 2016 +0200

Quote the non-zero length check of $getcap.
---
 src/bin/torsocks.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in
index b030ad2..7288337 100644
--- a/src/bin/torsocks.in
+++ b/src/bin/torsocks.in
@@ -108,7 +108,7 @@ torify_app ()
 
# This must be before torifying because getcap uses cap_get_file(3)
# via syscall(2) which breaks torsocks.
-   if [ -n $getcap ]; then
+   if [ -n "$getcap" ]; then
caps=`$getcap $app_path`
fi
 



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

[tor-commits] [torsocks/master] Add check for Apple's System Integrity Protection.

2016-10-17 Thread dgoulet

commit 2f3656f8a12b866933397e4aa6ee1b31f661255c
Author: Alexander FÃ¦rÃ¸y 
Date:   Sun Oct 16 20:48:21 2016 +0200

Add check for Apple's System Integrity Protection.
---
 src/bin/torsocks.in | 39 +++
 1 file changed, 39 insertions(+)

diff --git a/src/bin/torsocks.in b/src/bin/torsocks.in
index 7288337..d8522e2 100644
--- a/src/bin/torsocks.in
+++ b/src/bin/torsocks.in
@@ -85,6 +85,41 @@ set_ld_preload ()
esac
 }
 
+# Report error due to Apple's System Integrity Protection.
+macos_sip_error ()
+{
+   echo "ERROR: $1 is located in a directory protected by Apple's System 
Integrity Protection." >&2
+   exit 1
+}
+
+# Check if SIP is enabled and if the user is about to violate the blacklist.
+macos_sip_check ()
+{
+   local app_path="$1"
+
+   case "$OSTYPE" in
+   darwin*)
+   # We need to figure out if Apple's System Integrity 
Protection is
+   # enabled on the users' system.
+   if /usr/bin/csrutil status | grep -q enabled; then
+   local abs_app_dir=`cd "$(dirname "$app_path")" 
&& pwd -P`
+
+   # It seems like /usr/** (with an exception of 
/usr/local/**),
+   # /System/**, /sbin/**, and /bin/** are 
currently protected
+   # using SIP.
+   case "$abs_app_dir/`basename $app_path`" in
+   /usr/local/*)
+   # Must be listed before the 
match on /usr/*
+   ;;
+   /usr/*|/System/*|/sbin/*|/bin/*)
+   macos_sip_error $app_path
+   ;;
+   esac
+   fi
+   ;;
+   esac
+}
+
 # Spawn a torified shell.
 tor_shell ()
 {
@@ -112,6 +147,10 @@ torify_app ()
caps=`$getcap $app_path`
fi
 
+   # Check if Apple's System Integrity Protection is enabled if the user is
+   # running on macOS.
+   macos_sip_check $app_path
+
# NEVER remove that line or else nothing it torified.
set_ld_preload
 



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

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

2016-10-17 Thread translation

commit 211089feda6cffc66481f2fd333ab575667e079f
Author: Translation commit bot 
Date:   Mon Oct 17 13:48:48 2016 +

Update translations for torbutton-abouttbupdatedtd_completed
---
 nl/abouttbupdate.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nl/abouttbupdate.dtd b/nl/abouttbupdate.dtd
index 57a8c54..e773a68 100644
--- a/nl/abouttbupdate.dtd
+++ b/nl/abouttbupdate.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/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd

2016-10-17 Thread translation

commit 311a156c910f5cb1633861de6c67970aa5d6f491
Author: Translation commit bot 
Date:   Mon Oct 17 13:48:45 2016 +

Update translations for torbutton-abouttbupdatedtd
---
 nl/abouttbupdate.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nl/abouttbupdate.dtd b/nl/abouttbupdate.dtd
index 57a8c54..e773a68 100644
--- a/nl/abouttbupdate.dtd
+++ b/nl/abouttbupdate.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/tor-messenger-otrproperties_completed] Update translations for tor-messenger-otrproperties_completed

2016-10-17 Thread translation

commit bcab2a46faa611cac846a76eba9c40f6e39c8fd1
Author: Translation commit bot 
Date:   Mon Oct 17 13:48:17 2016 +

Update translations for tor-messenger-otrproperties_completed
---
 nl/otr.properties | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nl/otr.properties b/nl/otr.properties
index 6c3e1a9..c3fb212 100644
--- a/nl/otr.properties
+++ b/nl/otr.properties
@@ -1,5 +1,5 @@
 msgevent.encryption_required_part1=Je probeerde een niet-versleuteld bericht 
naar %S te sturen. Het beleid is dat niet-versleutelde berichten niet 
toegestaan zijn.
-msgevent.encryption_required_part2=Aan het proberen om een privÃ©-conversatie 
te starten. Je bericht zal opnieuw verzonden worden wanneer de 
privÃ©-conversatie opgezet is.
+msgevent.encryption_required_part2=Aan het proberen om een privÃ©gesprek te 
starten. Je bericht zal opnieuw verzonden worden wanneer het privÃ©gesprek 
begint.
 msgevent.encryption_error=Er ging iets mis bij het versleutelen van je 
bericht. Je bericht is NIET vestuurd.
 msgevent.connection_ended=%S heeft zijn/haar privÃ©verbinding met jou 
beÃ«indigd. Je bericht werd niet verzonden. BeÃ«indig je privÃ©gesprek of 
herstart het.
 msgevent.setup_error=Er ging iets mis bij het starten van een privÃ©gesprek 
met %S.
@@ -7,25 +7,25 @@ msgevent.msg_reflected=Je ontvangt je eigen OTR-berichten. 
Dit wil zeggen dat je
 msgevent.msg_resent=Het laatste bericht naar %S werd opnieuw verzonden.
 msgevent.rcvdmsg_not_private=Het versleutelde bericht van %S is onleesbaar, 
omdat jullie niet privÃ© praten.
 msgevent.rcvdmsg_unreadable=We hebben een onleesbaar versleuteld bericht 
ontvangen van %S.
-msgevent.rcvdmsg_malformed=We hebben een misvormd data bericht ontvangen van 
%S.
-msgevent.log_heartbeat_rcvd=Heartbeat ontvangen van %S.
-msgevent.log_heartbeat_sent=Heartbeat verstuurd aan %S.
+msgevent.rcvdmsg_malformed=We hebben een onjuist gestructureerd bericht 
ontvangen van %S.
+msgevent.log_heartbeat_rcvd=Hartslag ontvangen van %S.
+msgevent.log_heartbeat_sent=Hartslag verstuurd aan %S.
 msgevent.rcvdmsg_general_err=Er ging iets mis met OTR.
-msgevent.rcvdmsg_unecrypted=Het volgende bericht van %S was niet geÃ«ncrypt: %S
-msgevent.rcvdmsg_unrecognized=We hebben een niet erkend OTR bericht ontvangen 
van %S.
+msgevent.rcvdmsg_unecrypted=Het volgende bericht van %S was niet versleuteld: 
%S
+msgevent.rcvdmsg_unrecognized=We hebben een niet-herkend OTR-bericht ontvangen 
van %S.
 msgevent.rcvdmsg_for_other_instance=%S heeft een bericht verstuurd dat bedoeld 
was voor een andere sessie. Indien je meermaals ingelogd bent, kan een andere 
sessie dit bericht hebben ontvangen.
-context.gone_secure_private=PrivÃ©-gesprek met %S gestart.
-context.gone_secure_unverified=PrivÃ©-gesprek met %S gestart. De identiteit 
van %S is niet geverifieerd.
-context.still_secure=De privÃ©-conversatie met %S werd succesvol ververst.
+context.gone_secure_private=PrivÃ©gesprek met %S gestart.
+context.gone_secure_unverified=PrivÃ©gesprek met %S gestart. De identiteit van 
%S is niet geverifieerd.
+context.still_secure=Het privÃ©gesprek met %S werd succesvol ververst.
 error.enc=Er ging iets mis bij het versleutelen van je bericht.
-error.not_priv=Je verstuurde versleutelde data naar %S, die het niet 
verwachtte.
+error.not_priv=Je verstuurde versleutelde gegevens naar %S, die het niet 
verwachtte.
 error.unreadable=Je hebt een onleesbaar versleuteld bericht verstuurd.
 error.malformed=Je hebt een onjuist gestructureerd bericht verstuurd.
 resent=[opnieuw gestuurd]
 tlv.disconnected=%S heeft zijn/haar privÃ©gesprek met je beÃ«indigd; je zou 
dit best ook doen.
-query.msg=%S heeft een Off-the-Record privÃ©-gesprek verzocht. Je hebt de 
plug-in die dit mogelijk maakt nog niet. Zie http://otr.cypherpunks.ca voor 
meer informatie.
+query.msg=%S heeft een Off-the-Record privÃ©gesprek verzocht. Je hebt de 
plug-in die dit mogelijk maakt nog niet geÃ¯nstalleerd. Zie 
http://otr.cypherpunks.ca/ voor meer informatie.
 trust.unused=Ongebruikt
-trust.not_private=Niet-privÃ©
-trust.unverified=Ongeverifieerd
+trust.not_private=Niet privÃ©
+trust.unverified=Niet geverifieerd
 trust.private=PrivÃ©
 trust.finished=Klaar

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

[tor-commits] [translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties

2016-10-17 Thread translation

commit f59f8f256307ef3c6895bfafa226e560832f4a07
Author: Translation commit bot 
Date:   Mon Oct 17 13:48:13 2016 +

Update translations for tor-messenger-otrproperties
---
 nl/otr.properties | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nl/otr.properties b/nl/otr.properties
index 6c3e1a9..c3fb212 100644
--- a/nl/otr.properties
+++ b/nl/otr.properties
@@ -1,5 +1,5 @@
 msgevent.encryption_required_part1=Je probeerde een niet-versleuteld bericht 
naar %S te sturen. Het beleid is dat niet-versleutelde berichten niet 
toegestaan zijn.
-msgevent.encryption_required_part2=Aan het proberen om een privÃ©-conversatie 
te starten. Je bericht zal opnieuw verzonden worden wanneer de 
privÃ©-conversatie opgezet is.
+msgevent.encryption_required_part2=Aan het proberen om een privÃ©gesprek te 
starten. Je bericht zal opnieuw verzonden worden wanneer het privÃ©gesprek 
begint.
 msgevent.encryption_error=Er ging iets mis bij het versleutelen van je 
bericht. Je bericht is NIET vestuurd.
 msgevent.connection_ended=%S heeft zijn/haar privÃ©verbinding met jou 
beÃ«indigd. Je bericht werd niet verzonden. BeÃ«indig je privÃ©gesprek of 
herstart het.
 msgevent.setup_error=Er ging iets mis bij het starten van een privÃ©gesprek 
met %S.
@@ -7,25 +7,25 @@ msgevent.msg_reflected=Je ontvangt je eigen OTR-berichten. 
Dit wil zeggen dat je
 msgevent.msg_resent=Het laatste bericht naar %S werd opnieuw verzonden.
 msgevent.rcvdmsg_not_private=Het versleutelde bericht van %S is onleesbaar, 
omdat jullie niet privÃ© praten.
 msgevent.rcvdmsg_unreadable=We hebben een onleesbaar versleuteld bericht 
ontvangen van %S.
-msgevent.rcvdmsg_malformed=We hebben een misvormd data bericht ontvangen van 
%S.
-msgevent.log_heartbeat_rcvd=Heartbeat ontvangen van %S.
-msgevent.log_heartbeat_sent=Heartbeat verstuurd aan %S.
+msgevent.rcvdmsg_malformed=We hebben een onjuist gestructureerd bericht 
ontvangen van %S.
+msgevent.log_heartbeat_rcvd=Hartslag ontvangen van %S.
+msgevent.log_heartbeat_sent=Hartslag verstuurd aan %S.
 msgevent.rcvdmsg_general_err=Er ging iets mis met OTR.
-msgevent.rcvdmsg_unecrypted=Het volgende bericht van %S was niet geÃ«ncrypt: %S
-msgevent.rcvdmsg_unrecognized=We hebben een niet erkend OTR bericht ontvangen 
van %S.
+msgevent.rcvdmsg_unecrypted=Het volgende bericht van %S was niet versleuteld: 
%S
+msgevent.rcvdmsg_unrecognized=We hebben een niet-herkend OTR-bericht ontvangen 
van %S.
 msgevent.rcvdmsg_for_other_instance=%S heeft een bericht verstuurd dat bedoeld 
was voor een andere sessie. Indien je meermaals ingelogd bent, kan een andere 
sessie dit bericht hebben ontvangen.
-context.gone_secure_private=PrivÃ©-gesprek met %S gestart.
-context.gone_secure_unverified=PrivÃ©-gesprek met %S gestart. De identiteit 
van %S is niet geverifieerd.
-context.still_secure=De privÃ©-conversatie met %S werd succesvol ververst.
+context.gone_secure_private=PrivÃ©gesprek met %S gestart.
+context.gone_secure_unverified=PrivÃ©gesprek met %S gestart. De identiteit van 
%S is niet geverifieerd.
+context.still_secure=Het privÃ©gesprek met %S werd succesvol ververst.
 error.enc=Er ging iets mis bij het versleutelen van je bericht.
-error.not_priv=Je verstuurde versleutelde data naar %S, die het niet 
verwachtte.
+error.not_priv=Je verstuurde versleutelde gegevens naar %S, die het niet 
verwachtte.
 error.unreadable=Je hebt een onleesbaar versleuteld bericht verstuurd.
 error.malformed=Je hebt een onjuist gestructureerd bericht verstuurd.
 resent=[opnieuw gestuurd]
 tlv.disconnected=%S heeft zijn/haar privÃ©gesprek met je beÃ«indigd; je zou 
dit best ook doen.
-query.msg=%S heeft een Off-the-Record privÃ©-gesprek verzocht. Je hebt de 
plug-in die dit mogelijk maakt nog niet. Zie http://otr.cypherpunks.ca voor 
meer informatie.
+query.msg=%S heeft een Off-the-Record privÃ©gesprek verzocht. Je hebt de 
plug-in die dit mogelijk maakt nog niet geÃ¯nstalleerd. Zie 
http://otr.cypherpunks.ca/ voor meer informatie.
 trust.unused=Ongebruikt
-trust.not_private=Niet-privÃ©
-trust.unverified=Ongeverifieerd
+trust.not_private=Niet privÃ©
+trust.unverified=Niet geverifieerd
 trust.private=PrivÃ©
 trust.finished=Klaar

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

[tor-commits] [translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties

2016-10-17 Thread translation

commit b1efd7fadb6d49fb7062015fad6b158fef55f2d0
Author: Translation commit bot 
Date:   Mon Oct 17 13:48:06 2016 +

Update translations for tor-messenger-ircproperties
---
 nl/irc.properties | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/nl/irc.properties b/nl/irc.properties
index 220249d..cc0826a 100644
--- a/nl/irc.properties
+++ b/nl/irc.properties
@@ -11,10 +11,10 @@ irc.usernameHint=nick
 # LOCALIZATION NOTE (connection.error.*):
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
-connection.error.lost=Verbinding verbroken met de server
-connection.error.timeOut=Verbindingstimeout
+connection.error.lost=Verbinding met de server verbroken
+connection.error.timeOut=Verbindingstime-out
 connection.error.invalidUsername=%S is niet toegestaan als gebruikersnaam
-connection.error.invalidPassword=Verkeerd server wachtwoord
+connection.error.invalidPassword=Ongeldig serverwachtwoord
 connection.error.passwordRequired=Wachtwoord vereist
 
 # LOCALIZATION NOTE (joinChat.*):
@@ -30,7 +30,7 @@ options.port=Poort
 options.ssl=Gebruik SSL
 options.encoding=Tekenset
 options.quitMessage=BeÃ«indig bericht
-options.partMessage=Onderdeel bericht
+options.partMessage=Verdeel bericht
 options.showServerTab=Geef de berichten van de server weer
 options.alternateNicks=Alternatieve bijnamen
 
@@ -50,28 +50,28 @@ ctcp.time=De tijd voor %1$S is %2$S.
 command.action=%S uit te voeren actie: Voer een actie uit.
 command.ctcp=%S bijnaam bericht: Verstuur een CTCP bericht 
naar de bijnaam.
 command.chanserv=%S commando: Verstuur een commando naar ChanServ.
-command.deop=%S nick1[,nick2]*: Verwijder de kanaal beheerder 
status van iemand. U moet hiervoor een kanaal beheerder zijn.
-command.devoice=% S & lt; nick1 & gt; [& lt; nick2 & gt;] *: Verwijder channel 
voice-status van iemand, voorkom dat gesproken wordt wanneer het kanaal is 
gemodereerd (+ m). Je moet een channel operator zijn om dit te kunnen doen.
-command.invite2=%S nick[ nick]* [channel]: Nodig een 
of meerdere mensen uit om te komen naar jou in uw huidige kanaal, of een 
specifieke kanaal.
-command.join=% S & lt; room1 & gt; [& lt; key1 & gt;] [& lt; room2 & gt; [& 
lt; key2 & gt;]] *: Betreedt Ã©Ã©n of meerdere kanalen, eventueel met het 
verstrekken van een kanaal sleutel voor elke indien gewenst.
-command.kick=%S nick [message]:Verwijder iemand van een 
kanaal. U moet een channel operator zijn om dit te kunnen.
+command.deop=%S nick1[,nick2]*: Verwijder de kanaal beheerder 
status van iemand. Je moet hiervoor een kanaalbeheerder zijn.
+command.devoice=% S & lt; nick1 & gt; [& lt; nick2 & gt;] *: Verwijder 
kanaalstem-status van iemand, voorkom dat gesproken wordt wanneer het kanaal is 
gemodereerd (+ m). Je moet een kanaalbeheerder zijn om dit te kunnen doen.
+command.invite2=%S nick[ nick]* [channel]: Nodig een 
of meerdere mensen uit om naar je huidige kanaal te komen, of naar een 
specifiek kanaal.
+command.join=% S & lt; room1 & gt; [& lt; key1 & gt;] [& lt; room2 & gt; [& 
lt; key2 & gt;]] *: Betreed een of meerdere kanalen, eventueel met het 
verstrekken van een kanaalsleutel voor elk indien gewenst.
+command.kick=%S nick [message]:Verwijder iemand uit een 
kanaal. Je moet een kanaalbeheerder zijn om dit te kunnen.
 command.list=%S: Toont een lijst van chatrooms op het netwerk. Waarschuwing, 
sommige servers verbreken de verbinding om dit mogelijk te maken.
-command.memoserv=%S command: Stuur een command naar MemoServ.
-command.modeUser=%S (+|-)new mode [nick]: Stel de user's mode 
in.
-command.modeChannel=%S channel[ (+|-)new mode 
[parameter][,parameter]*]: Krijg of stel de channel mode in.
-command.msg=%S nick message: Stuur een prive bericht naar een 
gebruiker (in tegenstelling tot een kanaal)
+command.memoserv=%S command: Stuur een commando naar MemoServ.
+command.modeUser=%S (+|-)new mode [nick]: Stel de 
gebruikersmodus in.
+command.modeChannel=%S channel[ (+|-)new mode 
[parameter][,parameter]*]: Verkrijg of stel de kanaalmodus in.
+command.msg=%S nick message: Stuur een privÃ©bericht naar een 
gebruiker (in tegenstelling tot een kanaal).
 command.nick=%S new nickname: verander je bijnaam .
-command.nickserv=%S command: Send een commando naar NickServ.
-command.notice=%S target message: Stuur een notificatie naar 
een gebruiker of kanaal.
-command.op=%S nick1[,nick2]*: Sta channel operator status toe 
aan iemand. Om dit te mogen moet je een channel operator zijn.
+command.nickserv=%S command: Stuur een commando naar NickServ.
+command.notice=%S target message: Stuur een melding naar een 
gebruiker of kanaal.
+command.op=%S nick1[,nick2]*: Sta kanaalbeheerdersstatus toe 
aan iemand. Om dit te mogen moet je een kanaalbeheerder zijn.
 command.operserv=%S command: Stuur een opdracht naar OperServ.
 command.part=%S [message]: Verlaat het kanaal met een optioneel bericht.
 command.ping=%S [nick]: Vraag

[tor-commits] [translation/tor-messenger-ircproperties_completed] Update translations for tor-messenger-ircproperties_completed

2016-10-17 Thread translation

commit e10f70009e2b6fb0f3709e8e3d3e1b661b1fbdbc
Author: Translation commit bot 
Date:   Mon Oct 17 13:48:10 2016 +

Update translations for tor-messenger-ircproperties_completed
---
 nl/irc.properties | 40 
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/nl/irc.properties b/nl/irc.properties
index 220249d..cc0826a 100644
--- a/nl/irc.properties
+++ b/nl/irc.properties
@@ -11,10 +11,10 @@ irc.usernameHint=nick
 # LOCALIZATION NOTE (connection.error.*):
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
-connection.error.lost=Verbinding verbroken met de server
-connection.error.timeOut=Verbindingstimeout
+connection.error.lost=Verbinding met de server verbroken
+connection.error.timeOut=Verbindingstime-out
 connection.error.invalidUsername=%S is niet toegestaan als gebruikersnaam
-connection.error.invalidPassword=Verkeerd server wachtwoord
+connection.error.invalidPassword=Ongeldig serverwachtwoord
 connection.error.passwordRequired=Wachtwoord vereist
 
 # LOCALIZATION NOTE (joinChat.*):
@@ -30,7 +30,7 @@ options.port=Poort
 options.ssl=Gebruik SSL
 options.encoding=Tekenset
 options.quitMessage=BeÃ«indig bericht
-options.partMessage=Onderdeel bericht
+options.partMessage=Verdeel bericht
 options.showServerTab=Geef de berichten van de server weer
 options.alternateNicks=Alternatieve bijnamen
 
@@ -50,28 +50,28 @@ ctcp.time=De tijd voor %1$S is %2$S.
 command.action=%S uit te voeren actie: Voer een actie uit.
 command.ctcp=%S bijnaam bericht: Verstuur een CTCP bericht 
naar de bijnaam.
 command.chanserv=%S commando: Verstuur een commando naar ChanServ.
-command.deop=%S nick1[,nick2]*: Verwijder de kanaal beheerder 
status van iemand. U moet hiervoor een kanaal beheerder zijn.
-command.devoice=% S & lt; nick1 & gt; [& lt; nick2 & gt;] *: Verwijder channel 
voice-status van iemand, voorkom dat gesproken wordt wanneer het kanaal is 
gemodereerd (+ m). Je moet een channel operator zijn om dit te kunnen doen.
-command.invite2=%S nick[ nick]* [channel]: Nodig een 
of meerdere mensen uit om te komen naar jou in uw huidige kanaal, of een 
specifieke kanaal.
-command.join=% S & lt; room1 & gt; [& lt; key1 & gt;] [& lt; room2 & gt; [& 
lt; key2 & gt;]] *: Betreedt Ã©Ã©n of meerdere kanalen, eventueel met het 
verstrekken van een kanaal sleutel voor elke indien gewenst.
-command.kick=%S nick [message]:Verwijder iemand van een 
kanaal. U moet een channel operator zijn om dit te kunnen.
+command.deop=%S nick1[,nick2]*: Verwijder de kanaal beheerder 
status van iemand. Je moet hiervoor een kanaalbeheerder zijn.
+command.devoice=% S & lt; nick1 & gt; [& lt; nick2 & gt;] *: Verwijder 
kanaalstem-status van iemand, voorkom dat gesproken wordt wanneer het kanaal is 
gemodereerd (+ m). Je moet een kanaalbeheerder zijn om dit te kunnen doen.
+command.invite2=%S nick[ nick]* [channel]: Nodig een 
of meerdere mensen uit om naar je huidige kanaal te komen, of naar een 
specifiek kanaal.
+command.join=% S & lt; room1 & gt; [& lt; key1 & gt;] [& lt; room2 & gt; [& 
lt; key2 & gt;]] *: Betreed een of meerdere kanalen, eventueel met het 
verstrekken van een kanaalsleutel voor elk indien gewenst.
+command.kick=%S nick [message]:Verwijder iemand uit een 
kanaal. Je moet een kanaalbeheerder zijn om dit te kunnen.
 command.list=%S: Toont een lijst van chatrooms op het netwerk. Waarschuwing, 
sommige servers verbreken de verbinding om dit mogelijk te maken.
-command.memoserv=%S command: Stuur een command naar MemoServ.
-command.modeUser=%S (+|-)new mode [nick]: Stel de user's mode 
in.
-command.modeChannel=%S channel[ (+|-)new mode 
[parameter][,parameter]*]: Krijg of stel de channel mode in.
-command.msg=%S nick message: Stuur een prive bericht naar een 
gebruiker (in tegenstelling tot een kanaal)
+command.memoserv=%S command: Stuur een commando naar MemoServ.
+command.modeUser=%S (+|-)new mode [nick]: Stel de 
gebruikersmodus in.
+command.modeChannel=%S channel[ (+|-)new mode 
[parameter][,parameter]*]: Verkrijg of stel de kanaalmodus in.
+command.msg=%S nick message: Stuur een privÃ©bericht naar een 
gebruiker (in tegenstelling tot een kanaal).
 command.nick=%S new nickname: verander je bijnaam .
-command.nickserv=%S command: Send een commando naar NickServ.
-command.notice=%S target message: Stuur een notificatie naar 
een gebruiker of kanaal.
-command.op=%S nick1[,nick2]*: Sta channel operator status toe 
aan iemand. Om dit te mogen moet je een channel operator zijn.
+command.nickserv=%S command: Stuur een commando naar NickServ.
+command.notice=%S target message: Stuur een melding naar een 
gebruiker of kanaal.
+command.op=%S nick1[,nick2]*: Sta kanaalbeheerdersstatus toe 
aan iemand. Om dit te mogen moet je een kanaalbeheerder zijn.
 command.operserv=%S command: Stuur een opdracht naar OperServ.
 command.part=%S [message]: Verlaat het kanaal met een optioneel bericht.
 command.ping=%S [nick]:

[tor-commits] [translation/tor-messenger-fingerdtd_completed] Update translations for tor-messenger-fingerdtd_completed

2016-10-17 Thread translation

commit 56501e521dccfedcfbaff4ee372d8f431d3fc30d
Author: Translation commit bot 
Date:   Mon Oct 17 13:47:58 2016 +

Update translations for tor-messenger-fingerdtd_completed
---
 nl/finger.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nl/finger.dtd b/nl/finger.dtd
index 1473e03..d57df62 100644
--- a/nl/finger.dtd
+++ b/nl/finger.dtd
@@ -8,8 +8,8 @@
 
 
 
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-commandsproperties_completed] Update translations for tor-messenger-commandsproperties_completed

2016-10-17 Thread translation

commit 2316e1cbb25a0f6cc9b61b487bd6737086ec4b90
Author: Translation commit bot 
Date:   Mon Oct 17 13:47:36 2016 +

Update translations for tor-messenger-commandsproperties_completed
---
 nl/commands.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nl/commands.properties b/nl/commands.properties
index 50f11f5..e7350b8 100644
--- a/nl/commands.properties
+++ b/nl/commands.properties
@@ -10,16 +10,16 @@ commands=Commando's: %S.\nGebruik het 
/help-commando voor meer informati
 noCommand=Geen '%S'-commando.
 noHelp=Geen hulpbericht voor het '%S'-commando, sorry!
 
-sayHelpString=zeg bericht: verstuur een bericht zonder commands te 
verwerken.
-rawHelpString=raw bericht: verstuur een bericht zonder escaping HTML 
entiteiten.
-helpHelpString=help naam: geeft het hulp bericht weer voor het 
naam commando of een lijst met mogelijke commando's zonder parameter.
+sayHelpString=zeg bericht: verstuur een bericht zonder commando's te 
verwerken.
+rawHelpString=raw bericht: verstuur een bericht zonder escaping 
HTML-entiteiten.
+helpHelpString=help naam: geeft het hulpbericht weer voor het 
naam-commando, of een lijst met mogelijke commando's zonder parameter.
 
 # LOCALIZATION NOTE (statusCommand):
 #  %1$S is replaced with a status command name
 #   (one of "back", "away", "busy", "dnd", or "offline").
 #  %2$S is replaced with the localized version of that status type
 #   (one of the 5 strings below).
-statusCommand=%1$S status bericht: zet de status op %2$S met een 
optionele bericht status.
+statusCommand=%1$S status bericht: zet de status op %2$S met een 
optioneel statusbericht.
 back=beschikbaar
 away=even weg
 busy=niet beschikbaar

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

[tor-commits] [translation/tor-messenger-fingerdtd] Update translations for tor-messenger-fingerdtd

2016-10-17 Thread translation

commit 880113af267a1bac78872c95cff147bb86189dae
Author: Translation commit bot 
Date:   Mon Oct 17 13:47:55 2016 +

Update translations for tor-messenger-fingerdtd
---
 nl/finger.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nl/finger.dtd b/nl/finger.dtd
index 1473e03..d57df62 100644
--- a/nl/finger.dtd
+++ b/nl/finger.dtd
@@ -8,8 +8,8 @@
 
 
 
-
-
-
-
-
\ No newline at end of file
+
+
+
+
+
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-commandsproperties] Update translations for tor-messenger-commandsproperties

2016-10-17 Thread translation

commit 4dfd6a58143f19759670ff3078e47b6a172a1f39
Author: Translation commit bot 
Date:   Mon Oct 17 13:47:33 2016 +

Update translations for tor-messenger-commandsproperties
---
 nl/commands.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nl/commands.properties b/nl/commands.properties
index 50f11f5..e7350b8 100644
--- a/nl/commands.properties
+++ b/nl/commands.properties
@@ -10,16 +10,16 @@ commands=Commando's: %S.\nGebruik het 
/help-commando voor meer informati
 noCommand=Geen '%S'-commando.
 noHelp=Geen hulpbericht voor het '%S'-commando, sorry!
 
-sayHelpString=zeg bericht: verstuur een bericht zonder commands te 
verwerken.
-rawHelpString=raw bericht: verstuur een bericht zonder escaping HTML 
entiteiten.
-helpHelpString=help naam: geeft het hulp bericht weer voor het 
naam commando of een lijst met mogelijke commando's zonder parameter.
+sayHelpString=zeg bericht: verstuur een bericht zonder commando's te 
verwerken.
+rawHelpString=raw bericht: verstuur een bericht zonder escaping 
HTML-entiteiten.
+helpHelpString=help naam: geeft het hulpbericht weer voor het 
naam-commando, of een lijst met mogelijke commando's zonder parameter.
 
 # LOCALIZATION NOTE (statusCommand):
 #  %1$S is replaced with a status command name
 #   (one of "back", "away", "busy", "dnd", or "offline").
 #  %2$S is replaced with the localized version of that status type
 #   (one of the 5 strings below).
-statusCommand=%1$S status bericht: zet de status op %2$S met een 
optionele bericht status.
+statusCommand=%1$S status bericht: zet de status op %2$S met een 
optioneel statusbericht.
 back=beschikbaar
 away=even weg
 busy=niet beschikbaar

___
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-10-17 Thread translation

commit cb586b254e5e9fd25bfa133ab4ac3a96386cca28
Author: Translation commit bot 
Date:   Mon Oct 17 13:47:10 2016 +

Update translations for torbutton-aboutdialogdtd_completed
---
 nl/aboutdialog.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/aboutdialog.dtd b/nl/aboutdialog.dtd
index 33e5ab2..bfaef0d 100644
--- a/nl/aboutdialog.dtd
+++ b/nl/aboutdialog.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 

___
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-10-17 Thread translation

commit 899ac36387f50da65b7aa8f1cc06c3678d6aa5a6
Author: Translation commit bot 
Date:   Mon Oct 17 13:47:06 2016 +

Update translations for torbutton-aboutdialogdtd
---
 nl/aboutdialog.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/aboutdialog.dtd b/nl/aboutdialog.dtd
index 33e5ab2..bfaef0d 100644
--- a/nl/aboutdialog.dtd
+++ b/nl/aboutdialog.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 

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

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

2016-10-17 Thread translation

commit 0e50fe6075446007de154c6c5690997d045aa8c9
Author: Translation commit bot 
Date:   Mon Oct 17 13:46:32 2016 +

Update translations for torbutton-brandproperties_completed
---
 nl/brand.properties | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nl/brand.properties b/nl/brand.properties
index 036f97a..43f4361 100644
--- a/nl/brand.properties
+++ b/nl/brand.properties
@@ -2,15 +2,15 @@
 # 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-browser
+brandShortName=Tor-browser
+brandFullName=Tor-browser
+vendorShortName=Tor-project
 
 homePageSingleStartMain=Firefox Start, een snelle startpagina met ingebouwde 
zoekfunctie
 homePageImport=Importeer je startpagina uit %S
 
-homePageMigrationPageTitle=Startpagina selectie
-homePageMigrationDescription=Selecteer de startpagina die jij wil gebruiken:
+homePageMigrationPageTitle=Startpaginakeuze
+homePageMigrationDescription=Selecteer de startpagina die je wil gebruiken:
 
-syncBrandShortName=Sync
+syncBrandShortName=Synchronisatie

___
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-10-17 Thread translation

commit a4240adfbd595287a36f05d66b59cc81d69ac025
Author: Translation commit bot 
Date:   Mon Oct 17 13:46:25 2016 +

Update translations for abouttor-homepage_completed
---
 nl/aboutTor.dtd | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd
index 9c6068b..023457e 100644
--- a/nl/aboutTor.dtd
+++ b/nl/aboutTor.dtd
@@ -6,18 +6,18 @@
 
 
 
-
+
 
-
+
 
-
+
 
-
-
+
+
 
 
 
-
+
 
 
 
@@ -29,21 +29,21 @@
 
 
 
-
-
+
+
 
-
+
 
 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/tails-misc_completed] Update translations for tails-misc_completed

2016-10-17 Thread translation

commit 19a821181a1662179cfa58e943299a91a8c83434
Author: Translation commit bot 
Date:   Mon Oct 17 13:46:18 2016 +

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

diff --git a/nl.po b/nl.po
index 8cd7d8d..07c9af8 100644
--- a/nl.po
+++ b/nl.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 16:02+0200\n"
-"PO-Revision-Date: 2016-09-03 08:57+\n"
+"POT-Creation-Date: 2016-09-19 13:02+0200\n"
+"PO-Revision-Date: 2016-10-17 13:37+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\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/abouttor-homepage] Update translations for abouttor-homepage

2016-10-17 Thread translation

commit d1a2236ff18be118895523a3cb3e9d0ebfd48a25
Author: Translation commit bot 
Date:   Mon Oct 17 13:46:21 2016 +

Update translations for abouttor-homepage
---
 nl/aboutTor.dtd | 28 ++--
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/nl/aboutTor.dtd b/nl/aboutTor.dtd
index 9c6068b..023457e 100644
--- a/nl/aboutTor.dtd
+++ b/nl/aboutTor.dtd
@@ -6,18 +6,18 @@
 
 
 
-
+
 
-
+
 
-
+
 
-
-
+
+
 
 
 
-
+
 
 
 
@@ -29,21 +29,21 @@
 
 
 
-
-
+
+
 
-
+
 
 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/tails-misc] Update translations for tails-misc

2016-10-17 Thread translation

commit 75a4407b88bcc3fcba7c4f4a746bf4a5d0726d78
Author: Translation commit bot 
Date:   Mon Oct 17 13:46:15 2016 +

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

diff --git a/nl.po b/nl.po
index 8cd7d8d..07c9af8 100644
--- a/nl.po
+++ b/nl.po
@@ -24,8 +24,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-09-02 16:02+0200\n"
-"PO-Revision-Date: 2016-09-03 08:57+\n"
+"POT-Creation-Date: 2016-09-19 13:02+0200\n"
+"PO-Revision-Date: 2016-10-17 13:37+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\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/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2016-10-17 Thread translation

commit 5247632404d904ce5f86d2bd426aa6af44faec77
Author: Translation commit bot 
Date:   Mon Oct 17 13:46:11 2016 +

Update translations for tor-launcher-network-settings_completed
---
 nl/network-settings.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd
index beabc95..d7fa414 100644
--- a/nl/network-settings.dtd
+++ b/nl/network-settings.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
@@ -38,9 +38,9 @@
 
 
 
-
+
 
-
+
 
 
 

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

[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2016-10-17 Thread translation

commit 24add69dd5c98fb0b841d2fe10cbfdd06e6a72a2
Author: Translation commit bot 
Date:   Mon Oct 17 13:46:08 2016 +

Update translations for tor-launcher-network-settings
---
 nl/network-settings.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nl/network-settings.dtd b/nl/network-settings.dtd
index beabc95..d7fa414 100644
--- a/nl/network-settings.dtd
+++ b/nl/network-settings.dtd
@@ -1,7 +1,7 @@
 
 
 
-
+
 
 
 
@@ -38,9 +38,9 @@
 
 
 
-
+
 
-
+
 
 
 

___
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-10-17 Thread translation

commit 7e275daca94e853dafffc031a4e633d0eebe8095
Author: Translation commit bot 
Date:   Mon Oct 17 13:45:49 2016 +

Update translations for torbirdy_completed
---
 nl/torbirdy.properties | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nl/torbirdy.properties b/nl/torbirdy.properties
index b26adad..a5b8607 100644
--- a/nl/torbirdy.properties
+++ b/nl/torbirdy.properties
@@ -1,18 +1,18 @@
 torbirdy.name=TorBirdy
 
-torbirdy.enabled.tor=TorBirdy geactiveerd:Tor
-torbirdy.enabled.jondo=TorBirdy geactiveerd:JonDo
-torbirdy.enabled.custom=TorBirdy geactiveerd:Aangepaste Proxy
-torbirdy.enabled.torification=TorBirdy geactiveerd:Transparant Torification
-torbirdy.enabled.whonix=TorBirdy geactiveerd:Whonix
-torbirdy.disabled=TorBirdy:Gedeactiveerd!
-torbirdy.enabled=TorBirdy:Ingeschakeld
+torbirdy.enabled.tor=TorBirdy ingeschakeld: Tor
+torbirdy.enabled.jondo=TorBirdy ingeschakeld: JonDo
+torbirdy.enabled.custom=TorBirdy ingeschakeld: aangepaste proxy
+torbirdy.enabled.torification=TorBirdy ingeschakeld: transparant Torification
+torbirdy.enabled.whonix=TorBirdy ingeschakeld: Whonix
+torbirdy.disabled=TorBirdy: uitgeschakeld!
+torbirdy.enabled=TorBirdy: ingeschakeld
 
-torbirdy.email.prompt=TorBirdy heeft Thunderbird's automatische 
configuratiehulp uitgeschakeld om uw anonimiteit te beschermen.\n\nDe 
aanbevolen beveiligingsinstellingen zijn voor %S ingesteld.\n\nU kunt nu de 
andere instellingen handmatig configureren.
+torbirdy.email.prompt=TorBirdy heeft de automatische configuratiehulp van 
Thunderbird uitgeschakeld om je anonimiteit te beschermen.\n\nDe aanbevolen 
beveiligingsinstellingen voor %S zijn ingesteld.\n\nJe kan nu de andere 
instellingen handmatig configureren.
 
-torbirdy.email.advanced=Hou er rekening mee dat het aanpassen van de 
geavanceerde instellingen van TorBirdy wordt AFGERADEN.\n\nGa hier alleen mee 
verder als u weet wat u doet.
+torbirdy.email.advanced=Hou er rekening mee dat het aanpassen van de 
geavanceerde instellingen van TorBirdy wordt AFGERADEN.\n\nGa hier alleen mee 
verder als je weet wat je doet.
 torbirdy.email.advanced.nextwarning=Toon deze waarschuwing ook in de toekomst
-torbirdy.email.advanced.title=TorBirdy geavanceerde instellingen
+torbirdy.email.advanced.title=Geavanceerde instellingen voor TorBirdy
 
-torbirdy.firstrun=Je gebruikt nu TorBirdy.\n\nOm je anonimiteit te beschermen 
zal TorBirdy de Thunderbird instellingen die het heeft ingesteld vastzetten. 
Dit voorkomt aanpassingen door jou of add-ons. Er zijn sommige instellingen die 
aangepast kunnen worden; deze zijn beschikbaar in TorBirdy's voorkeurenvenster. 
Wanneer TorBirdy gedeÃ¯nstalleerd wordt, worden alle instellingen die aangepast 
zijn weer teruggezet naar hun standaard waardes (de waardes die gebruikt werden 
voor de installatie van TorBirdy)\n\nAls je een nieuwe gebruiker bent, raden we 
aan om de TorBirdy website te lezen om te begrijpen wat we proberen te bereiken 
met TorBirdy voor onze gebruikers.
+torbirdy.firstrun=Je gebruikt nu TorBirdy.\n\nOm je anonimiteit te beschermen 
zal TorBirdy de Thunderbird-instellingen die het heeft ingesteld vastzetten. 
Dit voorkomt aanpassingen door jou of door add-ons. Er zijn sommige 
instellingen die aangepast kunnen worden; deze zijn beschikbaar in het 
voorkeurenvenster van TorBirdy. Wanneer TorBirdy verwijderd wordt, worden alle 
instellingen die aangepast zijn weer teruggezet naar hun standaardwaarden (de 
waarden die gebruikt werden voor de installatie van TorBirdy).\n\nAls je een 
nieuwe gebruiker bent, raden we je aan om de TorBirdy-website te lezen om te 
begrijpen wat we met TorBirdy voor onze gebruikers proberen te bereiken.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

___
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-10-17 Thread translation

commit 5392356a4f346ba8c385ac03c9eef2e54fc4fb10
Author: Translation commit bot 
Date:   Mon Oct 17 13:45:45 2016 +

Update translations for torbirdy
---
 nl/torbirdy.properties | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/nl/torbirdy.properties b/nl/torbirdy.properties
index b26adad..a5b8607 100644
--- a/nl/torbirdy.properties
+++ b/nl/torbirdy.properties
@@ -1,18 +1,18 @@
 torbirdy.name=TorBirdy
 
-torbirdy.enabled.tor=TorBirdy geactiveerd:Tor
-torbirdy.enabled.jondo=TorBirdy geactiveerd:JonDo
-torbirdy.enabled.custom=TorBirdy geactiveerd:Aangepaste Proxy
-torbirdy.enabled.torification=TorBirdy geactiveerd:Transparant Torification
-torbirdy.enabled.whonix=TorBirdy geactiveerd:Whonix
-torbirdy.disabled=TorBirdy:Gedeactiveerd!
-torbirdy.enabled=TorBirdy:Ingeschakeld
+torbirdy.enabled.tor=TorBirdy ingeschakeld: Tor
+torbirdy.enabled.jondo=TorBirdy ingeschakeld: JonDo
+torbirdy.enabled.custom=TorBirdy ingeschakeld: aangepaste proxy
+torbirdy.enabled.torification=TorBirdy ingeschakeld: transparant Torification
+torbirdy.enabled.whonix=TorBirdy ingeschakeld: Whonix
+torbirdy.disabled=TorBirdy: uitgeschakeld!
+torbirdy.enabled=TorBirdy: ingeschakeld
 
-torbirdy.email.prompt=TorBirdy heeft Thunderbird's automatische 
configuratiehulp uitgeschakeld om uw anonimiteit te beschermen.\n\nDe 
aanbevolen beveiligingsinstellingen zijn voor %S ingesteld.\n\nU kunt nu de 
andere instellingen handmatig configureren.
+torbirdy.email.prompt=TorBirdy heeft de automatische configuratiehulp van 
Thunderbird uitgeschakeld om je anonimiteit te beschermen.\n\nDe aanbevolen 
beveiligingsinstellingen voor %S zijn ingesteld.\n\nJe kan nu de andere 
instellingen handmatig configureren.
 
-torbirdy.email.advanced=Hou er rekening mee dat het aanpassen van de 
geavanceerde instellingen van TorBirdy wordt AFGERADEN.\n\nGa hier alleen mee 
verder als u weet wat u doet.
+torbirdy.email.advanced=Hou er rekening mee dat het aanpassen van de 
geavanceerde instellingen van TorBirdy wordt AFGERADEN.\n\nGa hier alleen mee 
verder als je weet wat je doet.
 torbirdy.email.advanced.nextwarning=Toon deze waarschuwing ook in de toekomst
-torbirdy.email.advanced.title=TorBirdy geavanceerde instellingen
+torbirdy.email.advanced.title=Geavanceerde instellingen voor TorBirdy
 
-torbirdy.firstrun=Je gebruikt nu TorBirdy.\n\nOm je anonimiteit te beschermen 
zal TorBirdy de Thunderbird instellingen die het heeft ingesteld vastzetten. 
Dit voorkomt aanpassingen door jou of add-ons. Er zijn sommige instellingen die 
aangepast kunnen worden; deze zijn beschikbaar in TorBirdy's voorkeurenvenster. 
Wanneer TorBirdy gedeÃ¯nstalleerd wordt, worden alle instellingen die aangepast 
zijn weer teruggezet naar hun standaard waardes (de waardes die gebruikt werden 
voor de installatie van TorBirdy)\n\nAls je een nieuwe gebruiker bent, raden we 
aan om de TorBirdy website te lezen om te begrijpen wat we proberen te bereiken 
met TorBirdy voor onze gebruikers.
+torbirdy.firstrun=Je gebruikt nu TorBirdy.\n\nOm je anonimiteit te beschermen 
zal TorBirdy de Thunderbird-instellingen die het heeft ingesteld vastzetten. 
Dit voorkomt aanpassingen door jou of door add-ons. Er zijn sommige 
instellingen die aangepast kunnen worden; deze zijn beschikbaar in het 
voorkeurenvenster van TorBirdy. Wanneer TorBirdy verwijderd wordt, worden alle 
instellingen die aangepast zijn weer teruggezet naar hun standaardwaarden (de 
waarden die gebruikt werden voor de installatie van TorBirdy).\n\nAls je een 
nieuwe gebruiker bent, raden we je aan om de TorBirdy-website te lezen om te 
begrijpen wat we met TorBirdy voor onze gebruikers proberen te bereiken.
 torbirdy.website=https://trac.torproject.org/projects/tor/wiki/torbirdy

___
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-10-17 Thread translation

commit cbf42f0ad6fe95e2f40132fe220cc372aa49d0cb
Author: Translation commit bot 
Date:   Mon Oct 17 13:45:08 2016 +

Update translations for torcheck
---
 nl/torcheck.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/torcheck.po b/nl/torcheck.po
index 1deecf2..72a9330 100644
--- a/nl/torcheck.po
+++ b/nl/torcheck.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"PO-Revision-Date: 2016-10-17 13:44+\n"
 "Last-Translator: Cleveridge \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\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/torcheck_completed] Update translations for torcheck_completed

2016-10-17 Thread translation

commit b7b0c1ac527fa96a2b802ee97aaacf7f839d6cce
Author: Translation commit bot 
Date:   Mon Oct 17 13:45:12 2016 +

Update translations for torcheck_completed
---
 nl/torcheck.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/torcheck.po b/nl/torcheck.po
index 1deecf2..72a9330 100644
--- a/nl/torcheck.po
+++ b/nl/torcheck.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "POT-Creation-Date: 2012-02-16 20:28+PDT\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
+"PO-Revision-Date: 2016-10-17 13:44+\n"
 "Last-Translator: Cleveridge \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\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/tor-messenger-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2016-10-17 Thread translation

commit 83cd04187eaade069c2db9d00f1af2be8582f071
Author: Translation commit bot 
Date:   Mon Oct 17 13:18:26 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 nl/prefs.dtd | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/nl/prefs.dtd b/nl/prefs.dtd
index 6928cfd..82b5e6b 100644
--- a/nl/prefs.dtd
+++ b/nl/prefs.dtd
@@ -1,5 +1,6 @@
 
 
+
 
 
 
@@ -9,6 +10,13 @@
 
 
 
-
+
 
-
\ No newline at end of file
+
+
+
+
+
+
+
+
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-privproperties_completed] Update translations for tor-messenger-privproperties_completed

2016-10-17 Thread translation

commit 66cc207c4885d9a65674a6456f6542fe9204f023
Author: Translation commit bot 
Date:   Mon Oct 17 13:18:16 2016 +

Update translations for tor-messenger-privproperties_completed
---
 nl/priv.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/priv.properties b/nl/priv.properties
index 16d9450..235ca74 100644
--- a/nl/priv.properties
+++ b/nl/priv.properties
@@ -1,2 +1,2 @@
 priv.account=Bezig met aanmaken van privÃ©sleutel voor %S (%S)...
-priv.failed=Sleutel genereren mislukt: %S
+priv.failed=Aanmaken van sleutel mislukt: %S

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

[tor-commits] [translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd

2016-10-17 Thread translation

commit 0dc6368b3c4d9acc16f641e09f83771809f2834d
Author: Translation commit bot 
Date:   Mon Oct 17 13:18:12 2016 +

Update translations for tor-messenger-prefsdtd
---
 nl/prefs.dtd | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nl/prefs.dtd b/nl/prefs.dtd
index 4a518e8..82b5e6b 100644
--- a/nl/prefs.dtd
+++ b/nl/prefs.dtd
@@ -10,13 +10,13 @@
 
 
 
-
+
 
 
 
-
+
 
 
-
-
-
\ No newline at end of file
+
+
+
\ No newline at end of file

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

[tor-commits] [translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties

2016-10-17 Thread translation

commit 9fd62d216876a01b99637d40f91944d01d617e7c
Author: Translation commit bot 
Date:   Mon Oct 17 13:18:01 2016 +

Update translations for tor-messenger-otrproperties
---
 nl/otr.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nl/otr.properties b/nl/otr.properties
index e4f7a6a..6c3e1a9 100644
--- a/nl/otr.properties
+++ b/nl/otr.properties
@@ -1,9 +1,9 @@
 msgevent.encryption_required_part1=Je probeerde een niet-versleuteld bericht 
naar %S te sturen. Het beleid is dat niet-versleutelde berichten niet 
toegestaan zijn.
 msgevent.encryption_required_part2=Aan het proberen om een privÃ©-conversatie 
te starten. Je bericht zal opnieuw verzonden worden wanneer de 
privÃ©-conversatie opgezet is.
 msgevent.encryption_error=Er ging iets mis bij het versleutelen van je 
bericht. Je bericht is NIET vestuurd.
-msgevent.connection_ended=%S heeft zijn/haar privÃ© connectie met jou 
beÃ«indigd. Je bericht werd niet verzonden. BeÃ«indig je privÃ©-conversatie of 
herstart deze.
-msgevent.setup_error=Er ging iets mis bij het starten van een 
privÃ©-conversatie met %S.
-msgevent.msg_reflected=Je ontvangt je eigen OTR berichten. Dit wil zeggen dat 
je of tegen jezelf probeert te praten, of dat iemand jouw berichten terug naar 
jou verstuurd.
+msgevent.connection_ended=%S heeft zijn/haar privÃ©verbinding met jou 
beÃ«indigd. Je bericht werd niet verzonden. BeÃ«indig je privÃ©gesprek of 
herstart het.
+msgevent.setup_error=Er ging iets mis bij het starten van een privÃ©gesprek 
met %S.
+msgevent.msg_reflected=Je ontvangt je eigen OTR-berichten. Dit wil zeggen dat 
je tegen jezelf probeert te praten, of dat iemand jouw berichten terug naar jou 
stuurt.
 msgevent.msg_resent=Het laatste bericht naar %S werd opnieuw verzonden.
 msgevent.rcvdmsg_not_private=Het versleutelde bericht van %S is onleesbaar, 
omdat jullie niet privÃ© praten.
 msgevent.rcvdmsg_unreadable=We hebben een onleesbaar versleuteld bericht 
ontvangen van %S.

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

[tor-commits] [translation/tor-messenger-otrproperties_completed] Update translations for tor-messenger-otrproperties_completed

2016-10-17 Thread translation

commit 2966d08667f3bce9ca3946113335c4159fe87db0
Author: Translation commit bot 
Date:   Mon Oct 17 13:18:04 2016 +

Update translations for tor-messenger-otrproperties_completed
---
 nl/otr.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nl/otr.properties b/nl/otr.properties
index e4f7a6a..6c3e1a9 100644
--- a/nl/otr.properties
+++ b/nl/otr.properties
@@ -1,9 +1,9 @@
 msgevent.encryption_required_part1=Je probeerde een niet-versleuteld bericht 
naar %S te sturen. Het beleid is dat niet-versleutelde berichten niet 
toegestaan zijn.
 msgevent.encryption_required_part2=Aan het proberen om een privÃ©-conversatie 
te starten. Je bericht zal opnieuw verzonden worden wanneer de 
privÃ©-conversatie opgezet is.
 msgevent.encryption_error=Er ging iets mis bij het versleutelen van je 
bericht. Je bericht is NIET vestuurd.
-msgevent.connection_ended=%S heeft zijn/haar privÃ© connectie met jou 
beÃ«indigd. Je bericht werd niet verzonden. BeÃ«indig je privÃ©-conversatie of 
herstart deze.
-msgevent.setup_error=Er ging iets mis bij het starten van een 
privÃ©-conversatie met %S.
-msgevent.msg_reflected=Je ontvangt je eigen OTR berichten. Dit wil zeggen dat 
je of tegen jezelf probeert te praten, of dat iemand jouw berichten terug naar 
jou verstuurd.
+msgevent.connection_ended=%S heeft zijn/haar privÃ©verbinding met jou 
beÃ«indigd. Je bericht werd niet verzonden. BeÃ«indig je privÃ©gesprek of 
herstart het.
+msgevent.setup_error=Er ging iets mis bij het starten van een privÃ©gesprek 
met %S.
+msgevent.msg_reflected=Je ontvangt je eigen OTR-berichten. Dit wil zeggen dat 
je tegen jezelf probeert te praten, of dat iemand jouw berichten terug naar jou 
stuurt.
 msgevent.msg_resent=Het laatste bericht naar %S werd opnieuw verzonden.
 msgevent.rcvdmsg_not_private=Het versleutelde bericht van %S is onleesbaar, 
omdat jullie niet privÃ© praten.
 msgevent.rcvdmsg_unreadable=We hebben een onleesbaar versleuteld bericht 
ontvangen van %S.

___
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-10-17 Thread translation

commit e81cc8fcef1ec4c544c7529e0cc2c31e0ae9d584
Author: Translation commit bot 
Date:   Mon Oct 17 13:16:53 2016 +

Update translations for tor_animation
---
 nl.srt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl.srt b/nl.srt
index 92db867..3476478 100644
--- a/nl.srt
+++ b/nl.srt
@@ -9,7 +9,7 @@ en ons privÃ©leven:
 
 3
 00:00:08,000 --> 00:00:09,960
-voedsel dat we eten, mensen die we ontmoeten,
+wat we eten, mensen die we ontmoeten,
 
 4
 00:00:10,180 --> 00:00:12,480

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

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

2016-10-17 Thread translation

commit 54ab1ed6d8e493ef9bd672d752618821b1a89985
Author: Translation commit bot 
Date:   Mon Oct 17 13:16:58 2016 +

Update translations for tor_animation_completed
---
 nl.srt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl.srt b/nl.srt
index 92db867..3476478 100644
--- a/nl.srt
+++ b/nl.srt
@@ -9,7 +9,7 @@ en ons privÃ©leven:
 
 3
 00:00:08,000 --> 00:00:09,960
-voedsel dat we eten, mensen die we ontmoeten,
+wat we eten, mensen die we ontmoeten,
 
 4
 00:00:10,180 --> 00:00:12,480

___
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-10-17 Thread translation

commit a0860ecc600aff2830b8c87ef829034581de49a9
Author: Translation commit bot 
Date:   Mon Oct 17 13:16:34 2016 +

Update translations for torbutton-torbuttondtd
---
 nl/torbutton.dtd | 66 
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd
index a23ded6..88a2b13 100644
--- a/nl/torbutton.dtd
+++ b/nl/torbutton.dtd
@@ -1,62 +1,62 @@
 
 
-
+
 
-
+
 
-
+
 
-
+
 
-
+
 
 
-
-
-
+
+
+
 
 
 
 
-
-
-
-
-
-
+
+
+
+
+
+
 
 
-
+
 
 
-
+
 
-
+
 
-
+
 
-
-
-
-
-
+
+
+
+
+
 
 
 
 
-
+
 
-
-
-
-
-
+
+
+
+
+
 
-
-
+
+
 
 
 
-
+
 
-
+

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

[tor-commits] [tor/master] Add a logic-consistency test when parsing unix socket configs

2016-10-17 Thread nickm

commit df84536ac129da6ad5c96cc5cd3dce9c4a1f39b7
Author: Nick Mathewson 
Date:   Mon Oct 17 08:27:10 2016 -0400

Add a logic-consistency test when parsing unix socket configs

Coverity couldn't tell that 'addrport' was always non-NULL at this
point in the function, so I'm adding an explicit check. This closes
CID 1374060.
---
 src/or/config.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/or/config.c b/src/or/config.c
index e3aa6d9..08c576e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6592,6 +6592,8 @@ parse_port_config(smartlist_t *out,
 if (unix_socket_path) {
   port = 1;
 } else if (is_unix_socket) {
+  if (BUG(!addrport))
+goto err; // LCOV_EXCL_LINE unreachable, but coverity can't tell that
   unix_socket_path = tor_strdup(addrport);
   if (!strcmp(addrport, "0"))
 port = 0;

___
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-10-17 Thread translation

commit 5e38452661a73a89dd606a1607184e4c8103461d
Author: Translation commit bot 
Date:   Mon Oct 17 12:16:36 2016 +

Update translations for torbutton-torbuttondtd
---
 fr_CA/torbutton.dtd | 4 ++--
 nb/torbutton.dtd| 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/fr_CA/torbutton.dtd b/fr_CA/torbutton.dtd
index 70ca926..c8524ff 100644
--- a/fr_CA/torbutton.dtd
+++ b/fr_CA/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 
diff --git a/nb/torbutton.dtd b/nb/torbutton.dtd
index b616ef8..0cf43c1 100644
--- a/nb/torbutton.dtd
+++ b/nb/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 
@@ -31,7 +31,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [torbutton/master] Bug 18093: Remove 'Restore Defaults' button

2016-10-17 Thread gk

commit 7a0efdf6a99969007792d418a6bbfd5e0da4b3cf
Author: Arthur Edelstein 
Date:   Thu Oct 6 21:58:50 2016 -0700

Bug 18093: Remove 'Restore Defaults' button
---
 src/chrome/content/preferences.js| 57 
 src/chrome/content/preferences.xul   |  4 +--
 src/chrome/content/torbutton_util.js | 24 ---
 src/chrome/locale/en/torbutton.dtd   |  1 -
 4 files changed, 1 insertion(+), 85 deletions(-)

diff --git a/src/chrome/content/preferences.js 
b/src/chrome/content/preferences.js
index 28f5955..1d85cde 100644
--- a/src/chrome/content/preferences.js
+++ b/src/chrome/content/preferences.js
@@ -54,63 +54,6 @@ function torbutton_prefs_save(doc) {
 }
 }
 
-function torbutton_prefs_reset_defaults() {
-var o_torprefs = torbutton_get_prefbranch('extensions.torbutton.');
-var tmpcnt = new Object();
-var children;
-var i;
-var loglevel = o_torprefs.getIntPref("loglevel");
-var logmthd = o_torprefs.getIntPref("logmethod");
-
-torbutton_log(3, "Starting Pref reset");
-
-//  1. Clear torbutton settings
-//  2. Clear browser proxy settings
-//  3. Reset Security Slider settings
-
-// XXX Warning: The only reason this works is because of Firefox's 
-// threading model. As soon as a pref is changed, all observers
-// are notified by that same thread, immediately. Since torbutton's
-// security state is driven by proxy pref observers, this
-// causes everything to be reset in a linear order. If firefox 
-// ever makes pref observers asynchonous, this will all break.
-
-children = o_torprefs.getChildList("" , tmpcnt);
-for(i = 0; i < children.length; i++) {
-if(o_torprefs.prefHasUserValue(children[i]))
-o_torprefs.clearUserPref(children[i]);
-}
-
-// Keep logging the same.
-o_torprefs.setIntPref("loglevel", loglevel);
-o_torprefs.setIntPref("logmethod", logmthd);
-
-torbutton_log(3, "Resetting browser prefs");
-
-// Reset browser prefs that torbutton touches just in case
-// they get horked. Better everything gets set back to default
-// than some arcane pref gets wedged with no clear way to fix it.
-// Technical users who tuned these by themselves will be able to fix it.
-// It's the non-technical ones we should make it easy for
-torbutton_reset_browser_prefs();
-
-// Resetting the Security Slider preferences
-var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-.getService(Components.interfaces.nsIWindowMediator);
-var win = wm.getMostRecentWindow("navigator:browser");
-o_torprefs.setBoolPref('security_custom', false);
-o_torprefs.setIntPref('security_slider', 4);
-win.torbutton_update_security_slider();
-
-torbutton_log(4, "Preferences reset to defaults");
-torbutton_prefs_init(window.document);
-
-// In all cases, force prefs to be synced to disk
-var prefService = Components.classes["@mozilla.org/preferences-service;1"]
-.getService(Components.interfaces.nsIPrefService);
-prefService.savePrefFile(null);
-}
-
 function torbutton_toggle_slider(doc, pos) {
 doc.getElementById("torbutton_sec_slider").value = pos;
 // Make sure the custom checkbox is unchecked as the user seems to want one
diff --git a/src/chrome/content/preferences.xul 
b/src/chrome/content/preferences.xul
index 62f649f..574932e 100644
--- a/src/chrome/content/preferences.xul
+++ b/src/chrome/content/preferences.xul
@@ -8,9 +8,7 @@
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul;
 xmlns:html="http://www.w3.org/1999/xhtml;
 title="_settings;"
-buttons="accept,cancel,extra1"
-buttonlabelextra1="_defaults;"
-ondialogextra1="torbutton_prefs_reset_defaults();"
+buttons="accept,cancel"
 persist="screenX screenY width height"
 onload="torbutton_prefs_init(document)"
 align="stretch"
diff --git a/src/chrome/content/torbutton_util.js 
b/src/chrome/content/torbutton_util.js
index 1558ced..f1263f1 100644
--- a/src/chrome/content/torbutton_util.js
+++ b/src/chrome/content/torbutton_util.js
@@ -52,30 +52,6 @@ function torbutton_get_prefbranch(branch_name) {
 return o_branch;
 }
 
-// Bug 1506 P3: This would be a semi-polite thing to do on uninstall 
-// for pure Firefox users. The most polite thing would be to save
-// all their original prefs.. But meh?
-function torbutton_reset_browser_prefs() {
-var o_all_prefs = torbutton_get_prefbranch('');
-var prefs = ["network.http.sendSecureXSiteReferrer", 
-"network.http.sendRefererHeader", "dom.storage.enabled", 
-"extensions.update.enabled", "app.update.enabled",
-"app.update.auto", "browser.search.update", 
-"browser.cache.memory.enable", "network.http.use-cache", 
-"browser.cache.disk.enable", "browser.safebrowsing.enabled",
-"browser.send_pings",

[tor-commits] [tor-browser-bundle/master] Revert "Bug 13893: Make Tor Browser compatible with EMET"

2016-10-17 Thread gk

commit 48b0c33bf651b972e81490b3896dd332437e
Author: Georg Koppen 
Date:   Mon Oct 17 11:52:19 2016 +

Revert "Bug 13893: Make Tor Browser compatible with EMET"

This reverts commit 0348263efd1cb8a9eca8737f3dc7734ef75e0966.

Firefox is not ready for GCC 6 yet. See #20381 for further details.
---
 gitian/descriptors/windows/gitian-utils.yml |7 -
 gitian/patches/gcc_62_1.patch   |   23 -
 gitian/patches/gcc_62_2.patch   | 1198 ---
 gitian/versions.alpha   |6 +-
 gitian/versions.nightly |6 +-
 5 files changed, 6 insertions(+), 1234 deletions(-)

diff --git a/gitian/descriptors/windows/gitian-utils.yml 
b/gitian/descriptors/windows/gitian-utils.yml
index d3598e2..9c31834 100644
--- a/gitian/descriptors/windows/gitian-utils.yml
+++ b/gitian/descriptors/windows/gitian-utils.yml
@@ -35,8 +35,6 @@ files:
 - "nsis.tar.bz2"
 - "nsis-debian.tar.xz"
 - "nsis-missing-unistd-include.patch"
-- "gcc_62_1.patch"
-- "gcc_62_2.patch"
 script: |
   INSTDIR="$HOME/install"
   source versions
@@ -81,11 +79,6 @@ script: |
   mkdir gcc
   cd gcc
   tar -xjvf ../gcc.tar.bz2
-  cd gcc-*
-  # Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77459.
-  patch -p1 < ~/build/gcc_62_1.patch
-  patch -p1 < ~/build/gcc_62_2.patch
-  cd ..
   # We don't want to link against msvcrt.dll due to bug 9084.
   i686-w64-mingw32-g++ -dumpspecs > ~/build/msvcr100.spec
   sed 's/msvcrt/msvcr100/' -i ~/build/msvcr100.spec
diff --git a/gitian/patches/gcc_62_1.patch b/gitian/patches/gcc_62_1.patch
deleted file mode 100644
index 7ca36d8..000
--- a/gitian/patches/gcc_62_1.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 1ec6206ea80ceb5df843ea0bc4ef04d9ab17257e Mon Sep 17 00:00:00 2001
-From: Georg Koppen 
-Date: Wed, 14 Sep 2016 12:53:19 +
-Subject: [PATCH 1/2] Revert "2015-09-17  Catherine Moore 
- "
-
-This reverts commit a63a17505346bb3a91ce3de6fe238264c4d849ac.
-
-diff --git a/libstdc++-v3/src/c++11/debug.cc b/libstdc++-v3/src/c++11/debug.cc
-index f25304c..308802e 100644
 a/libstdc++-v3/src/c++11/debug.cc
-+++ b/libstdc++-v3/src/c++11/debug.cc
-@@ -32,7 +32,6 @@
- #include 
- 
- #include 
--#include 
- 
- #include  // for std::min
- #include  // for _Hash_impl
--- 
-2.9.3
-
diff --git a/gitian/patches/gcc_62_2.patch b/gitian/patches/gcc_62_2.patch
deleted file mode 100644
index 7dbd826..000
--- a/gitian/patches/gcc_62_2.patch
+++ /dev/null
@@ -1,1198 +0,0 @@
-From 0fbc32fdb5e0119877b0fd608d8855af0e4e376e Mon Sep 17 00:00:00 2001
-From: Georg Koppen 
-Date: Wed, 14 Sep 2016 12:54:30 +
-Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"2015-09-17=20=20Fran=C3=A7ois=20D?=
- =?UTF-8?q?umont=20=20"?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This reverts commit 426075db14da88357dd104345b5edea369f1d5c6.
-
-diff --git a/libstdc++-v3/include/debug/formatter.h 
b/libstdc++-v3/include/debug/formatter.h
-index 72db612..7d4f027 100644
 a/libstdc++-v3/include/debug/formatter.h
-+++ b/libstdc++-v3/include/debug/formatter.h
-@@ -132,13 +132,6 @@ namespace __gnu_debug
- 
-   class _Error_formatter
-   {
--// Tags denoting the type of parameter for construction
--struct _Is_iterator { };
--struct _Is_iterator_value_type { };
--struct _Is_sequence { };
--struct _Is_instance { };
--
--  public:
- /// Whether an iterator is constant, mutable, or unknown
- enum _Constness
- {
-@@ -160,6 +153,13 @@ namespace __gnu_debug
-   __last_state
- };
- 
-+// Tags denoting the type of parameter for construction
-+struct _Is_iterator { };
-+struct _Is_iterator_value_type { };
-+struct _Is_sequence { };
-+struct _Is_instance { };
-+
-+  public:
- // A parameter that may be referenced by an error message
- struct _Parameter
- {
-@@ -375,16 +375,15 @@ namespace __gnu_debug
- 
-   void
-   _M_print_field(const _Error_formatter* __formatter,
--   const char* __name) const _GLIBCXX_DEPRECATED;
-+   const char* __name) const;
- 
-   void
--  _M_print_description(const _Error_formatter* __formatter)
--  const _GLIBCXX_DEPRECATED;
-+  _M_print_description(const _Error_formatter* __formatter) const;
- };
- 
- template
--  _Error_formatter&
--  _M_iterator(const _Iterator& __it, const char* __name = 0)
-+  const _Error_formatter&
-+  _M_iterator(const _Iterator& __it, const char* __name = 0)  const
-   {
-   if (_M_num_parameters < std::size_t(__max_parameters))
- _M_parameters[_M_num_parameters++] = _Parameter(__it, __name,
-@@ -393,59 +392,57 @@ namespace __gnu_debug
-   }
- 
- template
--  _Error_formatter&
-+  const _Error_formatter&
-   _M_iterator_value_type(const _Iterator& __it,
--

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

2016-10-17 Thread translation

commit 2ff5a804aa07e4ba714611685910966146043c4c
Author: Translation commit bot 
Date:   Mon Oct 17 11:46:35 2016 +

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

diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd
index 3834145..02407a5 100644
--- a/zh_CN/torbutton.dtd
+++ b/zh_CN/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 

___
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-10-17 Thread translation

commit cfd290fd1536283908ee30abb45b09bf96214746
Author: Translation commit bot 
Date:   Mon Oct 17 11:16:40 2016 +

Update translations for torbutton-torbuttondtd
---
 es/torbutton.dtd | 6 +++---
 tr/torbutton.dtd | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index d015777..8ba953c 100644
--- a/es/torbutton.dtd
+++ b/es/torbutton.dtd
@@ -5,13 +5,13 @@
 
 
 
-
+
 
 
 
 
 
-
+
 
 
 
@@ -29,7 +29,7 @@
 
 
-
+
 
 
diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index e2e5975..2f47b5b 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -2,7 +2,7 @@
 
 
 
-
+
 
 
 
@@ -11,7 +11,7 @@
 
 
 
-
+
 
 
 

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

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

2016-10-17 Thread translation

commit 70dd639fe6e87d2f98b11d30e4b99002a8e1e974
Author: Translation commit bot 
Date:   Mon Oct 17 11:15:07 2016 +

Update translations for bridgedb_completed
---
 es/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po
index 7fb85a5..c4afe54 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -5,6 +5,7 @@
 # Translators:
 # dark_yoshi , 2014
 # toypurina , 2014
+# B. K. , 2016
 # BL , 2014
 # Edward Navarro, 2015
 # Ignacio RodrÃguez , 2015
@@ -21,8 +22,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: EzeqGO\n"
+"PO-Revision-Date: 2016-10-17 11:05+\n"
+"Last-Translator: B. K. \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -102,7 +103,7 @@ msgstr "Ahora mismo no hay ningÃºn bridge disponible..."
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "Â¡Tal vez debas probar %s volviendo atrÃ¡s %s y seleccionando un tipo 
diferente de bridge!"
+msgstr "Â¡Tal vez deberÃas probar %s volviendo atrÃ¡s %s y seleccionando un 
tipo de bridge diferente!"
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
@@ -184,7 +185,7 @@ msgstr "AquÃ estÃ¡n sus puentes de red:"
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time 
between\n"
 "emails is %s hours. All further emails during this time period will be 
ignored."
-msgstr "Ha excedido el lÃmite de velocidad. Por favor, Â¡mÃ¡s despacio! El 
tiempo mÃnimo entre correos electrÃ³nicos es %s horas. Los siguientes correos 
durante este periodo de tiempo serÃ¡n ignorados. "
+msgstr "Ha excedido el lÃmite de cuota. Por favor, Â¡mÃ¡s despacio! El tiempo 
mÃnimo entre correos electrÃ³nicos es %s horas. Los siguientes correos durante 
este periodo de tiempo serÃ¡n ignorados. "
 
 #: bridgedb/strings.py:50
 msgid ""

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

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

2016-10-17 Thread translation

commit b0ffe606fd4d039eef1c8aa77c888be6ee0ea228
Author: Translation commit bot 
Date:   Mon Oct 17 11:15:03 2016 +

Update translations for bridgedb
---
 es/LC_MESSAGES/bridgedb.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po
index 7fb85a5..c4afe54 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -5,6 +5,7 @@
 # Translators:
 # dark_yoshi , 2014
 # toypurina , 2014
+# B. K. , 2016
 # BL , 2014
 # Edward Navarro, 2015
 # Ignacio RodrÃguez , 2015
@@ -21,8 +22,8 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
 "POT-Creation-Date: 2015-07-25 03:40+\n"
-"PO-Revision-Date: 2016-03-21 16:27+\n"
-"Last-Translator: EzeqGO\n"
+"PO-Revision-Date: 2016-10-17 11:05+\n"
+"Last-Translator: B. K. \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -102,7 +103,7 @@ msgstr "Ahora mismo no hay ningÃºn bridge disponible..."
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "Â¡Tal vez debas probar %s volviendo atrÃ¡s %s y seleccionando un tipo 
diferente de bridge!"
+msgstr "Â¡Tal vez deberÃas probar %s volviendo atrÃ¡s %s y seleccionando un 
tipo de bridge diferente!"
 
 #: bridgedb/https/templates/index.html:11
 #, python-format
@@ -184,7 +185,7 @@ msgstr "AquÃ estÃ¡n sus puentes de red:"
 msgid ""
 "You have exceeded the rate limit. Please slow down! The minimum time 
between\n"
 "emails is %s hours. All further emails during this time period will be 
ignored."
-msgstr "Ha excedido el lÃmite de velocidad. Por favor, Â¡mÃ¡s despacio! El 
tiempo mÃnimo entre correos electrÃ³nicos es %s horas. Los siguientes correos 
durante este periodo de tiempo serÃ¡n ignorados. "
+msgstr "Ha excedido el lÃmite de cuota. Por favor, Â¡mÃ¡s despacio! El tiempo 
mÃnimo entre correos electrÃ³nicos es %s horas. Los siguientes correos durante 
este periodo de tiempo serÃ¡n ignorados. "
 
 #: bridgedb/strings.py:50
 msgid ""

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

1 2 >

1 - 100 of 112 matches

Mail list logo