date:20160823

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

2016-08-23 Thread translation

commit 5487d2cf53c0844f32749bfadc79cd8f7329653a
Author: Translation commit bot 
Date:   Wed Aug 24 05:18:08 2016 +

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

diff --git a/tr/prefs.dtd b/tr/prefs.dtd
index c3a1929..52af45d 100644
--- a/tr/prefs.dtd
+++ b/tr/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-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2016-08-23 Thread translation

commit fc15bf037155b11340946d148f473656cd795870
Author: Translation commit bot 
Date:   Wed Aug 24 05:18:21 2016 +

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

diff --git a/tr/prefs.dtd b/tr/prefs.dtd
index 94f614c..52af45d 100644
--- a/tr/prefs.dtd
+++ b/tr/prefs.dtd
@@ -1,5 +1,6 @@
 
 
+
 
 
 
@@ -11,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] [webwml/master] tor doesn't "install" or "put" the torrc file

2016-08-23 Thread arma

commit ff56397380b77b9d4e0e22d67dbb1324a6bd0d91
Author: Roger Dingledine 
Date:   Wed Aug 24 01:09:27 2016 -0400

tor doesn't "install" or "put" the torrc file

humans (or packages) do.
---
 docs/en/faq.wml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/en/faq.wml b/docs/en/faq.wml
index c238ca6..abf47de 100644
--- a/docs/en/faq.wml
+++ b/docs/en/faq.wml
@@ -1523,7 +1523,7 @@ 
href="http://www.crowdstrike.com/community-tools/index.html#tool-79;>proposed
 What does that mean?
 
 
-Tor installs a text file called torrc that contains configuration
+Tor uses a text file called torrc that contains configuration
 instructions for how your Tor program should behave. The default
 configuration should work fine for most Tor users.
 
@@ -1536,11 +1536,11 @@ and select "Show Package Contents" before the Tor 
Browser directories become
 visible.
 
 
-Tor puts the torrc file in /usr/local/etc/tor/torrc if you 
compiled tor from source, and /etc/tor/torrc or 
/etc/torrc if you installed a pre-built package.
+Tor looks for the torrc file in /usr/local/etc/tor/torrc if you 
compiled tor from source, and /etc/tor/torrc or 
/etc/torrc if you installed a pre-built package.
 
 
-Once you've changed your torrc, you will need to restart tor for the
-changes to take effect. (For advanced users, note that
+Once you've created or changed your torrc file, you will need to restart
+tor for the changes to take effect. (For advanced users, note that
 you actually only need to send Tor a HUP signal, not actually restart
 it.)
 

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

[tor-commits] [tor-messenger-build/master] Update the changelog for the updater patches

2016-08-23 Thread arlo

commit 1a9892a438fbbd4c8296b7875b1b2acfbebc040d
Author: Arlo Breault 
Date:   Tue Aug 23 15:47:51 2016 -0700

Update the changelog for the updater patches
---
 ChangeLog | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index a392187..4dc9198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,12 +2,15 @@ Tor Messenger 0.1.0b7 --
  * All Platforms
* Use the THUNDERBIRD_45_2_0_RELEASE tag on mozilla-esr45
* Use the THUNDERBIRD_45_2_0_RELEASE tag on comm-esr45
+   * Bug 14388: Port Tor Browser's updater patches
* Bug 19053: Display plaintext in notifications
* Update libgpg-error to 1.24
* Update libgcrypt to 1.6.6 for CVE-2016-6316
* ctypes-otr
  * GH 66: Provide functionality for adding verified fingerprints (patch by 
Vu Quoc Huy)
  * GH 73: Show progress during verification in notification box (patch by 
Vu Quoc Huy)
+ * Mac
+   * Bug 13861: Profile directory stored in ~/Library/Application\ Support
 
 Tor Messenger 0.1.0b6 -- April 06, 2016
  * All Platforms

___
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-08-23 Thread translation

commit 8e0636c7e9b4ce5951eb88aae9e972f99c8d7a9d
Author: Translation commit bot 
Date:   Tue Aug 23 22:48:07 2016 +

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

diff --git a/pt_BR/prefs.dtd b/pt_BR/prefs.dtd
index a1f8864..0637509 100644
--- a/pt_BR/prefs.dtd
+++ b/pt_BR/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-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2016-08-23 Thread translation

commit f50b8730dc22ba99e6f0109a2926422363049726
Author: Translation commit bot 
Date:   Tue Aug 23 22:48:22 2016 +

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

diff --git a/pt_BR/prefs.dtd b/pt_BR/prefs.dtd
index 8b2e364..0637509 100644
--- a/pt_BR/prefs.dtd
+++ b/pt_BR/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_completed] Update translations for tor-messenger-prefsdtd_completed

2016-08-23 Thread translation

commit 97dbe857710a547d5e18a5be08ca38d980fbddd0
Author: Translation commit bot 
Date:   Tue Aug 23 19:48:21 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 es/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es/prefs.dtd b/es/prefs.dtd
index d3990e8..c399b3d 100644
--- a/es/prefs.dtd
+++ b/es/prefs.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 

___
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-08-23 Thread translation

commit 9211662e7faee7013e6535dd05a14592b6baa78c
Author: Translation commit bot 
Date:   Tue Aug 23 19:48:07 2016 +

Update translations for tor-messenger-prefsdtd
---
 es/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es/prefs.dtd b/es/prefs.dtd
index d3990e8..c399b3d 100644
--- a/es/prefs.dtd
+++ b/es/prefs.dtd
@@ -14,7 +14,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [tor-browser/tor-browser-45.3.0esr-6.0-1] fixup! Bug 13252 - Do not store data in the app bundle

2016-08-23 Thread gk

commit 7c50120b217807b98a8a99d16c53b760d2119280
Author: Kathy Brade 
Date:   Tue Jul 26 11:49:20 2016 -0400

fixup! Bug 13252 - Do not store data in the app bundle

For Orfox, store browser data in the app home directory.
Fixes bug 19706.
---
 toolkit/xre/nsXREDirProvider.cpp | 2 ++
 xpcom/io/TorFileUtils.cpp| 7 +++
 2 files changed, 9 insertions(+)

diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index e3c1449..f50fed1 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -1280,6 +1280,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** 
aFile, bool aLocal)
   nsresult rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir));
   NS_ENSURE_SUCCESS(rv, rv);
 
+#if !defined(ANDROID)
 #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
   rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser"));
 #else
@@ -1287,6 +1288,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** 
aFile, bool aLocal)
  XPCOM_FILE_PATH_SEPARATOR "Browser"));
 #endif
   NS_ENSURE_SUCCESS(rv, rv);
+#endif
 
   if (aLocal) {
 rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp
index 2b0b100..c45961a 100644
--- a/xpcom/io/TorFileUtils.cpp
+++ b/xpcom/io/TorFileUtils.cpp
@@ -81,6 +81,13 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile)
   }
 #endif
 
+#elif defined(ANDROID)
+  // Orfox stores data in the app home directory.
+  const char* homeDir = getenv("HOME");
+  if (!homeDir || !*homeDir)
+return NS_ERROR_FAILURE;
+  nsresult rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
+  getter_AddRefs(tbDataDir));
 #else
   // User data is embedded within the application directory (i.e.,
   // TOR_BROWSER_DATA_OUTSIDE_APP_DIR is not defined).

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

[tor-commits] [tor-browser/tor-browser-45.3.0esr-6.5-1] fixup! Bug 13252 - Do not store data in the app bundle

2016-08-23 Thread gk

commit b8726ee81e6eca2e302e2ea85c0d09ad22be1ec5
Author: Kathy Brade 
Date:   Tue Jul 26 11:49:20 2016 -0400

fixup! Bug 13252 - Do not store data in the app bundle

For Orfox, store browser data in the app home directory.
Fixes bug 19706.
---
 toolkit/xre/nsXREDirProvider.cpp | 2 ++
 xpcom/io/TorFileUtils.cpp| 7 +++
 2 files changed, 9 insertions(+)

diff --git a/toolkit/xre/nsXREDirProvider.cpp b/toolkit/xre/nsXREDirProvider.cpp
index e3c1449..f50fed1 100644
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -1280,6 +1280,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** 
aFile, bool aLocal)
   nsresult rv = GetTorBrowserUserDataDir(getter_AddRefs(localDir));
   NS_ENSURE_SUCCESS(rv, rv);
 
+#if !defined(ANDROID)
 #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
   rv = localDir->AppendNative(NS_LITERAL_CSTRING("Browser"));
 #else
@@ -1287,6 +1288,7 @@ nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** 
aFile, bool aLocal)
  XPCOM_FILE_PATH_SEPARATOR "Browser"));
 #endif
   NS_ENSURE_SUCCESS(rv, rv);
+#endif
 
   if (aLocal) {
 rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp
index 2b0b100..c45961a 100644
--- a/xpcom/io/TorFileUtils.cpp
+++ b/xpcom/io/TorFileUtils.cpp
@@ -81,6 +81,13 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile)
   }
 #endif
 
+#elif defined(ANDROID)
+  // Orfox stores data in the app home directory.
+  const char* homeDir = getenv("HOME");
+  if (!homeDir || !*homeDir)
+return NS_ERROR_FAILURE;
+  nsresult rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
+  getter_AddRefs(tbDataDir));
 #else
   // User data is embedded within the application directory (i.e.,
   // TOR_BROWSER_DATA_OUTSIDE_APP_DIR is not defined).

___
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-08-23 Thread translation

commit 2c63d823168fe135c7ba8149d68411aed4e52963
Author: Translation commit bot 
Date:   Tue Aug 23 18:48:17 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 es/prefs.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/prefs.dtd b/es/prefs.dtd
index 02bfede..d3990e8 100644
--- a/es/prefs.dtd
+++ b/es/prefs.dtd
@@ -16,7 +16,7 @@
 
 
 
-
-
+
+
 
-
\ 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-08-23 Thread translation

commit 9ba459cb3284ad34613d21d3177f125292cecbc2
Author: Translation commit bot 
Date:   Tue Aug 23 18:48:04 2016 +

Update translations for tor-messenger-prefsdtd
---
 es/prefs.dtd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/es/prefs.dtd b/es/prefs.dtd
index 02bfede..d3990e8 100644
--- a/es/prefs.dtd
+++ b/es/prefs.dtd
@@ -16,7 +16,7 @@
 
 
 
-
-
+
+
 
-
\ 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-08-23 Thread translation

commit 5a28e6d65ad4d974947b8fe5959dffd647fe5bb5
Author: Translation commit bot 
Date:   Tue Aug 23 15:48:01 2016 +

Update translations for tor-messenger-prefsdtd
---
 de/prefs.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/de/prefs.dtd b/de/prefs.dtd
index fbf6437..d981a5d 100644
--- a/de/prefs.dtd
+++ b/de/prefs.dtd
@@ -13,8 +13,8 @@
 
 
 
-
-
+
+
 
 
 

___
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-08-23 Thread translation

commit 7235fab3911a37f08bcf20ce4430e75be3f5214d
Author: Translation commit bot 
Date:   Tue Aug 23 15:18:05 2016 +

Update translations for tor-messenger-prefsdtd
---
 hu/prefs.dtd | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/hu/prefs.dtd b/hu/prefs.dtd
index 078194a..4a4045b 100644
--- a/hu/prefs.dtd
+++ b/hu/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-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2016-08-23 Thread translation

commit 902755db9cefb89d99a96af8f65f48bebe5afa24
Author: Translation commit bot 
Date:   Tue Aug 23 15:18:21 2016 +

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

diff --git a/hu/prefs.dtd b/hu/prefs.dtd
index 5edbb12..4a4045b 100644
--- a/hu/prefs.dtd
+++ b/hu/prefs.dtd
@@ -1,5 +1,6 @@
 
 
+
 
 
 
@@ -11,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] [tor/master] Merge the rest of the changes into the 0.2.9.2-alpha changelog

2016-08-23 Thread nickm

commit 8feb301413cc0f23b37dedbac0c57de25b88f519
Author: Nick Mathewson 
Date:   Tue Aug 23 10:16:34 2016 -0400

Merge the rest of the changes into the 0.2.9.2-alpha changelog
---
 ChangeLog   | 74 +++--
 changes/19450   |  3 ---
 changes/bug13953|  3 ---
 changes/bug17758|  3 ---
 changes/bug19168|  3 ---
 changes/bug19466|  3 ---
 changes/bug19743|  4 ---
 changes/bug19901|  5 
 changes/bug19904|  4 ---
 changes/bug8625 |  5 
 changes/deprecation | 31 --
 11 files changed, 72 insertions(+), 66 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e49984e..3f20d0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,90 @@
 Changes in version 0.2.9.2-alpha - 2016-08-2?
   Tor 0.2.9.2-alpha  BLURB HERE.
 
+  o Major features (user interface):
+- Tor now supports the ability to declare options deprecated, so
+  that we can recommend that people stop using them. Previously,
+  this was done in an ad-hoc way. Closes ticket 19820.
+
+  o Major bugfixes (directory downloads):
+- Avoid resetting download status for consensuses hourly, since we
+  already have another, smarter retry mechanism. Fixes bug 8625;
+  bugfix on 0.2.0.9-alpha.
+
+  o Minor features (config):
+- Warn users when descriptor and port addresses are inconsistent.
+  Mitigates bug 13953; patch by teor.
+
   o Minor features (geoip):
 - Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
   Country database.
 
+  o Minor features (user interface):
+- There is a new --list-deprecated-options command-line option to
+  list all of the deprecated options. Implemented as part of
+  ticket 19820.
+
+  o Minor bugfixes (code style):
+- Fix an integer signedness conversion issue in the case conversion
+  tables. Fixes bug 19168; bugfix on 0.2.1.11-alpha.
+
+  o Minor bugfixes (compilation):
+- Build correctly on versions of libevent2 without support for
+  evutil_secure_rng_add_bytes(). Fixes bug 19904; bugfix
+  on 0.2.5.4-alpha.
+- Fix a compilation warning on GCC versions before 4.6. Our
+  ENABLE_GCC_WARNING macro used the word "warning" as an argument,
+  when it is also required as an argument to the compiler pragma.
+  Fixes bug 19901; bugfix on 0.2.9.1-alpha.
+
   o Minor bugfixes (compilation, also in 0.2.8.7):
 - Remove an inappropriate "inline" in tortls.c that was causing
-  warnings on older versions of GCC. Fixes bug 19903; bugfix on
-  0.2.8.1-alpha.
+  warnings on older versions of GCC. Fixes bug 19903; bugfix
+  on 0.2.8.1-alpha.
 
   o Minor bugfixes (fallback directories, also in 0.2.8.7):
 - Avoid logging a NULL string pointer when loading fallback
   directory information. Fixes bug 19947; bugfix on 0.2.4.7-alpha
   and 0.2.8.1-alpha. Report and patch by "rubiate".
 
+  o Minor bugfixes (logging):
+- Log a more accurate message when we fail to dump a microdescriptor.
+  Fixes bug 17758; bugfix on 0.2.2.8-alpha. Patch from Daniel Pinto.
+
+  o Minor bugfixes (memory leak):
+- Fix a series of slow memory leaks related to parsing torrc files
+  and options. Fixes bug 19466; bugfix on 0.2.1.6-alpha.
+
+  o Deprecated features:
+- A number of DNS-cache-related sub-options for client ports are now
+  deprecated for security reasons, and may be removed in a future
+  version of Tor. (We believe that client-side DNS cacheing is a bad
+  idea for anonymity, and you should not turn it on.) The options
+  are: CacheDNS, CacheIPv4DNS, CacheIPv6DNS, UseDNSCache,
+  UseIPv4Cache, and UseIPv6Cache.
+- A number of options are deprecated for security reasons, and may
+  be removed in a future version of Tor. The options are:
+  AllowDotExit, AllowInvalidNodes, AllowSingleHopCircuits,
+  AllowSingleHopExits, ClientDNSRejectInternalAddresses,
+  CloseHSClientCircuitsImmediatelyOnTimeout,
+  CloseHSServiceRendCircuitsImmediatelyOnTimeout,
+  ExcludeSingleHopRelays, FastFirstHopPK, TLSECGroup,
+  UseNTorHandshake, and WarnUnsafeSocks.
+- The *ListenAddress options are now deprecated as unnecessary: the
+  corresponding *Port options should be used instead. These options
+  may someday be removed. The affected options are:
+  ControlListenAddress, DNSListenAddress, DirListenAddress,
+  NATDListenAddress, ORListenAddress, SocksListenAddress,
+  and TransListenAddress.
+
+  o Documentation:
+- Correct the IPv6 syntax in our documentation for the
+  VirtualAddrNetworkIPv6 torrc option. Closes ticket 19743.
+
+  o Removed code:
+- We no longer include the (dead, deprecated) bufferevent code in
+  Tor. Closes ticket 19450. Based on a patch from U+039b.
+
 
 Changes in version 0.2.9.1-alpha - 2016-08-08
   Tor 0.2.9.1-alpha is the first alpha release in the 0.2.9 development

[tor-commits] [tor/master] fix 8625 description a little

2016-08-23 Thread nickm

commit 8fb49e4df278817e6d44c4de44666db11ca7aadc
Author: Nick Mathewson 
Date:   Tue Aug 23 10:14:45 2016 -0400

fix 8625 description a little
---
 changes/bug8625 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/changes/bug8625 b/changes/bug8625
index b0a5196..e398d07 100644
--- a/changes/bug8625
+++ b/changes/bug8625
@@ -1,6 +1,5 @@
o Major bugfixes (directory downloads):
-- Avoid resetting download status for consensuses hourly, and add a
-  SimulateDirDownloadFailures config option to test behavior when all
-  downloads from directory servers fail.  Fixes bug 8625; bugfix on
+- Avoid resetting download status for consensuses hourly, since we
+  already have another, smarter retry mechanism.  Fixes bug 8625; bugfix on
   0.2.0.9-alpha.
 



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

[tor-commits] [tor/master] Start 0.2.9.2-alpha changelog, fix some lintchanges issues

2016-08-23 Thread nickm

commit f009e1b32c2937dc2af16949c41943de1df594ce
Author: Nick Mathewson 
Date:   Tue Aug 23 10:13:13 2016 -0400

Start 0.2.9.2-alpha changelog, fix some lintchanges issues
---
 ChangeLog| 17 -
 changes/bug13953 |  2 +-
 changes/bug19743 |  2 +-
 changes/bug19903 |  4 
 changes/bug19947 |  4 
 changes/bug8625  |  6 --
 changes/geoip-august2016 |  4 
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68573b3..e49984e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,19 @@
-Changes in version 0.2.9.2-alpha - 2016-0?-??
+Changes in version 0.2.9.2-alpha - 2016-08-2?
+  Tor 0.2.9.2-alpha  BLURB HERE.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
+  Country database.
+
+  o Minor bugfixes (compilation, also in 0.2.8.7):
+- Remove an inappropriate "inline" in tortls.c that was causing
+  warnings on older versions of GCC. Fixes bug 19903; bugfix on
+  0.2.8.1-alpha.
+
+  o Minor bugfixes (fallback directories, also in 0.2.8.7):
+- Avoid logging a NULL string pointer when loading fallback
+  directory information. Fixes bug 19947; bugfix on 0.2.4.7-alpha
+  and 0.2.8.1-alpha. Report and patch by "rubiate".
 
 
 Changes in version 0.2.9.1-alpha - 2016-08-08
diff --git a/changes/bug13953 b/changes/bug13953
index 42b013f..db25b28 100644
--- a/changes/bug13953
+++ b/changes/bug13953
@@ -1,3 +1,3 @@
-  o Minor bugfixes (config):
+  o Minor features (config):
 - Warn users when descriptor and port addresses are inconsistent.
   Mitigates bug 13953; patch by teor.
diff --git a/changes/bug19743 b/changes/bug19743
index 69d21af..8395a4b 100644
--- a/changes/bug19743
+++ b/changes/bug19743
@@ -1,4 +1,4 @@
   o Documentation:
 - Correct the IPv6 syntax in our documentation for the
-  VirtualAddrNetworkIPv6 torrc option. Fixes bug 19743.
+  VirtualAddrNetworkIPv6 torrc option. Closes ticket 19743.
 
diff --git a/changes/bug19903 b/changes/bug19903
deleted file mode 100644
index 33aa878..000
--- a/changes/bug19903
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-- Remove an inappropriate "inline" in tortls.c that was causing warnings
-  on older versions of GCC. Fixes bug 19903; 0.2.8.1-alpha.
-
diff --git a/changes/bug19947 b/changes/bug19947
deleted file mode 100644
index b9dce8b..000
--- a/changes/bug19947
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (fallback directories):
-- Avoid logging a NULL string pointer when loading fallback directory 
information.
-  Fixes bug 19947; bugfix on 0.2.4.7-alpha and 0.2.8.1-alpha.
-  Report and patch by "rubiate".
diff --git a/changes/bug8625 b/changes/bug8625
index 90bb3c6..b0a5196 100644
--- a/changes/bug8625
+++ b/changes/bug8625
@@ -1,4 +1,6 @@
-  o Bugfixes:
+   o Major bugfixes (directory downloads):
 - Avoid resetting download status for consensuses hourly, and add a
   SimulateDirDownloadFailures config option to test behavior when all
-  downloads from directory servers fail.  Fixes bug 8625.
+  downloads from directory servers fail.  Fixes bug 8625; bugfix on
+  0.2.0.9-alpha.
+
diff --git a/changes/geoip-august2016 b/changes/geoip-august2016
deleted file mode 100644
index 370ab64..000
--- a/changes/geoip-august2016
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-- Update geoip and geoip6 to the August 2 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/release-0.2.8] Start on an 0.2.8.7 changelog.

2016-08-23 Thread nickm

commit fa038ebb7b38ca237c6cf7e10b732e5ca8a1dffb
Author: Nick Mathewson 
Date:   Tue Aug 23 10:08:51 2016 -0400

Start on an 0.2.8.7 changelog.
---
 ChangeLog| 20 
 changes/bug19903 |  4 
 changes/bug19947 |  4 
 changes/geoip-august2016 |  4 
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9f0e002..2151173 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+Changes in version 0.2.8.7 - 2016-08-2?
+  Tor 0.2.8.7 fixes a few bugs still present in 0.2.8.6, and replaces a
+  retiring bridge authority. All bridges and bridge users are strongly
+  encouraged to upgrade.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the August 2 2016 Maxmind GeoLite2
+  Country database.
+
+  o Minor bugfixes (compilation):
+- Remove an inappropriate "inline" in tortls.c that was causing
+  warnings on older versions of GCC. Fixes bug 19903; bugfix
+  on 0.2.8.1-alpha.
+
+  o Minor bugfixes (fallback directories):
+- Avoid logging a NULL string pointer when loading fallback
+  directory information. Fixes bug 19947; bugfix on 0.2.4.7-alpha
+  and 0.2.8.1-alpha. Report and patch by "rubiate".
+
+
 Changes in version 0.2.8.6 - 2016-08-02
 
   Tor 0.2.8.6 is the first stable version of the Tor 0.2.8 series.
diff --git a/changes/bug19903 b/changes/bug19903
deleted file mode 100644
index 33aa878..000
--- a/changes/bug19903
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (compilation):
-- Remove an inappropriate "inline" in tortls.c that was causing warnings
-  on older versions of GCC. Fixes bug 19903; 0.2.8.1-alpha.
-
diff --git a/changes/bug19947 b/changes/bug19947
deleted file mode 100644
index b9dce8b..000
--- a/changes/bug19947
+++ /dev/null
@@ -1,4 +0,0 @@
- o Minor bugfixes (fallback directories):
-- Avoid logging a NULL string pointer when loading fallback directory 
information.
-  Fixes bug 19947; bugfix on 0.2.4.7-alpha and 0.2.8.1-alpha.
-  Report and patch by "rubiate".
diff --git a/changes/geoip-august2016 b/changes/geoip-august2016
deleted file mode 100644
index 370ab64..000
--- a/changes/geoip-august2016
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features:
-- Update geoip and geoip6 to the August 2 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] Prevents negative number of written bytes on error message.

2016-08-23 Thread nickm

commit 4f19f85eda9fa096fcca2b8ce34b1db0b757d4a7
Author: Daniel Pinto 
Date:   Tue Aug 16 17:12:18 2016 +0100

Prevents negative number of written bytes on error message.

Fixes #17758.
---
 src/or/microdesc.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/microdesc.c b/src/or/microdesc.c
index 130259a..a81dc54 100644
--- a/src/or/microdesc.c
+++ b/src/or/microdesc.c
@@ -108,6 +108,7 @@ dump_microdescriptor(int fd, microdesc_t *md, size_t 
*annotation_len_out)
   md->off = tor_fd_getpos(fd);
   written = write_all(fd, md->body, md->bodylen, 0);
   if (written != (ssize_t)md->bodylen) {
+written = written < 0 ? 0 : written;
 log_warn(LD_DIR,
  "Couldn't dump microdescriptor (wrote %ld out of %lu): %s",
  (long)written, (unsigned long)md->bodylen,



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

[tor-commits] [tor/master] Fix some comments in sandbox.c

2016-08-23 Thread nickm

commit 40d05983c4dd437dbaa4a99f90aefe4e1f1a64c3
Author: Nick Mathewson 
Date:   Tue Aug 23 10:02:11 2016 -0400

Fix some comments in sandbox.c

Closes ticket 19942; patch from "cypherpunks"
---
 src/common/sandbox.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/common/sandbox.c b/src/common/sandbox.c
index 42e40c6..37c1a94 100644
--- a/src/common/sandbox.c
+++ b/src/common/sandbox.c
@@ -838,7 +838,7 @@ sb_epoll_ctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
 }
 
 /**
- * Function responsible for setting up the fcntl64 syscall for
+ * Function responsible for setting up the prctl syscall for
  * the seccomp filter sandbox.
  *
  * NOTE: if multiple filters need to be added, the PR_SECCOMP parameter needs
@@ -859,7 +859,7 @@ sb_prctl(scmp_filter_ctx ctx, sandbox_cfg_t *filter)
 }
 
 /**
- * Function responsible for setting up the fcntl64 syscall for
+ * Function responsible for setting up the mprotect syscall for
  * the seccomp filter sandbox.
  *
  * NOTE: does not NEED to be here.. currently only occurs before filter; will

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

[tor-commits] [tor/master] changes file for bug 17758

2016-08-23 Thread nickm

commit 6ca87e393b284c3279f4a1bda7b10e1c5d603e50
Author: Nick Mathewson 
Date:   Tue Aug 23 10:00:54 2016 -0400

changes file for bug 17758
---
 changes/bug17758 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug17758 b/changes/bug17758
new file mode 100644
index 000..cd72d68
--- /dev/null
+++ b/changes/bug17758
@@ -0,0 +1,3 @@
+  o Minor bugfixes (logging):
+- Log a more accurate message when we fail to dump a microdescriptor.
+  Fixes bug 17758; bugfix on 0.2.2.8-alpha. Patch from Daniel Pinto.

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

[tor-commits] [tor/master] Merge remote-tracking branch 'jigsaw/fix-17758'

2016-08-23 Thread nickm

commit a0398dd3486b5e489b8e6db7490b9c24337161b0
Merge: ff65618 4f19f85
Author: Nick Mathewson 
Date:   Tue Aug 23 09:57:14 2016 -0400

Merge remote-tracking branch 'jigsaw/fix-17758'

 src/or/microdesc.c | 1 +
 1 file changed, 1 insertion(+)



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

[tor-commits] [tor/master] Fixes inconsistent version prefix in log messages.

2016-08-23 Thread nickm

commit 3d6ae798cf502d5b4ee08811a57b6c69c5de31eb
Author: Daniel Pinto 
Date:   Tue Aug 16 17:22:16 2016 +0100

Fixes inconsistent version prefix in log messages.

Fixes #15381.
---
 src/or/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/main.c b/src/or/main.c
index 261118a..4dbd9a0 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2800,7 +2800,7 @@ tor_init(int argc, char *argv[])
   {
 const char *version = get_version();
 
-log_notice(LD_GENERAL, "Tor v%s running on %s with Libevent %s, "
+log_notice(LD_GENERAL, "Tor %s running on %s with Libevent %s, "
"OpenSSL %s and Zlib %s.", version,
get_uname(),
tor_libevent_get_version_str(),



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

[tor-commits] [tor/master] Merge remote-tracking branch 'jigsaw/fix-15381'

2016-08-23 Thread nickm

commit ff65618f16a1ae01b0d8267fa658b214581af524
Merge: e8d7953 3d6ae79
Author: Nick Mathewson 
Date:   Tue Aug 23 09:55:37 2016 -0400

Merge remote-tracking branch 'jigsaw/fix-15381'

 src/or/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
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 'bug13953_squashed'

2016-08-23 Thread nickm

commit bd45f7c6685f887ead3432104cea156cbcc3e3a6
Merge: a3d4196 a60ef72
Author: Nick Mathewson 
Date:   Tue Aug 23 09:22:04 2016 -0400

Merge branch 'bug13953_squashed'

 changes/bug13953 |   3 ++
 src/or/config.c  | 116 ++-
 src/or/config.h  |   6 +++
 src/or/router.c  |  81 ++
 4 files changed, 196 insertions(+), 10 deletions(-)

diff --cc src/or/config.c
index 941393a,2fd97de..6fb3614
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -7063,15 -7021,15 +7078,15 @@@ get_first_listener_addrport_string(int 
  int
  get_first_advertised_port_by_type_af(int listener_type, int address_family)
  {
+   if (address_family == AF_UNSPEC)
+ return 0;
 -  if (!configured_ports)
 -return 0;
 -  SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) {
++
 +  const smartlist_t *conf_ports = get_configured_ports();
 +  SMARTLIST_FOREACH_BEGIN(conf_ports, const port_cfg_t *, cfg) {
  if (cfg->type == listener_type &&
- !cfg->server_cfg.no_advertise &&
- (tor_addr_family(>addr) == address_family ||
-  tor_addr_family(>addr) == AF_UNSPEC)) {
-   if (tor_addr_family(>addr) != AF_UNSPEC ||
-   (address_family == AF_INET && !cfg->server_cfg.bind_ipv6_only) ||
-   (address_family == AF_INET6 && !cfg->server_cfg.bind_ipv4_only)) {
+ !cfg->server_cfg.no_advertise) {
+   if ((address_family == AF_INET && port_binds_ipv4(cfg)) ||
+   (address_family == AF_INET6 && port_binds_ipv6(cfg))) {
  return cfg->port;
}
  }



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

[tor-commits] [tor/master] Check parameters to router_check_descriptor_address_port_consistency

2016-08-23 Thread nickm

commit 4b4389280e397e4c79c0ceea97094d8593419d7b
Author: teor 
Date:   Tue Aug 16 14:39:46 2016 +1000

Check parameters to router_check_descriptor_address_port_consistency
---
 src/or/router.c | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/or/router.c b/src/or/router.c
index db800b8..8fed36c 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1903,7 +1903,10 @@ static void
 router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr,
  int listener_type)
 {
-  /* The first configured Port, which may be the magic constant CFG_AUTO_PORT.
+  assert(listener_type == CONN_TYPE_OR_LISTENER ||
+ listener_type == CONN_TYPE_DIR_LISTENER);
+
+  /* The first advertised Port may be the magic constant CFG_AUTO_PORT.
*/
   int port_v4_cfg = get_first_advertised_port_by_type_af(listener_type,
  AF_INET);
@@ -1913,6 +1916,10 @@ 
router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr,
 const tor_addr_t *port_addr = get_first_advertised_addr_by_type_af(
 listener_type,
 AF_INET);
+/* If we're building a descriptor with no advertised address,
+ * something is terribly wrong. */
+assert(port_addr);
+
 tor_addr_t desc_addr;
 char port_addr_str[TOR_ADDR_BUF_LEN];
 char desc_addr_str[TOR_ADDR_BUF_LEN];



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

[tor-commits] [tor/master] Use tor_assert, not assert.

2016-08-23 Thread nickm

commit e8d7953c611200835d4011b12e210e878f0d13fd
Author: Nick Mathewson 
Date:   Tue Aug 23 09:24:20 2016 -0400

Use tor_assert, not assert.
---
 src/or/router.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/or/router.c b/src/or/router.c
index 40aae29..e9961d4 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1970,8 +1970,8 @@ static void
 router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr,
  int listener_type)
 {
-  assert(listener_type == CONN_TYPE_OR_LISTENER ||
- listener_type == CONN_TYPE_DIR_LISTENER);
+  tor_assert(listener_type == CONN_TYPE_OR_LISTENER ||
+ listener_type == CONN_TYPE_DIR_LISTENER);
 
   /* The first advertised Port may be the magic constant CFG_AUTO_PORT.
*/
@@ -1985,7 +1985,7 @@ router_check_descriptor_address_port_consistency(uint32_t 
ipv4h_desc_addr,
 AF_INET);
 /* If we're building a descriptor with no advertised address,
  * something is terribly wrong. */
-assert(port_addr);
+tor_assert(port_addr);
 
 tor_addr_t desc_addr;
 char port_addr_str[TOR_ADDR_BUF_LEN];

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

[tor-commits] [tor/master] Reword the router_check_descriptor_address_port_consistency log message

2016-08-23 Thread nickm

commit a60ef723450672740eb2d5b0801af78704b77236
Author: teor 
Date:   Tue Aug 16 14:40:16 2016 +1000

Reword the router_check_descriptor_address_port_consistency log message

The new message covers static and dynamic public IPv4 addresses,
and external / internal addresses in NAT setups.
---
 src/or/router.c | 22 ++
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/or/router.c b/src/or/router.c
index 8fed36c..acb5bc1 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1929,18 +1929,16 @@ 
router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr,
 tor_addr_from_ipv4h(_addr, ipv4h_desc_addr);
 tor_addr_to_str(desc_addr_str, _addr, TOR_ADDR_BUF_LEN, 0);
 
-log_warn(LD_CONFIG, "The configured IPv4 %sPort address %s does not "
- "match the address %s in the descriptor. Please configure "
- "the matching IPv4 addresses for this Tor relay as "
- "Address  in the torrc configuration file if "
- "you have multiple public IP addresses. If you are behind a "
- "NAT and have the right ports forwarded, you can ignore this "
- "warning or, to remove it, use 2 %sPort lines with options "
- "NoListen (for the public IPv4 address line) and NoAdvertise "
- "(for the internal NAT IPv4 address line).",
- listener_type ? "OR" : "Dir",
- port_addr_str, desc_addr_str,
- listener_type ? "OR" : "Dir");
+const char *listener_str = (listener_type == CONN_TYPE_OR_LISTENER ?
+"OR" : "Dir");
+log_warn(LD_CONFIG, "The IPv4 %sPort address %s does not match the "
+ "descriptor address %s. If you have a static public IPv4 "
+ "address, use 'Address ' and 'OutboundBindAddress "
+ "'. If you are behind a NAT, use two %sPort lines: "
+ "'%sPort  NoListen' and '%sPort  "
+ "NoAdvertise'.",
+ listener_str, port_addr_str, desc_addr_str, listener_str,
+ listener_str, listener_str);
   }
 }
 



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

[tor-commits] [tor/master] Make log message clearer

2016-08-23 Thread nickm

commit 4d2b3164ec922916d01d6772ef86b7041e7c7d78
Author: s7r 
Date:   Mon Aug 15 09:50:10 2016 +

Make log message clearer

Longer and more explicit log message so we don't confuse users with behind 
NAT with working configurations and state that public IP addresses only should 
be provided with "Address", won't work with internal addresses.
---
 src/or/router.c | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/or/router.c b/src/or/router.c
index d48bd05..c6bbafb 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1947,8 +1947,13 @@ router_check_descriptor_address_consistency(uint32_t 
ipv4h_desc_addr)
 
   log_warn(LD_CONFIG, "The configured IPv4 ORPort address %s does not "
"match the address %s in the descriptor. Please configure "
-   "matching IPv4 addresses for the Address and ORPort options. "
-   "Use NoListen on the ORPort if you are behind a NAT.",
+   "the matching IPv4 addresses for this Tor relay as "
+   "Address  in the torrc configuration file if "
+   "you have multiple public IP addresses. If you are behind a "
+   "NAT and have the right ports forwarded, you can ignore this "
+   "warning or, to remove it, use 2 ORPort lines with options "
+   "NoListen (for the public IPv4 address line) and NoAdvertise "
+   "(for the internal NAT IPv4 address line).",
port_addr_str, desc_addr_str);
 }
 
@@ -1969,8 +1974,13 @@ router_check_descriptor_address_consistency(uint32_t 
ipv4h_desc_addr)
 
   log_warn(LD_CONFIG, "The configured IPv4 DirPort address %s does not "
"match the address %s in the descriptor. Please configure "
-   "matching IPv4 addresses for the Address and DirPort options. "
-   "Use NoListen on the DirPort if you are behind a NAT.",
+   "the matching IPv4 addresses for this Tor relay as "
+   "Address  in the torrc configuration file if "
+   "you have multiple public IP addresses. If you are behind a "
+   "NAT and have the right ports forwarded, you can ignore this "
+   "warning or, to remove it, use 2 DirPort lines with options "
+   "NoListen (for the public IPv4 address line) and NoAdvertise "
+   "(for the internal NAT IPv4 address line).",
port_addr_str, desc_addr_str);
 }
 }



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

[tor-commits] [tor/master] Refactor duplicate code in config.c into port_binds_ipv4/6

2016-08-23 Thread nickm

commit faec7956a96b143f8ba7192e7ff2a996469935e0
Author: teor (Tim Wilson-Brown) 
Date:   Sat May 7 10:17:46 2016 -0700

Refactor duplicate code in config.c into port_binds_ipv4/6

No behavioural change

Preserves and documents behaviour when passed AF_UNSPEC.
---
 src/or/config.c | 34 --
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 2e14ba6..7ca9277 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6841,6 +6841,22 @@ parse_ports(or_options_t *options, int validate_only,
   return retval;
 }
 
+/* Does port bind to IPv4? */
+static int port_binds_ipv4(const port_cfg_t *port)
+{
+  return tor_addr_family(>addr) == AF_INET ||
+ (tor_addr_family(>addr) == AF_UNSPEC
+  && !port->server_cfg.bind_ipv6_only);
+}
+
+/* Does port bind to IPv6? */
+static int port_binds_ipv6(const port_cfg_t *port)
+{
+  return tor_addr_family(>addr) == AF_INET6 ||
+ (tor_addr_family(>addr) == AF_UNSPEC
+  && !port->server_cfg.bind_ipv4_only);
+}
+
 /** Given a list of port_cfg_t in ports, check them for internal
  * consistency and warn as appropriate.  Set *n_low_ports_out to the
  * number of sub-1024 ports we will be binding. */
@@ -6866,9 +6882,7 @@ check_server_ports(const smartlist_t *ports,
 } else if (port->type == CONN_TYPE_OR_LISTENER) {
   if (! port->server_cfg.no_advertise) {
 ++n_orport_advertised;
-if (tor_addr_family(>addr) == AF_INET ||
-(tor_addr_family(>addr) == AF_UNSPEC &&
-!port->server_cfg.bind_ipv6_only))
+if (port_binds_ipv4(port))
   ++n_orport_advertised_ipv4;
   }
   if (! port->server_cfg.no_listen)
@@ -7002,20 +7016,20 @@ get_first_listener_addrport_string(int listener_type)
 }
 
 /** Return the first advertised port of type listener_type in
-address_family.  */
+ * address_family. Returns 0 when no port is found, and when passed
+ * AF_UNSPEC. */
 int
 get_first_advertised_port_by_type_af(int listener_type, int address_family)
 {
+  if (address_family == AF_UNSPEC)
+return 0;
   if (!configured_ports)
 return 0;
   SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) {
 if (cfg->type == listener_type &&
-!cfg->server_cfg.no_advertise &&
-(tor_addr_family(>addr) == address_family ||
- tor_addr_family(>addr) == AF_UNSPEC)) {
-  if (tor_addr_family(>addr) != AF_UNSPEC ||
-  (address_family == AF_INET && !cfg->server_cfg.bind_ipv6_only) ||
-  (address_family == AF_INET6 && !cfg->server_cfg.bind_ipv4_only)) {
+!cfg->server_cfg.no_advertise) {
+  if ((address_family == AF_INET && port_binds_ipv4(cfg)) ||
+  (address_family == AF_INET6 && port_binds_ipv6(cfg))) {
 return cfg->port;
   }
 }



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

[tor-commits] [tor/master] Refactor duplicate code in router_check_descriptor_address_consistency

2016-08-23 Thread nickm

commit 427663428bf91dca0dfa2ede151cdb7eb9007408
Author: teor 
Date:   Tue Aug 16 14:05:46 2016 +1000

Refactor duplicate code in router_check_descriptor_address_consistency

No behaviour change
---
 src/or/router.c | 107 
 1 file changed, 45 insertions(+), 62 deletions(-)

diff --git a/src/or/router.c b/src/or/router.c
index c6bbafb..db800b8 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1896,6 +1896,47 @@ router_pick_published_address,(const or_options_t 
*options, uint32_t *addr))
   return 0;
 }
 
+/* Like router_check_descriptor_address_consistency, but specifically for the
+ * ORPort or DirPort.
+ * listener_type is either CONN_TYPE_OR_LISTENER or CONN_TYPE_DIR_LISTENER. */
+static void
+router_check_descriptor_address_port_consistency(uint32_t ipv4h_desc_addr,
+ int listener_type)
+{
+  /* The first configured Port, which may be the magic constant CFG_AUTO_PORT.
+   */
+  int port_v4_cfg = get_first_advertised_port_by_type_af(listener_type,
+ AF_INET);
+  if (port_v4_cfg != 0 &&
+  !port_exists_by_type_addr32h_port(listener_type,
+ipv4h_desc_addr, port_v4_cfg, 1)) {
+const tor_addr_t *port_addr = get_first_advertised_addr_by_type_af(
+listener_type,
+AF_INET);
+tor_addr_t desc_addr;
+char port_addr_str[TOR_ADDR_BUF_LEN];
+char desc_addr_str[TOR_ADDR_BUF_LEN];
+
+tor_addr_to_str(port_addr_str, port_addr, TOR_ADDR_BUF_LEN, 0);
+
+tor_addr_from_ipv4h(_addr, ipv4h_desc_addr);
+tor_addr_to_str(desc_addr_str, _addr, TOR_ADDR_BUF_LEN, 0);
+
+log_warn(LD_CONFIG, "The configured IPv4 %sPort address %s does not "
+ "match the address %s in the descriptor. Please configure "
+ "the matching IPv4 addresses for this Tor relay as "
+ "Address  in the torrc configuration file if "
+ "you have multiple public IP addresses. If you are behind a "
+ "NAT and have the right ports forwarded, you can ignore this "
+ "warning or, to remove it, use 2 %sPort lines with options "
+ "NoListen (for the public IPv4 address line) and NoAdvertise "
+ "(for the internal NAT IPv4 address line).",
+ listener_type ? "OR" : "Dir",
+ port_addr_str, desc_addr_str,
+ listener_type ? "OR" : "Dir");
+  }
+}
+
 /* Tor relays only have one IPv4 address in the descriptor, which is derived
  * from the Address torrc option, or guessed using various methods in
  * router_pick_published_address().
@@ -1921,68 +1962,10 @@ router_pick_published_address,(const or_options_t 
*options, uint32_t *addr))
 static void
 router_check_descriptor_address_consistency(uint32_t ipv4h_desc_addr)
 {
-
-  /* The first configured ORPort and DirPort, which may be CFG_AUTO_PORT. */
-  int orport_v4_cfg = get_first_advertised_port_by_type_af(
-CONN_TYPE_OR_LISTENER,
-AF_INET);
-  int dirport_v4_cfg = get_first_advertised_port_by_type_af(
-CONN_TYPE_DIR_LISTENER,
-AF_INET);
-
-  if (orport_v4_cfg != 0 &&
-  !port_exists_by_type_addr32h_port(CONN_TYPE_OR_LISTENER,
-ipv4h_desc_addr, orport_v4_cfg, 1)) {
-  const tor_addr_t *port_addr = get_first_advertised_addr_by_type_af(
-CONN_TYPE_OR_LISTENER,
-AF_INET);
-  tor_addr_t desc_addr;
-  char port_addr_str[TOR_ADDR_BUF_LEN];
-  char desc_addr_str[TOR_ADDR_BUF_LEN];
-
-  tor_addr_to_str(port_addr_str, port_addr, TOR_ADDR_BUF_LEN, 0);
-
-  tor_addr_from_ipv4h(_addr, ipv4h_desc_addr);
-  tor_addr_to_str(desc_addr_str, _addr, TOR_ADDR_BUF_LEN, 0);
-
-  log_warn(LD_CONFIG, "The configured IPv4 ORPort address %s does not "
-   "match the address %s in the descriptor. Please configure "
-   "the matching IPv4 addresses for this Tor relay as "
-   "Address  in the torrc configuration file if "
-   "you have multiple public IP addresses. If you are behind a "
-   "NAT and have the right ports forwarded, you can ignore this "
-   "warning or, to remove it, use 2 ORPort lines with options "
-   "NoListen (for the public IPv4 address line) and NoAdvertise "
-   "(for the internal NAT IPv4 address line).",
-

[tor-commits] [tor/master] Warn users when addresses in ports and descriptor are inconsistent

2016-08-23 Thread nickm

commit c75bf388b5fc3555dd21d44b7856358f771292a4
Author: teor (Tim Wilson-Brown) 
Date:   Sat May 7 10:18:52 2016 -0700

Warn users when addresses in ports and descriptor are inconsistent

This mitigates bug 13953.
---
 changes/bug13953 |  3 ++
 src/or/config.c  | 81 ++
 src/or/config.h  |  6 
 src/or/router.c  | 83 
 4 files changed, 173 insertions(+)

diff --git a/changes/bug13953 b/changes/bug13953
new file mode 100644
index 000..42b013f
--- /dev/null
+++ b/changes/bug13953
@@ -0,0 +1,3 @@
+  o Minor bugfixes (config):
+- Warn users when descriptor and port addresses are inconsistent.
+  Mitigates bug 13953; patch by teor.
diff --git a/src/or/config.c b/src/or/config.c
index 7ca9277..2fd97de 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -7037,6 +7037,87 @@ get_first_advertised_port_by_type_af(int listener_type, 
int address_family)
   return 0;
 }
 
+/** Return the first advertised address of type listener_type in
+ * address_family. Returns NULL if there is no advertised address,
+ * and when passed AF_UNSPEC. */
+const tor_addr_t *
+get_first_advertised_addr_by_type_af(int listener_type, int address_family)
+{
+  if (address_family == AF_UNSPEC)
+return NULL;
+  if (!configured_ports)
+return NULL;
+  SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) {
+if (cfg->type == listener_type &&
+!cfg->server_cfg.no_advertise) {
+  if ((address_family == AF_INET && port_binds_ipv4(cfg)) ||
+  (address_family == AF_INET6 && port_binds_ipv6(cfg))) {
+return >addr;
+  }
+}
+  } SMARTLIST_FOREACH_END(cfg);
+  return NULL;
+}
+
+/** Return 1 if a port exists of type listener_type on addr and
+ * port. If check_wildcard is true, INADDR[6]_ANY and AF_UNSPEC
+ * addresses match any address of the appropriate family; and port -1 matches
+ * any port.
+ * To match auto ports, pass CFG_PORT_AUTO. (Does not match on the actual
+ * automatically chosen listener ports.) */
+int
+port_exists_by_type_addr_port(int listener_type, const tor_addr_t *addr,
+  int port, int check_wildcard)
+{
+  if (!configured_ports || !addr)
+return 0;
+  SMARTLIST_FOREACH_BEGIN(configured_ports, const port_cfg_t *, cfg) {
+if (cfg->type == listener_type) {
+  if (cfg->port == port || (check_wildcard && port == -1)) {
+/* Exact match */
+if (tor_addr_eq(>addr, addr)) {
+  return 1;
+}
+/* Skip wildcard matches if we're not doing them */
+if (!check_wildcard) {
+  continue;
+}
+/* Wildcard matches IPv4 */
+const int cfg_v4 = port_binds_ipv4(cfg);
+const int cfg_any_v4 = tor_addr_is_null(>addr) && cfg_v4;
+const int addr_v4 = tor_addr_family(addr) == AF_INET ||
+tor_addr_family(addr) == AF_UNSPEC;
+const int addr_any_v4 = tor_addr_is_null(>addr) && addr_v4;
+if ((cfg_any_v4 && addr_v4) || (cfg_v4 && addr_any_v4)) {
+  return 1;
+}
+/* Wildcard matches IPv6 */
+const int cfg_v6 = port_binds_ipv6(cfg);
+const int cfg_any_v6 = tor_addr_is_null(>addr) && cfg_v6;
+const int addr_v6 = tor_addr_family(addr) == AF_INET6 ||
+tor_addr_family(addr) == AF_UNSPEC;
+const int addr_any_v6 = tor_addr_is_null(>addr) && addr_v6;
+if ((cfg_any_v6 && addr_v6) || (cfg_v6 && addr_any_v6)) {
+  return 1;
+}
+  }
+}
+  } SMARTLIST_FOREACH_END(cfg);
+  return 0;
+}
+
+/* Like port_exists_by_type_addr_port, but accepts a host-order IPv4 address
+ * instead. */
+int
+port_exists_by_type_addr32h_port(int listener_type, uint32_t addr_ipv4h,
+ int port, int check_wildcard)
+{
+  tor_addr_t ipv4;
+  tor_addr_from_ipv4h(, addr_ipv4h);
+  return port_exists_by_type_addr_port(listener_type, , port,
+   check_wildcard);
+}
+
 /** Adjust the value of options->DataDirectory, or fill it in if it's
  * absent. Return 0 on success, -1 on failure. */
 static int
diff --git a/src/or/config.h b/src/or/config.h
index 02121cf..168e7d9 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -87,6 +87,12 @@ int get_first_advertised_port_by_type_af(int listener_type,
   (get_first_advertised_port_by_type_af(CONN_TYPE_OR_LISTENER, AF_INET))
 #define get_primary_dir_port() \
   (get_first_advertised_port_by_type_af(CONN_TYPE_DIR_LISTENER, AF_INET))
+const tor_addr_t *get_first_advertised_addr_by_type_af(int listener_type,
+   int address_family);
+int port_exists_by_type_addr_port(int listener_type, const tor_addr_t *addr,
+  int port, int check_wildcard);
+int port_exists_by_type_addr32h_port(int listener_type, uint32_t addr_ipv4h,
+

[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug19872_v2'

2016-08-23 Thread nickm

commit a3d419634bef0bbac4118d08272d59c9fe66a1bb
Merge: b3f43a2 b8bfdf6
Author: Nick Mathewson 
Date:   Tue Aug 23 08:50:32 2016 -0400

Merge remote-tracking branch 'asn/bug19872_v2'

 src/common/crypto_ed25519.c | 95 +
 src/common/crypto_ed25519.h | 11 ++
 src/test/test_crypto.c  | 35 +
 3 files changed, 141 insertions(+)

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

[tor-commits] [tor/master] Introduce ed25519_{sign, checksig}_prefixed functions().

2016-08-23 Thread nickm

commit b8bfdf638e9448ecda9dda1a2c02d7bbf4778341
Author: George Kadianakis 
Date:   Tue Aug 23 14:53:01 2016 +0300

Introduce ed25519_{sign,checksig}_prefixed functions().
---
 src/common/crypto_ed25519.c | 95 +
 src/common/crypto_ed25519.h | 11 ++
 src/test/test_crypto.c  | 35 +
 3 files changed, 141 insertions(+)

diff --git a/src/common/crypto_ed25519.c b/src/common/crypto_ed25519.c
index 84c3eec..817c1a2 100644
--- a/src/common/crypto_ed25519.c
+++ b/src/common/crypto_ed25519.c
@@ -184,9 +184,43 @@ ed25519_keypair_generate(ed25519_keypair_t *keypair_out, 
int extra_strong)
   return 0;
 }
 
+/* Return a heap-allocated array that contains msg prefixed by the
+ * string prefix_str. Set final_msg_len_out to the size of the
+ * final array. If an error occured, return NULL. It's the resonsibility of the
+ * caller to free the returned array. */
+static uint8_t *
+get_prefixed_msg(const uint8_t *msg, size_t msg_len,
+ const char *prefix_str,
+ size_t *final_msg_len_out)
+{
+  size_t prefixed_msg_len, prefix_len;
+  uint8_t *prefixed_msg;
+
+  tor_assert(prefix_str);
+  tor_assert(final_msg_len_out);
+
+  prefix_len = strlen(prefix_str);
+
+  /* msg_len + strlen(prefix_str) must not overflow. */
+  if (msg_len > SIZE_T_CEILING - prefix_len) {
+return NULL;
+  }
+
+  prefixed_msg_len = msg_len + prefix_len;
+  prefixed_msg = tor_malloc_zero(prefixed_msg_len);
+
+  memcpy(prefixed_msg, prefix_str, prefix_len);
+  memcpy(prefixed_msg + prefix_len, msg, msg_len);
+
+  *final_msg_len_out = prefixed_msg_len;
+  return prefixed_msg;
+}
+
 /**
  * Set signature_out to a signature of the len-byte message
  * msg, using the secret and public key in keypair.
+ *
+ * Return 0 if we successfuly signed the message, otherwise return -1.
  */
 int
 ed25519_sign(ed25519_signature_t *signature_out,
@@ -203,6 +237,37 @@ ed25519_sign(ed25519_signature_t *signature_out,
 }
 
 /**
+ * Like ed25519_sign(), but also prefix msg with prefix_str
+ * before signing. prefix_str must be a NUL-terminated string.
+ */
+int
+ed25519_sign_prefixed(ed25519_signature_t *signature_out,
+  const uint8_t *msg, size_t msg_len,
+  const char *prefix_str,
+  const ed25519_keypair_t *keypair)
+{
+  int retval;
+  size_t prefixed_msg_len;
+  uint8_t *prefixed_msg;
+
+  tor_assert(prefix_str);
+
+  prefixed_msg = get_prefixed_msg(msg, msg_len, prefix_str,
+  _msg_len);
+  if (!prefixed_msg) {
+log_warn(LD_GENERAL, "Failed to get prefixed msg.");
+return -1;
+  }
+
+  retval = ed25519_sign(signature_out,
+prefixed_msg, prefixed_msg_len,
+keypair);
+  tor_free(prefixed_msg);
+
+  return retval;
+}
+
+/**
  * Check whether if signature is a valid signature for the
  * len-byte message in msg made with the key pubkey.
  *
@@ -217,6 +282,36 @@ ed25519_checksig(const ed25519_signature_t *signature,
 get_ed_impl()->open(signature->sig, msg, len, pubkey->pubkey) < 0 ? -1 : 0;
 }
 
+/**
+ * Like ed2519_checksig(), but also prefix msg with prefix_str
+ * before verifying signature. prefix_str must be a NUL-terminated
+ * string.
+ */
+int
+ed25519_checksig_prefixed(const ed25519_signature_t *signature,
+  const uint8_t *msg, size_t msg_len,
+  const char *prefix_str,
+  const ed25519_public_key_t *pubkey)
+{
+  int retval;
+  size_t prefixed_msg_len;
+  uint8_t *prefixed_msg;
+
+  prefixed_msg = get_prefixed_msg(msg, msg_len, prefix_str,
+  _msg_len);
+  if (!prefixed_msg) {
+log_warn(LD_GENERAL, "Failed to get prefixed msg.");
+return -1;
+  }
+
+  retval = ed25519_checksig(signature,
+prefixed_msg, prefixed_msg_len,
+pubkey);
+  tor_free(prefixed_msg);
+
+  return retval;
+}
+
 /** Validate every signature among those in checkable, which contains
  * exactly n_checkable elements.  If okay_out is non-NULL, set
  * the i'th element of okay_out to 1 if the i'th element of
diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h
index 44c2ad9..31afc49 100644
--- a/src/common/crypto_ed25519.h
+++ b/src/common/crypto_ed25519.h
@@ -55,6 +55,17 @@ int ed25519_checksig(const ed25519_signature_t *signature,
  const uint8_t *msg, size_t len,
  const ed25519_public_key_t *pubkey);
 
+int
+ed25519_sign_prefixed(ed25519_signature_t *signature_out,
+  const uint8_t *msg, size_t len,
+  const char *prefix_str,
+  const ed25519_keypair_t *keypair);
+int
+ed25519_checksig_prefixed(const ed25519_signature_t *signature,
+  const uint8_t *msg, size_t len,
+  const char

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

2016-08-23 Thread translation

commit cb0c834e5f88f1351a87faa1184a29e6ba669f40
Author: Translation commit bot 
Date:   Tue Aug 23 11:48:19 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 zh_TW/prefs.dtd | 17 +
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/zh_TW/prefs.dtd b/zh_TW/prefs.dtd
index d8dda2a..a8081ae 100644
--- a/zh_TW/prefs.dtd
+++ b/zh_TW/prefs.dtd
@@ -1,13 +1,22 @@
 
+
+
 
 
-
-
+
+
 
 
 
 
-
+
 
 
-
\ 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-08-23 Thread translation

commit c6b616c89079ed4a1b5746358fa6aca3347a96ea
Author: Translation commit bot 
Date:   Tue Aug 23 11:48:06 2016 +

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

diff --git a/zh_TW/prefs.dtd b/zh_TW/prefs.dtd
index 7e84ba2..a8081ae 100644
--- a/zh_TW/prefs.dtd
+++ b/zh_TW/prefs.dtd
@@ -3,20 +3,20 @@
 
 
 
-
-
+
+
 
 
 
 
-
+
 
 
 
-
-
-
-
-
-
-
\ 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_completed] Update translations for tor-messenger-ircproperties_completed

2016-08-23 Thread translation

commit 4f131b3f670050d8e1d18758f0394c5f4167d0c8
Author: Translation commit bot 
Date:   Tue Aug 23 11:47:53 2016 +

Update translations for tor-messenger-ircproperties_completed
---
 zh_TW/irc.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh_TW/irc.properties b/zh_TW/irc.properties
index c22cdb1..30887ef 100644
--- a/zh_TW/irc.properties
+++ b/zh_TW/irc.properties
@@ -11,8 +11,8 @@ irc.usernameHint=æ±ç¨±
 # LOCALIZATION NOTE (connection.error.*):
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
-connection.error.lost=å¤±å»äºèä¼ºæå¨çé£ç·
-connection.error.timeOut=é£ç·è¶æ
+connection.error.lost=èä¼ºæå¨çé£ç·ä¸æ·
+connection.error.timeOut=é£ç·é¾æ
 connection.error.invalidUsername=%S éåä½¿ç¨èåç¨±ä¸è½ä½¿ç¨
 connection.error.invalidPassword=ç¡æçä¼ºæå¨å¯ç¢¼
 connection.error.passwordRequired=éè¦å¯ç¢¼
@@ -28,10 +28,10 @@ joinChat.password=_å¯ç¢¼
 options.server=ä¼ºæå¨
 options.port=å 
 options.ssl=ä½¿ç¨ SSL
-options.encoding=åç¬¦é
+options.encoding=ååé
 options.quitMessage=é¢éè¨æ¯
 options.partMessage=é¢éè¨æ¯
-options.showServerTab=é¡¯ç¤ºä¼ºæå¨è¨æ¯
+options.showServerTab=é¡¯ç¤ºä¾èªä¼ºæå¨çè¨æ¯
 options.alternateNicks=åç¨æ±ç¨±
 
 # LOCALIZATION NOTE (ctcp.version):

___
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-08-23 Thread translation

commit 85b56a4cea5cddcf4823bf3a5f07d509223ee6fc
Author: Translation commit bot 
Date:   Tue Aug 23 11:47:49 2016 +

Update translations for tor-messenger-ircproperties
---
 zh_TW/irc.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/zh_TW/irc.properties b/zh_TW/irc.properties
index c22cdb1..30887ef 100644
--- a/zh_TW/irc.properties
+++ b/zh_TW/irc.properties
@@ -11,8 +11,8 @@ irc.usernameHint=æ±ç¨±
 # LOCALIZATION NOTE (connection.error.*):
 #   These will show in the account manager if the account is
 #   disconnected because of an error.
-connection.error.lost=å¤±å»äºèä¼ºæå¨çé£ç·
-connection.error.timeOut=é£ç·è¶æ
+connection.error.lost=èä¼ºæå¨çé£ç·ä¸æ·
+connection.error.timeOut=é£ç·é¾æ
 connection.error.invalidUsername=%S éåä½¿ç¨èåç¨±ä¸è½ä½¿ç¨
 connection.error.invalidPassword=ç¡æçä¼ºæå¨å¯ç¢¼
 connection.error.passwordRequired=éè¦å¯ç¢¼
@@ -28,10 +28,10 @@ joinChat.password=_å¯ç¢¼
 options.server=ä¼ºæå¨
 options.port=å 
 options.ssl=ä½¿ç¨ SSL
-options.encoding=åç¬¦é
+options.encoding=ååé
 options.quitMessage=é¢éè¨æ¯
 options.partMessage=é¢éè¨æ¯
-options.showServerTab=é¡¯ç¤ºä¼ºæå¨è¨æ¯
+options.showServerTab=é¡¯ç¤ºä¾èªä¼ºæå¨çè¨æ¯
 options.alternateNicks=åç¨æ±ç¨±
 
 # LOCALIZATION NOTE (ctcp.version):

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

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

2016-08-23 Thread translation

commit 3dbba16073248046244c84d72786c50969b50522
Author: Translation commit bot 
Date:   Tue Aug 23 11:46:29 2016 +

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

diff --git a/zh_TW/torbutton.properties b/zh_TW/torbutton.properties
index c1bc459..672951c 100644
--- a/zh_TW/torbutton.properties
+++ b/zh_TW/torbutton.properties
@@ -10,21 +10,21 @@ torbutton.panel.tooltip.disabled = 
æä¸ä¸ä»¥åç¨æ´è¥è·¯ç±
 torbutton.panel.tooltip.enabled = æä¸ä¸ä»¥åç¨æ´è¥è·¯ç±
 torbutton.panel.label.disabled = æ´è¥è·¯ç±å·²åç¨
 torbutton.panel.label.enabled = æ´è¥è·¯ç±å·²åç¨
-extensions.torbut...@torproject.org.description = Torbutton 
æä¾ä¸åæéä¾éç½®æ´è¥è·¯ç±è¨å®åå¿«éãè¼é¬å°æ¸
é¤ç§äººçè¦½è³æã
+extensions.torbut...@torproject.org.description = Torbutton 
æä¾ä¸åæéä¾è¨å®æ´è¥è·¯ç±ï¼ä»¥åè¼é¬ä¾¿æ·å°æ¸
é¤ç§äººçè¦½è³æã
 torbutton.popup.test.success = æ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦æåï¼
 torbutton.popup.test.failure = 
æ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦å¤±æï¼è«æª¢æ¥æ¨çä»£çä¼ºæå¨å 
Polipo çè¨å®ã
-torbutton.popup.test.confirm_toggle = 
æè¿çæ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦å¤±æï¼ç¡æ³ä½¿ç¨æ´è¥è·¯ç±ã\n\næ¨ç¢ºå®è¦åç¨åï¼\n\næ³¨æï¼è¥æ¨å·²è§£æ±ºåé¡ï¼æ¨å¯ä»¥å¨
 Torbutton 
ä»£çä¼ºæå¨åå¥½è¨å®è¦çªä¸éæ°å·è¡æ¸¬è©¦ï¼ä»¥ä¾¿æ¶é¤æ¤è¦åã
+torbutton.popup.test.confirm_toggle = 
åä¸æ¬¡çæ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦å¤±æï¼ç¡æ³ä½¿ç¨æ´è¥è·¯ç±ã\n\næ¨ç¢ºå®ä»è¦åç¨åï¼\n\næ³¨æï¼è¥æ¨å·²è§£æ±ºåé¡ï¼æ¨å¯ä»¥å¨
 Torbutton 
ä»£çä¼ºæå¨åå¥½è¨å®è¦çªä¸éæ°å·è¡æ¸¬è©¦ï¼ä»¥ä¾¿æ¶é¤æ¤è¦åè¨æ¯ã
 torbutton.popup.test.ff3_notice = 
æä¸ä¸ãç¢ºå®ãå¾éå§æ¸¬è©¦æ´è¥è·¯ç±ä»£çä¼ºæå¨è¨å®ãæ¤æ¸¬è©¦å°å¨èæ¯éä½ãè«èå¿çåã
 torbutton.popup.external.title = ä¸è¼å¤é¨æªæ¡é¡åï¼
-torbutton.popup.external.app = 
æ´è¥è·¯ç±çè¦½å¨ç¡æ³é¡¯ç¤ºéåæªæ¡ï¼æ¨å°éè¦ä½¿ç¨å
¶ä»æç¨ç¨å¼å°å®éåã\n\n
-torbutton.popup.external.note = 
æäºæªæ¡é¡åå¯è½æä½¿æç¨ç¨å¼ä¸ç¶éæ´è¥è·¯ç±èç´æ¥é£ä¸ç¶²éç¶²è·¯ã\n\n
+torbutton.popup.external.app = 
æ´è¥è·¯ç±çè¦½å¨ç¡æ³é¡¯ç¤ºéåæªæ¡ï¼æ¨éè¦ä½¿ç¨å
¶ä»æç¨ç¨å¼ä¾éåå®ã\n\n
+torbutton.popup.external.note = 
é¨ä»½é¡åçæªæ¡å¯è½æååæäºæç¨ç¨å¼ï¼ä¸¦ä¸å¨ä¸ç¶éæ´è¥è·¯ç±çæ
æ³ä¸ï¼ç´æ¥é£ä¸ç¶²éç¶²è·¯ã\n
 torbutton.popup.external.suggest = çºäºå®å
¨èµ·è¦ï¼æ¨æè©²åªå¨é¢ç·çæ
ææéåå·²ä¸è¼çæªæ¡ï¼ææ¯ä½¿ç¨å Tails ç Tor Live CD 
ä¹é¡çå·¥å·ã\n
 torbutton.popup.launch = ä¸è¼æªæ¡
 torbutton.popup.cancel = åæ¶
 torbutton.popup.dontask = å¾ç¾å¨éå§èªåä¸è¼æªæ¡
-torbutton.popup.test.no_http_proxy = 
æ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦ï¼ç¡æ³é£æ¥ä¸æ¬å°ç«¯ç HTTP 
ä»£çä¼ºæå¨ãPolipo å¯æ£å¸¸å·è¡å?
-torbutton.popup.prompted_language = çºäºçµ¦æ¨æ´å¤çé±ç§ï¼Torbutton 
å¯ä»¥è«æ±è±æçæ¬çç¶²é 
ãéå¯è½æå°è´åæ¬æè©²ä»¥æ¨çæ¯èªä¾é¡¯ç¤ºçç¶²é 
ï¼æ¹æä»¥è±æçé¡¯ç¤ºã\n\næ¨è¦ä½¿ç¨è±æç¶²é 
ä¾ç²å¾æ´å¥½çé±ç§åï¼
-torbutton.popup.no_newnym = Torbutton ä¸è½å®å¨å°çµ¦ä½ 
ä¸åæ°çèº«ä»½ãå®ç¡æ³åå æ´è¥è·¯ç±çæ§å¶é£æ¥å 
ã\n\næ¨ç®åæ£å¨å·è¡çæ¯æ´è¥è·¯ç±çè¦½å¨åï¼
+torbutton.popup.test.no_http_proxy = 
æ´è¥è·¯ç±ä»£çä¼ºæå¨æ¸¬è©¦ï¼ç¡æ³é£æ¥ä¸æ¬å°ç«¯ç HTTP 
ä»£çä¼ºæå¨ãè«ç¢ºèª Polipo æ¯å¦å·²åå?
+torbutton.popup.prompted_language = çºäºçµ¦æ¨æ´å¤çé±ç§ï¼Torbutton 
å¯ä»¥ç¼éè±æçç¶²é 
çè«æ±è¨èãéå¯è½æå°è´åæ¬æè©²ä»¥æ¨çæ¯èªä¾é¡¯ç¤ºçç¶²é
 ï¼æ¹æä»¥è±æçé¡¯ç¤ºã\n\næ¨è¦ä½¿ç¨è±æç¶²é 
ä¾ç²å¾æ´å¥½çé±ç§åï¼
+torbutton.popup.no_newnym = Torbutton ç¡æ³å®å¨å°çµ¦ä½ 
ä¸åæ°çèº«ä»½ãå®ç¡æ³ååæ´è¥è·¯ç±çæ§å¶é£æ¥å 
ã\n\næ¨ç®åæ£å¨å·è¡çæ¯æ´è¥è·¯ç±çè¦½å¨åï¼
 torbutton.popup.pref_error = Torbutton 
ç¡æ³æ´æ°æ´è¥è·¯ç±çè¦½å¨è¨å®æªç®éä¸çåå¥½è¨å®ã
 torbutton.popup.permission_denied = 
è«éæ°è¨å®æ´è¥è·¯ç±çè¦½å¨ç®éçä½¿ç¨æ¬éï¼æå°å
¶è¤è£½å°æ°çä½ç½®ã
 torbutton.popup.device_full = 
ç£ç¢ç©ºéå¯è½å·²æ»¿ãè«éæ¾ç©ºéæå°æ´è¥è·¯ç±çè¦½å¨ç§»è³æ°çè£ç½®ã

___
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-08-23 Thread translation

commit 64445ba51d0ef45a7405ae133a8ae7bcfc77611c
Author: Translation commit bot 
Date:   Tue Aug 23 11:18:05 2016 +

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

diff --git a/es/prefs.dtd b/es/prefs.dtd
index 0444d00..02bfede 100644
--- a/es/prefs.dtd
+++ b/es/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-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2016-08-23 Thread translation

commit e973c97768ff31ef6ddb181b67f2db8e94c85c56
Author: Translation commit bot 
Date:   Tue Aug 23 11:18:20 2016 +

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

diff --git a/es/prefs.dtd b/es/prefs.dtd
index 7e8c1fa..02bfede 100644
--- a/es/prefs.dtd
+++ b/es/prefs.dtd
@@ -1,5 +1,6 @@
 
 
+
 
 
 
@@ -11,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-08-23 Thread translation

commit db55368d8d4ce27acc421b00e1f6b85cdc89cf75
Author: Translation commit bot 
Date:   Tue Aug 23 09:48:05 2016 +

Update translations for tor-messenger-prefsdtd
---
 lt/prefs.dtd |  6 +++---
 nb/prefs.dtd | 12 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lt/prefs.dtd b/lt/prefs.dtd
index 86c1f93..ba8c8d3 100644
--- a/lt/prefs.dtd
+++ b/lt/prefs.dtd
@@ -13,9 +13,9 @@
 
 
 
-
-
-
+
+
+
 
 
 
diff --git a/nb/prefs.dtd b/nb/prefs.dtd
index 60852b0..c04d78b 100644
--- a/nb/prefs.dtd
+++ b/nb/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-prefsdtd_completed] Update translations for tor-messenger-prefsdtd_completed

2016-08-23 Thread translation

commit 1e733b0cfbd7c3fd118b2506f769d54ccbf8c349
Author: Translation commit bot 
Date:   Tue Aug 23 09:48:18 2016 +

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

diff --git a/nb/prefs.dtd b/nb/prefs.dtd
index 04f81f0..c04d78b 100644
--- a/nb/prefs.dtd
+++ b/nb/prefs.dtd
@@ -1,5 +1,6 @@
 
 
+
 
 
 
@@ -11,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_completed] Update translations for tor-messenger-prefsdtd_completed

2016-08-23 Thread translation

commit 7903bb3223e419dbd3005f8d4257f3801c61960b
Author: Translation commit bot 
Date:   Tue Aug 23 09:20:56 2016 +

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

diff --git a/en/prefs.dtd b/en/prefs.dtd
index cb930f3..2ae9c9c 100644
--- a/en/prefs.dtd
+++ b/en/prefs.dtd
@@ -1,5 +1,6 @@
 
 
+
 
 
 
@@ -11,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_completed] Update translations for tor-messenger-prefsdtd_completed

2016-08-23 Thread translation

commit e565721a2851b9761744a3e86e9cd81e87d7928e
Author: Translation commit bot 
Date:   Tue Aug 23 07:48:18 2016 +

Update translations for tor-messenger-prefsdtd_completed
---
 sv/prefs.dtd | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sv/prefs.dtd b/sv/prefs.dtd
index 7146fb0..0ace934 100644
--- a/sv/prefs.dtd
+++ b/sv/prefs.dtd
@@ -1,4 +1,5 @@
 
+
 
 
 
@@ -7,7 +8,7 @@
 
 
 
-
+
 
 
 
\ 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-08-23 Thread translation

commit 5f21aca895f3ae9f587000a6626f6d6b1cbdba44
Author: Translation commit bot 
Date:   Tue Aug 23 07:48:03 2016 +

Update translations for tor-messenger-prefsdtd
---
 sv/prefs.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sv/prefs.dtd b/sv/prefs.dtd
index 259d04a..0ace934 100644
--- a/sv/prefs.dtd
+++ b/sv/prefs.dtd
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
\ 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

47 matches

Mail list logo