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

2016-09-14 Thread translation 
commit 4285a9f67ab2a65de53ece0467f4d23dafe1f3d8
Author: Translation commit bot 
Date:   Thu Sep 15 00:16:35 2016 +

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

diff --git a/hu/torbutton.dtd b/hu/torbutton.dtd
index b408602..685caad 100644
--- a/hu/torbutton.dtd
+++ b/hu/torbutton.dtd
@@ -47,7 +47,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [trunnel/master] Add a stdlib.h which is apparently now needed somehow.

2016-09-14 Thread nickm 
commit 7894a2179d60a25ef47f7a012c99a8270fe5cfc4
Author: Nick Mathewson 
Date:   Wed Sep 14 16:40:49 2016 -0400

Add a stdlib.h which is apparently now needed somehow.
---
 lib/trunnel/data/trunnel-impl.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/trunnel/data/trunnel-impl.h b/lib/trunnel/data/trunnel-impl.h
index 98dce21..26b6f47 100644
--- a/lib/trunnel/data/trunnel-impl.h
+++ b/lib/trunnel/data/trunnel-impl.h
@@ -13,6 +13,7 @@
 #include "trunnel.h"
 #include 
 #include 
+#include 
 
 #if defined(_MSC_VER) && (_MSC_VER < 1600)
 #define uint8_t unsigned char

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

[tor-commits] [tor-browser-bundle/hardened-builds] Bug 19528: run get-moz-build-date before removing .git (fixup)

2016-09-14 Thread gk 
commit b79f5d274b2093758af6cf9a2076224c40295b1d
Author: Nicolas Vigier 
Date:   Wed Sep 14 17:11:38 2016 +0200

Bug 19528: run get-moz-build-date before removing .git (fixup)

Additionally, we make get-moz-build-date fail with an error if it was not
possible to get the year from git.
---
 gitian/build-helpers/get-moz-build-date   | 5 +
 gitian/descriptors/linux/gitian-firefox.yml   | 3 ++-
 gitian/descriptors/mac/gitian-firefox.yml | 3 ++-
 gitian/descriptors/windows/gitian-firefox.yml | 3 ++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gitian/build-helpers/get-moz-build-date 
b/gitian/build-helpers/get-moz-build-date
index 168a8c7..3dae232 100755
--- a/gitian/build-helpers/get-moz-build-date
+++ b/gitian/build-helpers/get-moz-build-date
@@ -4,6 +4,11 @@
 use strict;
 
 my ($year) = split('-', `git show -s --format='%ci'`);
+if ($? != 0) {
+print STDERR "Failed to get year from the git commit\n";
+print "exit 1\n";
+exit 1;
+}
 
 die "missing argument" unless @ARGV;
 my $version = $ARGV[0];
diff --git a/gitian/descriptors/linux/gitian-firefox.yml 
b/gitian/descriptors/linux/gitian-firefox.yml
index 89f68fa..dc02cba 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -85,6 +85,8 @@ script: |
 
   cd tor-browser
   mv .mozconfig-asan .mozconfig
+  # run get-moz-build-date before removing .git, which is used to get the year
+  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   # .git and the src takes up a lot of useless space, and we need the space to 
build
   rm -rf .git
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
@@ -93,7 +95,6 @@ script: |
   # Self-Rando wrapper
   export PATH="$HOME/build/selfrando/Tools/TorBrowser/tc-wrapper/:$PATH"
   export SELFRANDO_skip_shuffle=
-  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   make -f client.mk configure 
CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   # Without disabling LSan our build is blowing up:
diff --git a/gitian/descriptors/mac/gitian-firefox.yml 
b/gitian/descriptors/mac/gitian-firefox.yml
index fea3139..7a852c4 100644
--- a/gitian/descriptors/mac/gitian-firefox.yml
+++ b/gitian/descriptors/mac/gitian-firefox.yml
@@ -60,13 +60,14 @@ script: |
   TB_COMMIT_DATE=$(git show -s --format='%ci')
   COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*}
   mv .mozconfig-mac .mozconfig
+  # run get-moz-build-date before removing .git, which is used to get the year
+  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   # .git and the src takes up a lot of useless space, and we need the space to 
build
   #git archive HEAD | tar -x -C $OUTDIR/src
   rm -rf .git
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   rm -f configure
   rm -f js/src/configure
-  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   make -f client.mk configure 
CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   make $MAKEOPTS -f client.mk build
diff --git a/gitian/descriptors/windows/gitian-firefox.yml 
b/gitian/descriptors/windows/gitian-firefox.yml
index 788b053..cc7fdeb 100644
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@ -68,13 +68,14 @@ script: |
   # Our flags don't get passed to NSS. We need to do that manually using an
   # obscure one.
   export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec"
+  # run get-moz-build-date before removing .git, which is used to get the year
+  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   # .git and the src takes up a lot of useless space, and we need the space to 
build
   #git archive HEAD | tar -x -C $OUTDIR/src
   rm -rf .git
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   rm -f configure
   rm -f js/src/configure
-  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   make -f client.mk configure 
CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   #

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

[tor-commits] [tor-browser-bundle/master] Bug 19528: run get-moz-build-date before removing .git (fixup)

2016-09-14 Thread gk 
commit 02ff59eaeb1bea0ce00ee0223da9eab0ff69834d
Author: Nicolas Vigier 
Date:   Wed Sep 14 17:11:38 2016 +0200

Bug 19528: run get-moz-build-date before removing .git (fixup)

Additionally, we make get-moz-build-date fail with an error if it was not
possible to get the year from git.
---
 gitian/build-helpers/get-moz-build-date   | 5 +
 gitian/descriptors/linux/gitian-firefox.yml   | 3 ++-
 gitian/descriptors/mac/gitian-firefox.yml | 3 ++-
 gitian/descriptors/windows/gitian-firefox.yml | 3 ++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gitian/build-helpers/get-moz-build-date 
b/gitian/build-helpers/get-moz-build-date
index 168a8c7..3dae232 100755
--- a/gitian/build-helpers/get-moz-build-date
+++ b/gitian/build-helpers/get-moz-build-date
@@ -4,6 +4,11 @@
 use strict;
 
 my ($year) = split('-', `git show -s --format='%ci'`);
+if ($? != 0) {
+print STDERR "Failed to get year from the git commit\n";
+print "exit 1\n";
+exit 1;
+}
 
 die "missing argument" unless @ARGV;
 my $version = $ARGV[0];
diff --git a/gitian/descriptors/linux/gitian-firefox.yml 
b/gitian/descriptors/linux/gitian-firefox.yml
index 14799d6..79356a9 100644
--- a/gitian/descriptors/linux/gitian-firefox.yml
+++ b/gitian/descriptors/linux/gitian-firefox.yml
@@ -88,12 +88,13 @@ script: |
   mkdir -p $INSTDIR/Debug/Browser/browser/components
 
   cd tor-browser
+  # run get-moz-build-date before removing .git, which is used to get the year
+  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   # .git and the src takes up a lot of useless space, and we need the space to 
build
   rm -rf .git
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   rm -f configure
   rm -f js/src/configure
-  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   make -f client.mk configure 
CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   make $MAKEOPTS -f client.mk build
diff --git a/gitian/descriptors/mac/gitian-firefox.yml 
b/gitian/descriptors/mac/gitian-firefox.yml
index bd7d7f7..607a04c 100644
--- a/gitian/descriptors/mac/gitian-firefox.yml
+++ b/gitian/descriptors/mac/gitian-firefox.yml
@@ -43,13 +43,14 @@ script: |
   TB_COMMIT_DATE=$(git show -s --format='%ci')
   COPYRIGHT_YEAR=${TB_COMMIT_DATE%%-*}
   mv .mozconfig-mac .mozconfig
+  # run get-moz-build-date before removing .git, which is used to get the year
+  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   # .git and the src takes up a lot of useless space, and we need the space to 
build
   #git archive HEAD | tar -x -C $OUTDIR/src
   rm -rf .git
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   rm -f configure
   rm -f js/src/configure
-  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   make -f client.mk configure 
CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   make $MAKEOPTS -f client.mk build
diff --git a/gitian/descriptors/windows/gitian-firefox.yml 
b/gitian/descriptors/windows/gitian-firefox.yml
index 788b053..cc7fdeb 100644
--- a/gitian/descriptors/windows/gitian-firefox.yml
+++ b/gitian/descriptors/windows/gitian-firefox.yml
@@ -68,13 +68,14 @@ script: |
   # Our flags don't get passed to NSS. We need to do that manually using an
   # obscure one.
   export DLLFLAGS="-specs=/home/ubuntu/build/msvcr100.spec"
+  # run get-moz-build-date before removing .git, which is used to get the year
+  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   # .git and the src takes up a lot of useless space, and we need the space to 
build
   #git archive HEAD | tar -x -C $OUTDIR/src
   rm -rf .git
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   rm -f configure
   rm -f js/src/configure
-  eval $(~/build/get-moz-build-date $(cat browser/config/version.txt))
   make -f client.mk configure 
CONFIGURE_ARGS="--with-tor-browser-version=${TORBROWSER_VERSION} 
--enable-update-channel=${TORBROWSER_UPDATE_CHANNEL} --enable-bundled-fonts"
   find -type f -print0 | xargs -0 touch --date="$REFERENCE_DATETIME"
   #

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

[tor-commits] [tor/master] Ensure that dir1 and dir2 are freed at the end of poisoning test

2016-09-14 Thread nickm 
commit b08ddb60c9a2bfb133889a399d4e6d01af5a59d9
Author: Nick Mathewson 
Date:   Wed Sep 14 11:01:21 2016 -0400

Ensure that dir1 and dir2 are freed at the end of poisoning test

Found by coverity.
---
 src/test/test_hs.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/test_hs.c b/src/test/test_hs.c
index a9cd315..fd5ab15 100644
--- a/src/test/test_hs.c
+++ b/src/test/test_hs.c
@@ -568,6 +568,7 @@ test_single_onion_poisoning(void *arg)
 
   service_1->directory = dir1;
   service_2->directory = dir2;
+  dir1 = dir2 = NULL;
   smartlist_add(services, service_1);
   /* But don't add the second service yet. */
 
@@ -699,6 +700,8 @@ test_single_onion_poisoning(void *arg)
   smartlist_free(services);
   UNMOCK(get_options);
   tor_free(mock_options->DataDirectory);
+  tor_free(dir1);
+  tor_free(dir2);
 }
 
 struct testcase_t hs_tests[] = {

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

[tor-commits] [tor/master] Remove an extraneous parenthesis in IF_BUG_OHNCE__

2016-09-14 Thread nickm 
commit b88f918227bf888cf57095aa4c7072491738ac79
Author: Nick Mathewson 
Date:   Wed Sep 14 10:53:49 2016 -0400

Remove an extraneous parenthesis in IF_BUG_OHNCE__

Fixes bug 20141; bugfix on 0.2.9.1-alpha.

Patch from Gisle Vanem.
---
 changes/bug20141  | 4 
 src/common/util_bug.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug20141 b/changes/bug20141
new file mode 100644
index 000..99ecf0a
--- /dev/null
+++ b/changes/bug20141
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a syntax error in the IF_BUG_ONCE__() macro in non-
+  GCC-compatible compilers. Fixes bug 20141; bugfix on
+  0.2.9.1-alpha. Patch from Gisle Vanem.
diff --git a/src/common/util_bug.h b/src/common/util_bug.h
index 8b69a47..e027781 100644
--- a/src/common/util_bug.h
+++ b/src/common/util_bug.h
@@ -117,7 +117,7 @@
 #else
 #define IF_BUG_ONCE__(cond,var) \
   static int var = 0;   \
-  if (PREDICT_UNLIKELY(cond)) ? \
+  if (PREDICT_UNLIKELY(cond) ?  \
   (var ? 1 :\
(var=1,  \
 tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__, \

___
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 bogus memwipe length in rend_service_load_auth_keys().

2016-09-14 Thread nickm 
commit 425f5e6d40d756dabef4354fec562c6de2c56efd
Author: Nick Mathewson 
Date:   Wed Sep 14 10:58:00 2016 -0400

Fix a bogus memwipe length in rend_service_load_auth_keys().

Bugfix on a4f46ff8ba43b1e635bc5a8543b9354e6de02e14. Found by Coverity.
---
 src/or/rendservice.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 4f7d7aa..114a56b 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1490,7 +1490,7 @@ rend_service_load_auth_keys(rend_service_t *s, const char 
*hfname)
   strmap_free(parsed_clients, rend_authorized_client_strmap_item_free);
 
   if (cfname) {
-memwipe(cfname, 0, sizeof(cfname));
+memwipe(cfname, 0, strlen(cfname));
 tor_free(cfname);
   }
 

___
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-09-14 Thread translation 
commit b9318df49433f742ef763d339691a32b5477c05d
Author: Translation commit bot 
Date:   Wed Sep 14 14:46:33 2016 +

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

diff --git a/fr_CA/torbutton.dtd b/fr_CA/torbutton.dtd
index bac09ff..948577d 100644
--- a/fr_CA/torbutton.dtd
+++ b/fr_CA/torbutton.dtd
@@ -47,7 +47,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [torspec/master] Merge branch 'dgoulet_ticket19958_01'

2016-09-14 Thread nickm 
commit 86b9d2f1519155024b8402f521b1a7e649b4dfa5
Merge: c3162df 232a381
Author: Nick Mathewson 
Date:   Wed Sep 14 10:20:46 2016 -0400

Merge branch 'dgoulet_ticket19958_01'

 proposals/264-subprotocol-versions.txt | 51 +-
 1 file changed, 31 insertions(+), 20 deletions(-)

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

[tor-commits] [torspec/master] prop264: Break down more HS subprotocol versions

2016-09-14 Thread nickm 
commit ec90286c06f86d3896a062fff88387b5c001b16f
Author: David Goulet 
Date:   Tue Sep 13 10:35:39 2016 -0400

prop264: Break down more HS subprotocol versions

Signed-off-by: David Goulet 
---
 proposals/264-subprotocol-versions.txt | 47 --
 1 file changed, 33 insertions(+), 14 deletions(-)

diff --git a/proposals/264-subprotocol-versions.txt 
b/proposals/264-subprotocol-versions.txt
index e4357e5..04e07b8 100644
--- a/proposals/264-subprotocol-versions.txt
+++ b/proposals/264-subprotocol-versions.txt
@@ -198,31 +198,50 @@ Status: Open
  0.2.4.19.  Includes support for CREATE2 and CREATED2 and
  EXTEND2 and EXTENDED2.
 
-5.3. "HSMid"
+5.4. "HSIntro"
 
-   The "HSMid" protocols are those that handle introduction points and
-   rendezvous points.
+   The "HSIntro" protocol handles introduction points.
 
-  "1" -- supports all features in Tor 0.2.4.19
+  "0" -- supports all features in Tor 0.0.6. Deprecated in 0.2.2.1-alpha.
 
-5.4. "DirCache"
+  "1" -- supports picking rendezvous point by identity ID in Tor
+ 0.2.0.7-alpha.
 
-   The "DirCache" protocols are the set of documents available for
-   download from a directory cache via BEGIN_DIR, and the set of URLs
-   available to fetch them.  (This excludes URLs for hidden service
-   objects.)
+  "2" -- supports specifying rendezvous point's address, port and onion
+ key in Tor 0.2.0.7-alpha.
 
-  "1" -- supports all features in Tor 0.2.4.19.
+  "3" -- supports authentication as of proposal 121 in Tor
+ 0.2.1.6-alpha.
+
+5.5. "HSRend"
+
+   The "HSRend" protocol handles rendezvous points.
+
+  "1" -- supports all features in Tor 0.0.6.
+
+  "2" -- supports RENDEZVOUS2 cells of arbitrary length as long as they
+ have 20 bytes of cookie in Tor 0.2.9.1-alpha.
 
-5.5. "HSDir"
+5.6. "HSDir"
 
The HSDir protocols are the set of hidden service document types
that can be uploaded to, understood by, and downloaded from a tor
relay, and the set of URLs available to fetch them.
 
+  "0" -- supports all features in Tor 0.0.6. Deprecated in 0.2.2.1-alpha.
+
+  "2" -- supports all features in Tor 0.2.0.10-alpha.
+
+5.7. "DirCache"
+
+   The "DirCache" protocols are the set of documents available for
+   download from a directory cache via BEGIN_DIR, and the set of URLs
+   available to fetch them.  (This excludes URLs for hidden service
+   objects.)
+
   "1" -- supports all features in Tor 0.2.4.19.
 
-5.6. "Desc"
+5.8. "Desc"
 
Describes features present or absent in descriptors.
 
@@ -235,7 +254,7 @@ Status: Open
   "2" -- cross-signing with onion-keys, signing with ed25519
  identities.
 
-5.7. "Microdesc"
+5.9. "Microdesc"
 
Describes features present or absent in microdescriptors.
 
@@ -247,7 +266,7 @@ Status: Open
 
   "2" -- consensus method 21 (adds ed25519 keys to microdescs).
 
-5.8. "Cons"
+5.10. "Cons"
 
Describes features present or absent in consensus documents.
 



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

[tor-commits] [torspec/master] Remove subprotocol versions for everything obsolete.

2016-09-14 Thread nickm 
commit 232a381bdf97bc3ce474ae8cf9bb169a524814b9
Author: Nick Mathewson 
Date:   Tue Sep 13 11:13:22 2016 -0400

Remove subprotocol versions for everything obsolete.

   "Because all relays currently on the network are 0.2.4.19 or later, we
   can require 0.2.4.19, and use 0.2.4.19 as the minimal version so we
   we don't need to do code archaeology to determine how many
   no-longer-relevant versions of each protocol once existed."

Describe which versions of the HS* stuff we will require/recommend.

Also fix a spelling mistake.
---
 proposals/264-subprotocol-versions.txt | 24 
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/proposals/264-subprotocol-versions.txt 
b/proposals/264-subprotocol-versions.txt
index 04e07b8..7f8c4d4 100644
--- a/proposals/264-subprotocol-versions.txt
+++ b/proposals/264-subprotocol-versions.txt
@@ -202,14 +202,6 @@ Status: Open
 
The "HSIntro" protocol handles introduction points.
 
-  "0" -- supports all features in Tor 0.0.6. Deprecated in 0.2.2.1-alpha.
-
-  "1" -- supports picking rendezvous point by identity ID in Tor
- 0.2.0.7-alpha.
-
-  "2" -- supports specifying rendezvous point's address, port and onion
- key in Tor 0.2.0.7-alpha.
-
   "3" -- supports authentication as of proposal 121 in Tor
  0.2.1.6-alpha.
 
@@ -228,8 +220,6 @@ Status: Open
that can be uploaded to, understood by, and downloaded from a tor
relay, and the set of URLs available to fetch them.
 
-  "0" -- supports all features in Tor 0.0.6. Deprecated in 0.2.2.1-alpha.
-
   "2" -- supports all features in Tor 0.2.0.10-alpha.
 
 5.7. "DirCache"
@@ -299,7 +289,7 @@ Status: Open
 
Because all relays currently on the network are 0.2.4.19 or later, we
can require 0.2.4.19, and use 0.2.4.19 as the minimal version so we
-   we don't need to do code archeology to determine how many
+   we don't need to do code archaeology to determine how many
no-longer-relevant versions of each protocol once existed.
 
Adding new protocol types is pretty cheap, given compression.
@@ -323,16 +313,18 @@ A.1.  Inferring missing proto lines.
 
 A.2. Initial required protocols
 
-   For clients we will Recommend and Require these.  For relays, we will
-   Recommend these:
+   For clients we will Recommend and Require these.
 
-Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSMid=1 Link=4
+Cons=1-2 Desc=1-2 DirCache=1 HSDir=2 HSIntro=3 HSRend=1 Link=4
 LinkAuth=1 Microdesc=1-2 Relay=2
 
For relays we will Require:
 
-Cons=1 Desc=1 DirCache=1 HSDir=1 HSMid=1 Link=3-4
-LinkAuth=1 icrodesc=1 Relay=1-2
+Cons=1 Desc=1 DirCache=1 HSDir=2 HSIntro=3 HSRend=1 Link=3-4
+LinkAuth=1 Microdesc=1 Relay=1-2
+
+   For relays, we will additionally Recommend all protocols which we
+   recommend for clients.
 
 A.3. Example integration with other open proposals
 



___
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 'teor/feature20072'

2016-09-14 Thread nickm 
commit 8b7922b2829033d910a98a9d1a4e4ebf9d02d7b4
Merge: 4f4e995 16085a8
Author: Nick Mathewson 
Date:   Wed Sep 14 10:18:41 2016 -0400

Merge remote-tracking branch 'teor/feature20072'

 changes/feature20072 | 5 +
 src/test/include.am  | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/master] Add some chutney single onion networks to make test-network-all

2016-09-14 Thread nickm 
commit 16085a8421119cd2bb3aa022bd8ae3080fab4ae6
Author: teor 
Date:   Wed Sep 14 12:17:10 2016 +1000

Add some chutney single onion networks to make test-network-all

This requires a recent version of chutney, with the single onion
network flavours (git c72a652 or later).

Closes ticket #20072.
---
 changes/feature20072 | 5 +
 src/test/include.am  | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/feature20072 b/changes/feature20072
new file mode 100644
index 000..1afabca
--- /dev/null
+++ b/changes/feature20072
@@ -0,0 +1,5 @@
+  o Minor feature (testing, hidden services, ipv6):
+- Add the single-onion and single-onion-ipv6 chutney targets to
+  make test-network-all. This requires a recent chutney version
+  with the single onion network flavours (git c72a652 or later).
+  Closes ticket 20072; patch by teor.
diff --git a/src/test/include.am b/src/test/include.am
index 0aff395..5bcc969 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -28,9 +28,10 @@ TESTS += src/test/test src/test/test-slow 
src/test/test-memwipe \
$(TESTSCRIPTS)
 
 # These flavors are run using automake's test-driver and test-network.sh
-TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-min
+TEST_CHUTNEY_FLAVORS = basic-min bridges-min hs-min single-onion
 # only run if we can ping6 ::1 (localhost)
-TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-ipv6
+TEST_CHUTNEY_FLAVORS_IPV6 = bridges+ipv6-min ipv6-exit-min hs-ipv6 \
+   single-onion-ipv6
 # only run if we can find a stable (or simply another) version of tor
 TEST_CHUTNEY_FLAVORS_MIXED = mixed
 



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

2016-09-14 Thread nickm 
commit 4f4e995d4232e5c041011be4b087eb3332e70e21
Merge: b488bd5 20c4b01
Author: Nick Mathewson 
Date:   Wed Sep 14 10:17:04 2016 -0400

Merge branch 'bug20081'

 changes/bug20081|  5 +
 src/or/buffers.c|  5 -
 src/or/buffers.h|  1 +
 src/test/test_buffers.c | 22 ++
 4 files changed, 32 insertions(+), 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] Make preferred_chunk_size avoid overflow, handle big inputs better

2016-09-14 Thread nickm 
commit 20c4b0169493dae7624632dbca49758812138aeb
Author: Nick Mathewson 
Date:   Tue Sep 13 09:07:12 2016 -0400

Make preferred_chunk_size avoid overflow, handle big inputs better

Also, add tests for the function.

Closes 20081; bugfix on 0.2.0.16-alpha. This is a Guido Vranken
issue. Thanks, Guido!
---
 changes/bug20081|  5 +
 src/or/buffers.c|  5 -
 src/or/buffers.h|  1 +
 src/test/test_buffers.c | 22 ++
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/changes/bug20081 b/changes/bug20081
new file mode 100644
index 000..a95161c
--- /dev/null
+++ b/changes/bug20081
@@ -0,0 +1,5 @@
+  o Minor bugfixes (allocation):
+- Change how we allocate memory for large chunks on buffers, to avoid
+  a (currently impossible) integer overflow, and to waste less space
+  when allocating unusually large chunks. Fixes bug 20081; bugfix on
+  0.2.0.16-alpha. Issue identified by Guido Vranken.
diff --git a/src/or/buffers.c b/src/or/buffers.c
index 3198572..c08da63 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -166,9 +166,12 @@ chunk_grow(chunk_t *chunk, size_t sz)
 
 /** Return the allocation size we'd like to use to hold target
  * bytes. */
-static inline size_t
+STATIC size_t
 preferred_chunk_size(size_t target)
 {
+  tor_assert(target <= SIZE_T_CEILING - CHUNK_HEADER_LEN);
+  if (CHUNK_ALLOC_SIZE(target) >= MAX_CHUNK_ALLOC)
+return CHUNK_ALLOC_SIZE(target);
   size_t sz = MIN_CHUNK_ALLOC;
   while (CHUNK_SIZE_WITH_ALLOC(sz) < target) {
 sz <<= 1;
diff --git a/src/or/buffers.h b/src/or/buffers.h
index 275867c..52b21d5 100644
--- a/src/or/buffers.h
+++ b/src/or/buffers.h
@@ -65,6 +65,7 @@ void assert_buf_ok(buf_t *buf);
 STATIC int buf_find_string_offset(const buf_t *buf, const char *s, size_t n);
 STATIC void buf_pullup(buf_t *buf, size_t bytes);
 void buf_get_first_chunk_data(const buf_t *buf, const char **cp, size_t *sz);
+STATIC size_t preferred_chunk_size(size_t target);
 
 #define DEBUG_CHUNK_ALLOC
 /** A single chunk on a buffer. */
diff --git a/src/test/test_buffers.c b/src/test/test_buffers.c
index 971dd1d..3408da3 100644
--- a/src/test/test_buffers.c
+++ b/src/test/test_buffers.c
@@ -744,6 +744,27 @@ test_buffers_tls_read_mocked(void *arg)
   buf_free(buf);
 }
 
+static void
+test_buffers_chunk_size(void *arg)
+{
+  (void)arg;
+  const int min = 256;
+  const int max = 65536;
+  tt_uint_op(preferred_chunk_size(3), OP_EQ, min);
+  tt_uint_op(preferred_chunk_size(25), OP_EQ, min);
+  tt_uint_op(preferred_chunk_size(0), OP_EQ, min);
+  tt_uint_op(preferred_chunk_size(256), OP_EQ, 512);
+  tt_uint_op(preferred_chunk_size(65400), OP_EQ, max);
+  /* Here, we're implicitly saying that the chunk header overhead is
+   * between 1 and 100 bytes. 24..48 would probably be more accurate. */
+  tt_uint_op(preferred_chunk_size(65536), OP_GT, 65536);
+  tt_uint_op(preferred_chunk_size(65536), OP_LT, 65536+100);
+  tt_uint_op(preferred_chunk_size(165536), OP_GT, 165536);
+  tt_uint_op(preferred_chunk_size(165536), OP_LT, 165536+100);
+ done:
+  ;
+}
+
 struct testcase_t buffer_tests[] = {
   { "basic", test_buffers_basic, TT_FORK, NULL, NULL },
   { "copy", test_buffer_copy, TT_FORK, NULL, NULL },
@@ -758,6 +779,7 @@ struct testcase_t buffer_tests[] = {
 NULL, NULL},
   { "tls_read_mocked", test_buffers_tls_read_mocked, 0,
 NULL, NULL },
+  { "chunk_size", test_buffers_chunk_size, 0, NULL, NULL },
   END_OF_TESTCASES
 };
 



___
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-09-14 Thread translation 
commit 24024a84dfb91e605fd71c6a31c9093b498c9907
Author: Translation commit bot 
Date:   Wed Sep 14 14:16:36 2016 +

Update translations for torbutton-torbuttondtd
---
 de/torbutton.dtd| 4 ++--
 sk_SK/torbutton.dtd | 2 +-
 tr/torbutton.dtd| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/de/torbutton.dtd b/de/torbutton.dtd
index 9a5f811..f92595d 100644
--- a/de/torbutton.dtd
+++ b/de/torbutton.dtd
@@ -47,11 +47,11 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
diff --git a/sk_SK/torbutton.dtd b/sk_SK/torbutton.dtd
index 29df3c4..fa4a414 100644
--- a/sk_SK/torbutton.dtd
+++ b/sk_SK/torbutton.dtd
@@ -47,7 +47,7 @@
 
 
 
-
+
 
 
 
diff --git a/tr/torbutton.dtd b/tr/torbutton.dtd
index 4350d04..aade9cf 100644
--- a/tr/torbutton.dtd
+++ b/tr/torbutton.dtd
@@ -47,7 +47,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-09-14 Thread translation 
commit aae8bfda49a7ba629a9509637fcd2460494e1654
Author: Translation commit bot 
Date:   Wed Sep 14 13:46:34 2016 +

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

diff --git a/de/torbutton.dtd b/de/torbutton.dtd
index 511e274..9a5f811 100644
--- a/de/torbutton.dtd
+++ b/de/torbutton.dtd
@@ -1,17 +1,17 @@
 
 
 
-
-
+
+
 
-
+
 
-
+
 
-
+
 
 
-
+
 
 
 
@@ -24,33 +24,33 @@
 
 
 
-
+
 
 
 
 
-
+
 
 
-
-
+
+
 
 
 
 
-
+
 
 
 
 
 
 
-
+
 
 
-
-
-
+
+
+
 
 
 

___
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-09-14 Thread translation 
commit f482f1c97a32ee338bb8c1ffa5479e3f57069ff2
Author: Translation commit bot 
Date:   Wed Sep 14 13:16:34 2016 +

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

diff --git a/hr_HR/torbutton.properties b/hr_HR/torbutton.properties
index 934a3ba..e8f3649 100644
--- a/hr_HR/torbutton.properties
+++ b/hr_HR/torbutton.properties
@@ -21,7 +21,7 @@ torbutton.popup.dontask = Automatski preuzimaj datoteke od 
sad nadalje
 torbutton.popup.prompted_language = Da bi Vam dao više privatnosti, Torbutton 
može zatražiti verziju web stranice na engleskom jeziku. Ovo može 
prouzročiti da se stranice koje čitate na svom rodnom jeziku prikazuju na 
engleskom.\n\nŽelite li tražiti stranice na engleskom jeziku radi bolje 
privatnosti?
 torbutton.popup.no_newnym = Torbutton Vam ne može sigurno dati novi 
identitet. Nema pristup Tor upravljačkom portu.\n\nRadi li Vam Tor Browser 
Bundle?
 torbutton.title.prompt_torbrowser = Bitne Torbutton informacije
-torbutton.popup.prompt_torbrowser = Torbutton radi drugačije sad: ne možete 
ga ugasiti više.\n\nNapravili smo ovu promjenu jer nije sigurno koristit 
Torbutton u pregledniku koji se koristi za ne-Tor pregledavanje. Bilo je 
previše grešaka koje nismo mogli ispraviti na drugi način.\n\nAko želite 
nastaviti koristit Firefox normalno, trebali bi deinstalirati Torbutton i 
skinuti Paket Tor Preglednika. Postavke privatnosti Tor Preglednika su 
superiorne običnom Firefox-u, čak i kad se koristi s Torbutton-om.\n\nDa bi 
maknuli Torbutton, idite na Alati->Dodatci->Ekstenzije te stisnite gumb Ukloni 
pokraj Torbutton-a.
+torbutton.popup.prompt_torbrowser = Torbutton radi drugačije sad: ne možete 
ga ugasiti više.\n\nNapravili smo ovu promjenu jer nije sigurno koristit 
Torbutton u pregledniku koji se koristi za ne-Tor pregledavanje. Bilo je 
previše grešaka koje nismo mogli ispraviti na drugi način.\n\nAko želite 
nastaviti koristit Firefox normalno, trebali bi deinstalirati Torbutton i 
skinuti Tor Browser Bundle. Postavke privatnosti Tor preglednika su superiorne 
običnom Firefoxu, čak i kad se koristi s Torbuttonom.\n\nDa bi maknuli 
Torbutton, idite na Alati->Dodatci->Ekstenzije te stisnite gumb Ukloni pokraj 
Torbuttona.
 torbutton.popup.short_torbrowser = Važne Torbutton informacije!\n\nTorbutton 
je sad uvjek omogućen.\n\nStisnite Torbutton za više informacija.
 
 torbutton.popup.confirm_plugins = Priključci kao što je Flash mogu 
naštetiti Vašoj privatnosti i anonimnosti.\n\nTakođer mogu zaobići Tor da 
otkriju Vašu lokaciju i IP adresu.\n\nJeste li sigurni da želite osposobiti 
priključke?\n\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-properties] Update translations for tor-launcher-properties

2016-09-14 Thread translation 
commit c3c5692f88a66fd5756d5b1e96b2fe0a7f7263cc
Author: Translation commit bot 
Date:   Wed Sep 14 13:15:56 2016 +

Update translations for tor-launcher-properties
---
 hr_HR/torlauncher.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hr_HR/torlauncher.properties b/hr_HR/torlauncher.properties
index 7fcb260..175e7b4 100644
--- a/hr_HR/torlauncher.properties
+++ b/hr_HR/torlauncher.properties
@@ -5,10 +5,10 @@ torlauncher.error_title=Pokretač Tora
 
 torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga 
može doći zbog greške u Vašoj torrc datoteci, greške u Tor-u ili drugom 
programu u Vašem sustavu ili zbog neispravnog hardware-a. Dok ne popravite 
inicijalni problem i ponovno pokrenete Tor, Tor Browser se neće pokrenuti.
 torlauncher.tor_exited=Tor je neočekivano izašao. Ovo bi moglo biti zbog 
greške u samom Toru, drugog programa na Vašem sustavu ili neispravnog 
hardwarea. Dok ne pokrenete Tor ponovno, Tor Browser neće biti u mogućnosti 
pristupiti web stranicama. Ako problem ustraje, molimo Vas da pošaljete kopiju 
Vašeg Tor zapisa timu za podršku.
-torlauncher.tor_exited2=Ponovno pokretanje Tor-a neće zatvoriti Vaše kartice 
u pregledniku.
+torlauncher.tor_exited2=Ponovno pokretanje Tora neće zatvoriti Vaše kartice 
u pregledniku.
 torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov 
upravljački port.
 torlauncher.tor_failed_to_start=Tor se nije uspio pokrenuti.
-torlauncher.tor_control_failed=Preuzimanje kontrole nad Tor-om nije uspjelo.
+torlauncher.tor_control_failed=Preuzimanje kontrole nad Torom nije uspjelo.
 torlauncher.tor_bootstrap_failed=Tor nije uspio uspostaviti Tor mrežnu vezu.
 torlauncher.tor_bootstrap_failed_details=%1$S neuspjelo (%2$S).
 
@@ -41,11 +41,11 @@ torlauncher.forAssistance2=Za pomoć posjetite %S
 
 torlauncher.copiedNLogMessages=Kopiranje završeno. %S Tor zapisi su spremni 
za lijepljenje u uređivač teksta ili email poruku.
 
-torlauncher.bootstrapStatus.conn_dir=Spajanje na mapu releja
-torlauncher.bootstrapStatus.handshake_dir=Uspostavljanje Å¡ifrirane veze na 
mapu
+torlauncher.bootstrapStatus.conn_dir=Spajanje na direktorij releja
+torlauncher.bootstrapStatus.handshake_dir=Uspostavljanje enkriptirane veze na 
direktorij
 torlauncher.bootstrapStatus.requesting_status=Dohvaćanje statusa mreže
 torlauncher.bootstrapStatus.loading_status=Učitavanje statusa mreže
-torlauncher.bootstrapStatus.loading_keys=Učitavanje autoriteta certifikata 
+torlauncher.bootstrapStatus.loading_keys=Učitavanje certifikata autoriteta
 torlauncher.bootstrapStatus.requesting_descriptors=Zahtjevanje informacija o 
releju
 torlauncher.bootstrapStatus.loading_descriptors=Učitavanje informacija o 
releju
 torlauncher.bootstrapStatus.conn_or=Spajanje na Tor mrežu

___
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_completed] Update translations for tor-launcher-properties_completed

2016-09-14 Thread translation 
commit 129192ca176d165320d2661f81b938a810ddd695
Author: Translation commit bot 
Date:   Wed Sep 14 13:16:00 2016 +

Update translations for tor-launcher-properties_completed
---
 hr_HR/torlauncher.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/hr_HR/torlauncher.properties b/hr_HR/torlauncher.properties
index 7fcb260..175e7b4 100644
--- a/hr_HR/torlauncher.properties
+++ b/hr_HR/torlauncher.properties
@@ -5,10 +5,10 @@ torlauncher.error_title=Pokretač Tora
 
 torlauncher.tor_exited_during_startup=Tor je izašao usred pokretanja. Do toga 
može doći zbog greške u Vašoj torrc datoteci, greške u Tor-u ili drugom 
programu u Vašem sustavu ili zbog neispravnog hardware-a. Dok ne popravite 
inicijalni problem i ponovno pokrenete Tor, Tor Browser se neće pokrenuti.
 torlauncher.tor_exited=Tor je neočekivano izašao. Ovo bi moglo biti zbog 
greške u samom Toru, drugog programa na Vašem sustavu ili neispravnog 
hardwarea. Dok ne pokrenete Tor ponovno, Tor Browser neće biti u mogućnosti 
pristupiti web stranicama. Ako problem ustraje, molimo Vas da pošaljete kopiju 
Vašeg Tor zapisa timu za podršku.
-torlauncher.tor_exited2=Ponovno pokretanje Tor-a neće zatvoriti Vaše kartice 
u pregledniku.
+torlauncher.tor_exited2=Ponovno pokretanje Tora neće zatvoriti Vaše kartice 
u pregledniku.
 torlauncher.tor_controlconn_failed=Nije se moguće spojiti na Torov 
upravljački port.
 torlauncher.tor_failed_to_start=Tor se nije uspio pokrenuti.
-torlauncher.tor_control_failed=Preuzimanje kontrole nad Tor-om nije uspjelo.
+torlauncher.tor_control_failed=Preuzimanje kontrole nad Torom nije uspjelo.
 torlauncher.tor_bootstrap_failed=Tor nije uspio uspostaviti Tor mrežnu vezu.
 torlauncher.tor_bootstrap_failed_details=%1$S neuspjelo (%2$S).
 
@@ -41,11 +41,11 @@ torlauncher.forAssistance2=Za pomoć posjetite %S
 
 torlauncher.copiedNLogMessages=Kopiranje završeno. %S Tor zapisi su spremni 
za lijepljenje u uređivač teksta ili email poruku.
 
-torlauncher.bootstrapStatus.conn_dir=Spajanje na mapu releja
-torlauncher.bootstrapStatus.handshake_dir=Uspostavljanje Å¡ifrirane veze na 
mapu
+torlauncher.bootstrapStatus.conn_dir=Spajanje na direktorij releja
+torlauncher.bootstrapStatus.handshake_dir=Uspostavljanje enkriptirane veze na 
direktorij
 torlauncher.bootstrapStatus.requesting_status=Dohvaćanje statusa mreže
 torlauncher.bootstrapStatus.loading_status=Učitavanje statusa mreže
-torlauncher.bootstrapStatus.loading_keys=Učitavanje autoriteta certifikata 
+torlauncher.bootstrapStatus.loading_keys=Učitavanje certifikata autoriteta
 torlauncher.bootstrapStatus.requesting_descriptors=Zahtjevanje informacija o 
releju
 torlauncher.bootstrapStatus.loading_descriptors=Učitavanje informacija o 
releju
 torlauncher.bootstrapStatus.conn_or=Spajanje na Tor mrežu

___
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-09-14 Thread translation 
commit 331bc6cea14cc751a42d004dad4034fc00784ff3
Author: Translation commit bot 
Date:   Wed Sep 14 12:46:32 2016 +

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

diff --git a/hr_HR/torbutton.properties b/hr_HR/torbutton.properties
index 4f45d30..934a3ba 100644
--- a/hr_HR/torbutton.properties
+++ b/hr_HR/torbutton.properties
@@ -6,20 +6,20 @@ torbutton.circuit_display.relay = relej
 torbutton.circuit_display.tor_bridge = Most
 torbutton.circuit_display.unknown_country = Nepoznata država
 torbutton.content_sizer.margin_tooltip = Tor Preglednik dodaje ovu marginu 
kako bi učinio širinu i visinu Vašeg prozora manje uočljivom, te time 
smanjio mogućnost da Vas ljudi prate online.
-torbutton.panel.tooltip.disabled = Klikni za omogućenje Tora
-torbutton.panel.tooltip.enabled = Klikni za onemogućenje Tora
-torbutton.panel.label.disabled = Tor Onemogućen
-torbutton.panel.label.enabled = Tor Omogućen
-extensions.torbut...@torproject.org.description = Torbutton omogućuje gumb za 
konfiguraciju postavki Tor-a i brzo i lako brisanje privatnih podataka o 
pregledavanju.
+torbutton.panel.tooltip.disabled = Kliknite za omogućenje Tora
+torbutton.panel.tooltip.enabled = Kliknite za onemogućenje Tora
+torbutton.panel.label.disabled = Tor onemogućen
+torbutton.panel.label.enabled = Tor omogućen
+extensions.torbut...@torproject.org.description = Torbutton omogućuje gumb za 
konfiguraciju postavki Tora i brzo i lako brisanje privatnih podataka o 
pregledavanju.
 torbutton.popup.external.title = Preuzeti vanjsku vrstu datoteke?
 torbutton.popup.external.app = Tor preglednik ne može prikazati ovu datoteku. 
Morate ju otvoriti s drugom aplikacijom.\n\n
-torbutton.popup.external.note = Neke vrste datoteka mogu prouzročiti spajanje 
aplikacija na Internet bez korištenja Tor-a.\n\n
+torbutton.popup.external.note = Neke vrste datoteka mogu prouzročiti spajanje 
aplikacija na Internet bez korištenja Tora.\n\n
 torbutton.popup.external.suggest = Da bi bili sigurni, trebali bi otvoriti 
preuzete datoteke samo dok ste offline, ili koristite Živi Tor CD kao što je 
Tails.\n
 torbutton.popup.launch = Preuzmi datoteku
 torbutton.popup.cancel = Otkaži
 torbutton.popup.dontask = Automatski preuzimaj datoteke od sad nadalje
 torbutton.popup.prompted_language = Da bi Vam dao više privatnosti, Torbutton 
može zatražiti verziju web stranice na engleskom jeziku. Ovo može 
prouzročiti da se stranice koje čitate na svom rodnom jeziku prikazuju na 
engleskom.\n\nŽelite li tražiti stranice na engleskom jeziku radi bolje 
privatnosti?
-torbutton.popup.no_newnym = Torbutton Vam ne može sigurno dati novi 
identitet. Nema pristup Tor Upravljačkom Portu.\n\nRadi li Vam Paket Tor 
Preglednika?
+torbutton.popup.no_newnym = Torbutton Vam ne može sigurno dati novi 
identitet. Nema pristup Tor upravljačkom portu.\n\nRadi li Vam Tor Browser 
Bundle?
 torbutton.title.prompt_torbrowser = Bitne Torbutton informacije
 torbutton.popup.prompt_torbrowser = Torbutton radi drugačije sad: ne možete 
ga ugasiti više.\n\nNapravili smo ovu promjenu jer nije sigurno koristit 
Torbutton u pregledniku koji se koristi za ne-Tor pregledavanje. Bilo je 
previše grešaka koje nismo mogli ispraviti na drugi način.\n\nAko želite 
nastaviti koristit Firefox normalno, trebali bi deinstalirati Torbutton i 
skinuti Paket Tor Preglednika. Postavke privatnosti Tor Preglednika su 
superiorne običnom Firefox-u, čak i kad se koristi s Torbutton-om.\n\nDa bi 
maknuli Torbutton, idite na Alati->Dodatci->Ekstenzije te stisnite gumb Ukloni 
pokraj Torbutton-a.
 torbutton.popup.short_torbrowser = Važne Torbutton informacije!\n\nTorbutton 
je sad uvjek omogućen.\n\nStisnite Torbutton za više informacija.

___
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-09-14 Thread translation 
commit 847c066874ef034680b0cafc921d3eb427014ca8
Author: Translation commit bot 
Date:   Wed Sep 14 12:45:54 2016 +

Update translations for tor-launcher-properties
---
 hr_HR/torlauncher.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR/torlauncher.properties b/hr_HR/torlauncher.properties
index 3ee4105..7fcb260 100644
--- a/hr_HR/torlauncher.properties
+++ b/hr_HR/torlauncher.properties
@@ -22,8 +22,8 @@ torlauncher.failed_to_get_settings=Nije moguće dobaviti Tor 
postavke.\n\n%S
 torlauncher.failed_to_save_settings=Nije moguće spremiti Tor postavke.\n\n%S
 torlauncher.ensure_tor_is_running=Molimo osigurajte da je Tor pokrenut.
 
-torlauncher.error_proxy_addr_missing=Morate navesti i IP adresu ili ime 
računala i broj porta da biste konfigurirali Tor za korištenje proxyj-a za 
pristup Internetu.
-torlauncher.error_proxy_type_missing=Morate odabrati tip proxy-a.
+torlauncher.error_proxy_addr_missing=Morate navesti i IP adresu ili ime 
računala i broj porta da biste konfigurirali Tor za korištenje proxya za 
pristup Internetu.
+torlauncher.error_proxy_type_missing=Morate odabrati tip proxya.
 torlauncher.error_bridges_missing=Morate odrediti jedan ili više mostova.
 torlauncher.error_default_bridges_type_missing=Morate odabrati vrstu 
transporta za pružene mostove.
 torlauncher.error_bridge_bad_default_type=Nema dostupnih pruženih mostova 
koji imaju %S vrstu transporta. Molimo, prilagodite svoje postavke.

___
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_completed] Update translations for tor-launcher-properties_completed

2016-09-14 Thread translation 
commit 3fc00ff594438a383ffd1ba1c226c5b1ea89b81d
Author: Translation commit bot 
Date:   Wed Sep 14 12:45:57 2016 +

Update translations for tor-launcher-properties_completed
---
 hr_HR/torlauncher.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hr_HR/torlauncher.properties b/hr_HR/torlauncher.properties
index 3ee4105..7fcb260 100644
--- a/hr_HR/torlauncher.properties
+++ b/hr_HR/torlauncher.properties
@@ -22,8 +22,8 @@ torlauncher.failed_to_get_settings=Nije moguće dobaviti Tor 
postavke.\n\n%S
 torlauncher.failed_to_save_settings=Nije moguće spremiti Tor postavke.\n\n%S
 torlauncher.ensure_tor_is_running=Molimo osigurajte da je Tor pokrenut.
 
-torlauncher.error_proxy_addr_missing=Morate navesti i IP adresu ili ime 
računala i broj porta da biste konfigurirali Tor za korištenje proxyj-a za 
pristup Internetu.
-torlauncher.error_proxy_type_missing=Morate odabrati tip proxy-a.
+torlauncher.error_proxy_addr_missing=Morate navesti i IP adresu ili ime 
računala i broj porta da biste konfigurirali Tor za korištenje proxya za 
pristup Internetu.
+torlauncher.error_proxy_type_missing=Morate odabrati tip proxya.
 torlauncher.error_bridges_missing=Morate odrediti jedan ili više mostova.
 torlauncher.error_default_bridges_type_missing=Morate odabrati vrstu 
transporta za pružene mostove.
 torlauncher.error_bridge_bad_default_type=Nema dostupnih pruženih mostova 
koji imaju %S vrstu transporta. Molimo, prilagodite svoje postavke.

___
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-09-14 Thread translation 
commit 6957b57e4d78016fe9376077b2d050e5eaffd2a3
Author: Translation commit bot 
Date:   Wed Sep 14 12:16:33 2016 +

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

diff --git a/es/torbutton.dtd b/es/torbutton.dtd
index 6074146..8be5bf5 100644
--- a/es/torbutton.dtd
+++ b/es/torbutton.dtd
@@ -47,7 +47,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-09-14 Thread translation 
commit 0a4a37939d8eb17393bc3b01eb67dcb132757ab1
Author: Translation commit bot 
Date:   Wed Sep 14 11:18:09 2016 +

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

diff --git a/ar/prefs.dtd b/ar/prefs.dtd
index 30edbce..05e2d03 100644
--- a/ar/prefs.dtd
+++ b/ar/prefs.dtd
@@ -13,9 +13,9 @@
 
 
 
-
-
-
+
+
+
 
 
 

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

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

2016-09-14 Thread translation 
commit 1cdfab0227862a5f2550280eb2ee9b560c013078
Author: Translation commit bot 
Date:   Wed Sep 14 11:18:34 2016 +

Update translations for tails-onioncircuits
---
 ar/onioncircuits.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar/onioncircuits.pot b/ar/onioncircuits.pot
index b5c5e99..c170fcc 100644
--- a/ar/onioncircuits.pot
+++ b/ar/onioncircuits.pot
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-31 14:42+0200\n"
-"PO-Revision-Date: 2016-09-14 10:44+\n"
+"PO-Revision-Date: 2016-09-14 10:52+\n"
 "Last-Translator: crash x \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgstr ""
 
 #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594
 msgid "Unknown"
-msgstr ""
+msgstr "غير معروف"
 
 #: ../onioncircuits:607
 msgid "Fingerprint:"

___
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-09-14 Thread translation 
commit ee866e80189e73be3278e048565775c1877b74d8
Author: Translation commit bot 
Date:   Wed Sep 14 11:17:42 2016 +

Update translations for tor-messenger-fingerdtd
---
 ar/finger.dtd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ar/finger.dtd b/ar/finger.dtd
index 7cba6c0..cd77883 100644
--- a/ar/finger.dtd
+++ b/ar/finger.dtd
@@ -10,6 +10,6 @@
 
 
 
-
-
+
+
 
\ 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/https_everywhere] Update translations for https_everywhere

2016-09-14 Thread translation 
commit d141b9a7c33b9f885b4562d59b70085c0be147db
Author: Translation commit bot 
Date:   Wed Sep 14 11:15:22 2016 +

Update translations for https_everywhere
---
 ar/https-everywhere.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd
index 1573240..3c8605b 100644
--- a/ar/https-everywhere.dtd
+++ b/ar/https-everywhere.dtd
@@ -5,7 +5,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2016-09-14 Thread translation 
commit df1be408f6f6471e39ecfee07871a5296d3ee798
Author: Translation commit bot 
Date:   Wed Sep 14 11:15:51 2016 +

Update translations for mat-gui
---
 ar.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ar.po b/ar.po
index 0f6613c..7f5c7cb 100644
--- a/ar.po
+++ b/ar.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-02-10 23:06+0100\n"
-"PO-Revision-Date: 2016-04-01 18:06+\n"
+"PO-Revision-Date: 2016-09-14 10:52+\n"
 "Last-Translator: Fortas Abdeldjalil \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"

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

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

2016-09-14 Thread translation 
commit 8ed570dee8beeaf69ffed9afba9aa1bc19be3581
Author: Translation commit bot 
Date:   Wed Sep 14 10:48:30 2016 +

Update translations for tails-onioncircuits
---
 ar/onioncircuits.pot | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ar/onioncircuits.pot b/ar/onioncircuits.pot
index fe2c858..b5c5e99 100644
--- a/ar/onioncircuits.pot
+++ b/ar/onioncircuits.pot
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Ahmed Alhammadi <66222...@gmail.com>, 2016
+# crash x , 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-05-31 14:42+0200\n"
-"PO-Revision-Date: 2016-06-01 09:23+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2016-09-14 10:44+\n"
+"Last-Translator: crash x \n"
 "Language-Team: Arabic 
(http://www.transifex.com/otf/torproject/language/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: ../onioncircuits:81
 msgid "You are not connected to Tor yet..."
-msgstr ""
+msgstr "أنت لم ترتبط بتور بعد.."
 
 #: ../onioncircuits:95
 msgid "Onion Circuits"
@@ -40,16 +41,16 @@ msgstr ""
 
 #: ../onioncircuits:221
 msgid "The connection to Tor was lost..."
-msgstr ""
+msgstr "فقد الاتصال بتور"
 
 #: ../onioncircuits:317
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: ../onioncircuits:343
 #, c-format
 msgid "%s: %s"
-msgstr ""
+msgstr "%s: %s"
 
 #: ../onioncircuits:554
 msgid "GeoIP database unavailable. No country information will be displayed."

___
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-09-14 Thread translation 
commit e97fad8824d9d841d11f1683be059d5bb663687f
Author: Translation commit bot 
Date:   Wed Sep 14 08:47:52 2016 +

Update translations for torbutton-torbuttondtd
---
 ach/torbutton.dtd | 2 +-
 ady/torbutton.dtd | 2 +-
 af/torbutton.dtd  | 2 +-
 ak/torbutton.dtd  | 2 +-
 am/torbutton.dtd  | 2 +-
 ar/torbutton.dtd  | 2 +-
 arn/torbutton.dtd | 2 +-
 ast/torbutton.dtd | 2 +-
 az/torbutton.dtd  | 2 +-
 ba/torbutton.dtd  | 2 +-
 be/torbutton.dtd  | 2 +-
 bg/torbutton.dtd  | 2 +-
 bn/torbutton.dtd  | 2 +-
 bn_BD/torbutton.dtd   | 2 +-
 bn_IN/torbutton.dtd   | 2 +-
 bo/torbutton.dtd  | 2 +-
 br/torbutton.dtd  | 2 +-
 brx/torbutton.dtd | 2 +-
 bs/torbutton.dtd  | 2 +-
 ca/torbutton.dtd  | 2 +-
 ceb/torbutton.dtd | 2 +-
 cs/torbutton.dtd  | 2 +-
 csb/torbutton.dtd | 2 +-
 cv/torbutton.dtd  | 2 +-
 cy/torbutton.dtd  | 2 +-
 da/torbutton.dtd  | 2 +-
 de/torbutton.dtd  | 2 +-
 dz/torbutton.dtd  | 2 +-
 el/torbutton.dtd  | 2 +-
 en/torbutton.dtd  | 2 +-
 en_GB/torbutton.dtd   | 2 +-
 eo/torbutton.dtd  | 2 +-
 es/torbutton.dtd  | 2 +-
 es_AR/torbutton.dtd   | 2 +-
 es_CL/torbutton.dtd   | 2 +-
 es_CO/torbutton.dtd   | 2 +-
 es_MX/torbutton.dtd   | 2 +-
 et/torbutton.dtd  | 2 +-
 eu/torbutton.dtd  | 2 +-
 fa/torbutton.dtd  | 2 +-
 fi/torbutton.dtd  | 2 +-
 fil/torbutton.dtd | 2 +-
 fo/torbutton.dtd  | 2 +-
 fr/torbutton.dtd  | 2 +-
 fr_CA/torbutton.dtd   | 2 +-
 fur/torbutton.dtd | 2 +-
 fy/torbutton.dtd  | 2 +-
 ga/torbutton.dtd  | 2 +-
 gd/torbutton.dtd  | 2 +-
 gl/torbutton.dtd  | 2 +-
 gu/torbutton.dtd  | 2 +-
 gu_IN/torbutton.dtd   | 2 +-
 gun/torbutton.dtd | 2 +-
 ha/torbutton.dtd  | 2 +-
 he/torbutton.dtd  | 2 +-
 hi/torbutton.dtd  | 2 +-
 hr/torbutton.dtd  | 2 +-
 hr_HR/torbutton.dtd   | 2 +-
 ht/torbutton.dtd  | 2 +-
 hu/torbutton.dtd  | 2 +-
 hy/torbutton.dtd  | 2 +-
 ia/torbutton.dtd  | 2 +-
 id/torbutton.dtd  | 2 +-
 is/torbutton.dtd  | 2 +-
 it/torbutton.dtd  | 2 +-
 ja/torbutton.dtd  | 2 +-
 jv/torbutton.dtd  | 2 +-
 ka/torbutton.dtd  | 2 +-
 kk/torbutton.dtd  | 2 +-
 km/torbutton.dtd  | 2 +-
 kn/torbutton.dtd  | 2 +-
 ko/torbutton.dtd  | 2 +-
 ko_KR/torbutton.dtd   | 2 +-
 ku/torbutton.dtd  | 2 +-
 ku_IQ/torbutton.dtd   | 2 +-
 kw/torbutton.dtd  | 2 +-
 ky/torbutton.dtd  | 2 +-
 la/torbutton.dtd  | 2 +-
 lb/torbutton.dtd  | 2 +-
 lg/torbutton.dtd  | 2 +-
 ln/torbutton.dtd  | 2 +-
 lo/torbutton.dtd  | 2 +-
 lt/torbutton.dtd  | 2 +-
 lv/torbutton.dtd  | 2 +-
 mg/torbutton.dtd  | 2 +-
 mi/torbutton.dtd  | 2 +-
 mk/torbutton.dtd  | 2 +-
 ml/torbutton.dtd  | 2 +-
 mn/torbutton.dtd  | 2 +-
 mr/torbutton.dtd  | 2 +-
 ms_MY/torbutton.dtd   | 2 +-
 mt/torbutton.dtd  | 2 +-
 my/torbutton.dtd  | 2 +-
 nah/torbutton.dtd | 2 +-
 nap/torbutton.dtd | 2 +-
 nb/torbutton.dtd  | 2 +-
 nds/torbutton.dtd | 2 +-
 ne/torbutton.dtd  | 2 +-
 nl/torbutton.dtd  | 2 +-
 nl_BE/torbutton.dtd   | 2 +-
 nn/torbutton.dtd  | 2 +-
 nso/torbutton.dtd | 2 +-
 oc/torbutton.dtd  | 2 +-
 om/torbutton.dtd  | 2 +-
 or/torbutton.dtd  | 2 +-
 pa/torbutton.dtd  | 2 +-
 pap/torbutton.dtd | 2 +-
 pl/torbutton.dtd  | 2 +-
 pms/torbutton.dtd | 2 +-
 ps/torbutton.dtd  | 2 +-
 pt/torbutton.dtd  | 2 +-
 pt_BR/torbutton.dtd   | 2 +-
 ro/torbutton.dtd  | 2 +-
 ru/torbutton.dtd  | 2 +-
 ru@petr1708/torbutton.dtd | 2 +-
 scn/torbutton.dtd | 2 +-
 sco/torbutton.dtd | 2 +-
 si_LK/torbutton.dtd   | 2 +-
 sk/torbutton.dtd  | 2 +-
 sk_SK/torbutton.dtd   | 2 +-
 sl/torbutton.dtd  | 2 +-
 sl_SI/torbutton.dtd   | 2 +-
 sn/torbutton.dtd  | 2 +-
 so/torbutton.dtd  | 2 +-
 son/torbutton.dtd | 2 +-
 sq/torbutton.dtd  | 2 +-
 sr/torbutton.dtd  | 2 +-
 sr@latin/torbutton.dtd| 2 +-
 st/torbutton.dtd  | 2 +-
 su/torbutton.dtd  | 2 +-
 sv/torbutton.dtd  | 2 +-
 sw/torbutton.dtd  | 2 +-
 szl/torbutton.dtd | 2 +-
 ta/torbutton.dtd  | 2 +-
 te/torbutton.dtd  | 2 +-
 te_IN/torbutton.dtd   | 2 +-
 tg/torbutton.dtd  | 2 +-
 th/torbutton.dtd  | 2 +-
 ti/torbutton.dtd  | 2 +-
 tk/torbutton.dtd  | 2 +-
 tr/torbutton.dtd  | 2 +-