date:20190411

[tor-commits] [obfs4/master] Do the release ritual for obfs4proxy-0.0.10

2019-04-11 Thread yawning

commit f58291912a66c2e76007175401f552ec4576f255
Author: Yawning Angel 
Date:   Fri Apr 12 05:19:00 2019 +

Do the release ritual for obfs4proxy-0.0.10
---
 ChangeLog| 4 +++-
 obfs4proxy/obfs4proxy.go | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b5ee5c..068055a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Changes in version 0.0.10 - UNRELEASED:
+Changes in version 0.0.10 - 2019-04-12:
+ - Disable behavior distinctive to crypto/tls when using utls.
+ - Bump the version of the utls fork.
 
 Changes in version 0.0.9 - 2019-02-05:
  - Various meek_lite code cleanups and bug fixes.
diff --git a/obfs4proxy/obfs4proxy.go b/obfs4proxy/obfs4proxy.go
index 014f873..484955b 100644
--- a/obfs4proxy/obfs4proxy.go
+++ b/obfs4proxy/obfs4proxy.go
@@ -50,7 +50,7 @@ import (
 )
 
 const (
-   obfs4proxyVersion = "0.0.10-dev"
+   obfs4proxyVersion = "0.0.10"
obfs4proxyLogFile = "obfs4proxy.log"
socksAddr = "127.0.0.1:0"
 )

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

[tor-commits] [chutney/master] bootstrap-network: Log the flavour name that's actually being used

2019-04-11 Thread teor

commit b03e5a30b4255d1ac10ebb9015dcbcaf502d4720
Author: teor 
Date:   Mon Apr 8 08:30:53 2019 +1000

bootstrap-network: Log the flavour name that's actually being used

Part of 30058.
---
 tools/bootstrap-network.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh
index bea8cee..0aadb70 100755
--- a/tools/bootstrap-network.sh
+++ b/tools/bootstrap-network.sh
@@ -50,7 +50,7 @@ export 
CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR"
 
 "$CHUTNEY" stop "$CHUTNEY_NETWORK"
 
-echo "$myname: bootstrapping network: $flavour"
+echo "$myname: bootstrapping network: $NETWORK_FLAVOUR"
 "$CHUTNEY" configure "$CHUTNEY_NETWORK"
 
 "$CHUTNEY" start "$CHUTNEY_NETWORK"



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

[tor-commits] [chutney/master] Merge remote-tracking branch 'tor-github/pr/17'

2019-04-11 Thread teor

commit 113f415e3bd5bbc2bb3788555fe2566ba723b91c
Merge: 1941747 f6d4095
Author: teor 
Date:   Fri Apr 12 12:50:58 2019 +1000

Merge remote-tracking branch 'tor-github/pr/17'

 tools/bootstrap-network.sh | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

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

[tor-commits] [chutney/master] bootstrap-network: Actually use the first argument as the network flavour

2019-04-11 Thread teor

commit f6d409540a751008b788138daa037dd3289e2f12
Author: teor 
Date:   Mon Apr 8 08:31:59 2019 +1000

bootstrap-network: Actually use the first argument as the network flavour

Before these bug 30058 fixes, bootstrap-network.sh:
* Logged the first argument as the network flavour
  * default: basic (when there are no arguments)
* Passed $NETWORK_FLAVOUR to chutney as the network flavour

Now, bootstrap-network.sh:
* Uses the first argument as the network flavour
  * default: $NETWORK_FLAVOUR (when there are no arguments)
  * default: bridges+hs-v2 (when $NETWORK_FLAVOUR is not set)
* This default is the same as test-network.sh's default
* Logs the network flavour
* Passes the network flavour to chutney

Fixes bug 30058; bugfix on commit 822b30c8 in February 2017.
---
 tools/bootstrap-network.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh
index 0aadb70..75d1034 100755
--- a/tools/bootstrap-network.sh
+++ b/tools/bootstrap-network.sh
@@ -41,8 +41,10 @@ myname=$(basename "$0")
 { echo "$myname: missing chutney directory: $CHUTNEY_PATH"; exit 1; }
 [ -x "$CHUTNEY" ] || \
 { echo "$myname: missing chutney: $CHUTNEY"; exit 1; }
-flavour=basic; [ -n "$1" ] && { flavour=$1; shift; }
 
+# Set the variables for the chutney network flavour
+export NETWORK_FLAVOUR=${NETWORK_FLAVOUR:-"bridges+hs-v2"}
+[ -n "$1" ] && { NETWORK_FLAVOUR=$1; shift; }
 export CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR"
 
 [ -e "$CHUTNEY_NETWORK" ] || \



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

[tor-commits] [chutney/master] Merge remote-tracking branch 'tor-github/pr/19'

2019-04-11 Thread teor

commit 81265144939d2f620d36827970e96115d725dd04
Merge: cdd4389 86fb60a
Author: teor 
Date:   Fri Apr 12 12:39:35 2019 +1000

Merge remote-tracking branch 'tor-github/pr/19'

 tools/test-network-impl.sh | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)



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

[tor-commits] [chutney/master] shellcheck: Disable SC1117: backslash escaping

2019-04-11 Thread teor

commit dc4a018b05f324cbdd9e4ac49474f2ad8a8ad87c
Author: teor 
Date:   Mon Apr 8 15:10:28 2019 +1000

shellcheck: Disable SC1117: backslash escaping

SC1117 was disabled after shellcheck release 0.5, because it was
too pedantic.

But shellcheck 0.5.0 is still in the Travis Homebrew cache.

So we disable SC1117 in shellcheck-tests.sh.

Part of 30065.
---
 tests/shellcheck-tests.sh | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/shellcheck-tests.sh b/tests/shellcheck-tests.sh
index 02afbaa..b24a770 100755
--- a/tests/shellcheck-tests.sh
+++ b/tests/shellcheck-tests.sh
@@ -5,6 +5,8 @@ set -e
 # Verbose mode
 set -v
 
+# SC1117 was disabled after 0.5, because it was too pedantic
+EXCLUSIONS="--exclude=SC1117"
 
 # Output is prefixed with the name of the script
 myname=$(basename "$0")
@@ -17,7 +19,8 @@ echo "$myname: changing to chutney directory"
 cd "$CHUTNEY_DIR"
 
 
-echo "$myname: running shellcheck tests"
+echo "$myname: running shellcheck tests with $EXCLUSIONS"
 
-shellcheck chutney
-find . -name "*.sh" -exec shellcheck {} +
+shellcheck "$EXCLUSIONS" chutney
+
+find . -name "*.sh" -exec shellcheck "$EXCLUSIONS" {} +



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

[tor-commits] [chutney/master] Merge remote-tracking branch 'tor-github/pr/21'

2019-04-11 Thread teor

commit 1941747db8b14885ae0dfed40b8e5425e47bee2d
Merge: fa9588e dc4a018
Author: teor 
Date:   Fri Apr 12 12:41:50 2019 +1000

Merge remote-tracking branch 'tor-github/pr/21'

Merged the shellcheck and unit tests.
Put shellcheck first.

 .travis.yml|  9 +
 chutney|  6 --
 tests/shellcheck-tests.sh  | 26 +
 tools/bootstrap-network.sh |  9 +
 tools/hsaddress.sh | 11 ++-
 tools/warnings.sh  | 48 +-
 6 files changed, 76 insertions(+), 33 deletions(-)

diff --cc .travis.yml
index 812ca82,fd04d7d..f5c1d62
--- a/.travis.yml
+++ b/.travis.yml
@@@ -163,7 -171,7 +171,8 @@@ install
- tor --version
  
  script:
+   - tests/shellcheck-tests.sh
 +  - tests/unit-tests.sh
- tools/test-network.sh --allow-failures 1
  
  after_failure:

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

[tor-commits] [chutney/master] Merge remote-tracking branch 'tor-github/pr/18'

2019-04-11 Thread teor

commit cdd438923096a893e7dbe52ef8c3cd2c962ad59b
Merge: 9bb251f c5ed158
Author: teor 
Date:   Fri Apr 12 12:38:27 2019 +1000

Merge remote-tracking branch 'tor-github/pr/18'

 .travis.yml   |  1 +
 lib/chutney/Debug.py  | 18 ++-
 lib/chutney/Templating.py |  2 +-
 lib/chutney/TorNet.py |  2 +-
 lib/chutney/Traffic.py|  8 ++---
 tests/unit-tests.sh   | 78 +++
 6 files changed, 102 insertions(+), 7 deletions(-)



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

[tor-commits] [chutney/master] README: Update the default start time

2019-04-11 Thread teor

commit fa9588e3ce31715ff934705071ba0c86e39e45df
Author: teor 
Date:   Fri Apr 12 12:40:13 2019 +1000

README: Update the default start time
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 59b97cd..c828e1d 100644
--- a/README
+++ b/README
@@ -154,7 +154,7 @@ Multiple Tests:
 Waiting for the network:
 
   The tools/test-network.sh script uses the chutney wait_for_bootstrap
-  command to wait for up to CHUTNEY_START_TIME seconds (default: 60), checking
+  command to wait for up to CHUTNEY_START_TIME seconds (default: 120), checking
   whether the logged bootstrapped status for every node is 100%. It it is,
   great: it succeeds. If not, it dumps the bootstrap statuses and exits.
   test-network.sh does not exit immediately if a tor node fails to bootstrap.



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

[tor-commits] [chutney/master] shellcheck: fix warnings in the hsaddress.sh script

2019-04-11 Thread teor

commit 899d385c700a5de3243271d0885424abf7a65204
Author: teor 
Date:   Mon Apr 8 12:02:34 2019 +1000

shellcheck: fix warnings in the hsaddress.sh script

Part of 30065.
---
 tools/hsaddress.sh | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/hsaddress.sh b/tools/hsaddress.sh
index 00645d7..bc1d123 100755
--- a/tools/hsaddress.sh
+++ b/tools/hsaddress.sh
@@ -7,12 +7,13 @@
 # Examples: tools/hsaddress.sh
 #   tools/hsaddress.sh 025h
 
-if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then
+if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then
 # looks like a broken path: use the path to this tool instead
-TOOLS_PATH=`dirname "$0"`
-export CHUTNEY_PATH=`dirname "$TOOLS_PATH"`
+TOOLS_PATH=$(dirname "$0")
+CHUTNEY_PATH=$(dirname "$TOOLS_PATH")
+export CHUTNEY_PATH
 fi
-if [ -d "$PWD/$CHUTNEY_PATH" -a -x "$PWD/$CHUTNEY_PATH/chutney" ]; then
+if [ -d "$PWD/$CHUTNEY_PATH" ] && [ -x "$PWD/$CHUTNEY_PATH/chutney" ]; then
 # looks like a relative path: make chutney path absolute
 export CHUTNEY_PATH="$PWD/$CHUTNEY_PATH"
 fi
@@ -48,7 +49,7 @@ then
 do
 FILE="${dir}/$TARGET"
 [ -e "$FILE" ] || continue
-echo -n "Node `basename ${dir}`: "
+echo "Node $(basename "$dir"): " | tr -d "\n"
 show_address "$FILE"
 done
 elif [ $# -eq 1 ];



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

[tor-commits] [chutney/master] fixup! test: Add tests/unit-tests.sh

2019-04-11 Thread teor

commit 2a0a85c62de94e7b5d290b3bbae132e26c6f11a1
Author: teor 
Date:   Mon Apr 8 11:06:08 2019 +1000

fixup! test: Add tests/unit-tests.sh
---
 tests/unit-tests.sh | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit-tests.sh b/tests/unit-tests.sh
index 91a1841..5abc7a9 100755
--- a/tests/unit-tests.sh
+++ b/tests/unit-tests.sh
@@ -26,7 +26,7 @@ test -n "$LOG_FILE"
 unset CHUTNEY_DEBUG
 export CHUTNEY_DEBUG
 lib/chutney/Debug.py | tee "$LOG_FILE"
-LOG_FILE_LINES=$(wc -l "$LOG_FILE" | tr -s " " | cut -d " " -f2)
+LOG_FILE_LINES=$(wc -l "$LOG_FILE" | sed -e "s/[^0-9]*\([0-9]*\).*/\1/")
 test "$LOG_FILE_LINES" -eq 1
 
 LOG_FILE=$(mktemp)
@@ -35,7 +35,7 @@ test -n "$LOG_FILE"
 
 export CHUTNEY_DEBUG=1
 lib/chutney/Debug.py | tee "$LOG_FILE"
-LOG_FILE_LINES=$(wc -l "$LOG_FILE" | tr -s " " | cut -d " " -f2)
+LOG_FILE_LINES=$(wc -l "$LOG_FILE" | sed -e "s/[^0-9]*\([0-9]*\).*/\1/")
 test "$LOG_FILE_LINES" -eq 2
 
 unset CHUTNEY_DEBUG
@@ -68,9 +68,9 @@ PYTHONPATH=$PYTHONPATH:lib lib/chutney/Traffic.py  | tee 
"$LOG_FILE"
 
 # Traffic.py produces output with a single newline. But we don't want to get
 # too picky about the details: allow an extra line and a few extra chars.
-LOG_FILE_LINES=$(wc -l "$LOG_FILE" | tr -s " " | cut -d " " -f2)
+LOG_FILE_LINES=$(wc -l "$LOG_FILE" | sed -e "s/[^0-9]*\([0-9]*\).*/\1/")
 test "$LOG_FILE_LINES" -le 2
-LOG_FILE_CHARS=$(wc -c "$LOG_FILE" | tr -s " " | cut -d " " -f2)
+LOG_FILE_CHARS=$(wc -c "$LOG_FILE" | sed -e "s/[^0-9]*\([0-9]*\).*/\1/")
 test "$LOG_FILE_CHARS" -le 4
 
 



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

[tor-commits] [chutney/master] Travis: test shellcheck as part of Travis

2019-04-11 Thread teor

commit 9ca5257386bc8f7e65a685c4e90817bf17d45183
Author: teor 
Date:   Mon Apr 8 12:03:07 2019 +1000

Travis: test shellcheck as part of Travis

Closes 30065.
---
 .travis.yml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8a140dd..fd04d7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,7 @@ matrix:
 - sourceline: 'deb https://deb.torproject.org/torproject.org 
tor-nightly-0.2.9.x-xenial main'
   key_url: 
'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
   packages:
+- shellcheck
 - tor
   env: TOR="0.2.9-nightly"
 - addons:
@@ -43,6 +44,7 @@ matrix:
 - sourceline: 'deb https://deb.torproject.org/torproject.org 
tor-nightly-0.3.4.x-xenial main'
   key_url: 
'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
   packages:
+- shellcheck
 - tor
   env: TOR="0.3.4-nightly"
 ## The current stable release is listed at the end of the file, because
@@ -53,6 +55,7 @@ matrix:
 - sourceline: 'deb https://deb.torproject.org/torproject.org 
tor-nightly-0.3.5.x-xenial main'
   key_url: 
'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
   packages:
+- shellcheck
 - tor
   env: TOR="0.3.5-nightly"
 ## The experimental deb line needs to be updated when 0.4.0 becomes stable
@@ -62,6 +65,7 @@ matrix:
 - sourceline: 'deb https://deb.torproject.org/torproject.org 
tor-experimental-0.4.0.x-xenial main'
   key_url: 
'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
   packages:
+- shellcheck
 - tor
   env: TOR="0.4.0-nightly"
 - addons:
@@ -70,6 +74,7 @@ matrix:
 - sourceline: 'deb https://deb.torproject.org/torproject.org 
tor-nightly-master-xenial main'
   key_url: 
'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
   packages:
+- shellcheck
 - tor
   env: TOR="master-nightly"
 ## Test all supported python releases
@@ -148,10 +153,12 @@ addons:
   - sourceline: 'deb https://deb.torproject.org/torproject.org xenial main'
 key_url: 
'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
 packages:
+  - shellcheck
   - tor
   ## (macOS only)
   homebrew:
 packages:
+  - shellcheck
   - tor
 
 install:
@@ -160,9 +167,11 @@ install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi
   - python --version
+  - shellcheck --version
   - tor --version
 
 script:
+  - tests/shellcheck-tests.sh
   - tools/test-network.sh --allow-failures 1
 
 after_failure:



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

[tor-commits] [chutney/master] shellcheck: fix warnings in the bootstrap-network.sh script

2019-04-11 Thread teor

commit d6df03566a138d6934abedf94bdff4c08d64f83b
Author: teor 
Date:   Mon Apr 8 12:01:26 2019 +1000

shellcheck: fix warnings in the bootstrap-network.sh script

Part of 30065.
---
 tools/bootstrap-network.sh | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh
index bea8cee..9117291 100755
--- a/tools/bootstrap-network.sh
+++ b/tools/bootstrap-network.sh
@@ -14,12 +14,13 @@
 #
 
 # Get a working chutney path
-if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then
+if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then
 # looks like a broken path: use the path to this tool instead
-TOOLS_PATH=`dirname "$0"`
-export CHUTNEY_PATH=`dirname "$TOOLS_PATH"`
+TOOLS_PATH=$(dirname "$0")
+CHUTNEY_PATH=$(dirname "$TOOLS_PATH")
+export CHUTNEY_PATH
 fi
-if [ -d "$PWD/$CHUTNEY_PATH" -a -x "$PWD/$CHUTNEY_PATH/chutney" ]; then
+if [ -d "$PWD/$CHUTNEY_PATH" ] && [ -x "$PWD/$CHUTNEY_PATH/chutney" ]; then
 # looks like a relative path: make chutney path absolute
 export CHUTNEY_PATH="$PWD/$CHUTNEY_PATH"
 fi



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

[tor-commits] [chutney/master] shellcheck: fix warnings in the warnings.sh script

2019-04-11 Thread teor

commit 2e605ac428ba212df7c1e26c5493350d93c5
Author: teor 
Date:   Mon Apr 8 12:01:59 2019 +1000

shellcheck: fix warnings in the warnings.sh script

Part of 30065.
---
 tools/warnings.sh | 48 ++--
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/tools/warnings.sh b/tools/warnings.sh
index 4ef91ee..b8c263d 100755
--- a/tools/warnings.sh
+++ b/tools/warnings.sh
@@ -11,12 +11,13 @@
 # CHUTNEY_WARNINGS_IGNORE_EXPECTED: set to "true" to filter expected warnings
 # CHUTNEY_WARNINGS_SUMMARY: set to "true" to merge warnings from all instances
 
-if [ ! -d "$CHUTNEY_PATH" -o ! -x "$CHUTNEY_PATH/chutney" ]; then
+if [ ! -d "$CHUTNEY_PATH" ] || [ ! -x "$CHUTNEY_PATH/chutney" ]; then
 # looks like a broken path: use the path to this tool instead
-TOOLS_PATH=`dirname "$0"`
-export CHUTNEY_PATH=`dirname "$TOOLS_PATH"`
+TOOLS_PATH=$(dirname "$0")
+CHUTNEY_PATH=$(dirname "$TOOLS_PATH")
+export CHUTNEY_PATH
 fi
-if [ -d "$PWD/$CHUTNEY_PATH" -a -x "$PWD/$CHUTNEY_PATH/chutney" ]; then
+if [ -d "$PWD/$CHUTNEY_PATH" ] && [ -x "$PWD/$CHUTNEY_PATH/chutney" ]; then
 # looks like a relative path: make chutney path absolute
 export CHUTNEY_PATH="$PWD/$CHUTNEY_PATH"
 fi
@@ -33,42 +34,45 @@ fi
 
 show_warnings() {
 # Work out the file and filter settings
+LOGS=$(mktemp)
 if [ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then
-FILE="$1/*/$LOG_FILE"
+cat "$1"/*/"$LOG_FILE" > "$LOGS"
 else
-FILE="$1/$LOG_FILE"
+cat "$1/$LOG_FILE" > "$LOGS"
 fi
-if [ "$CHUTNEY_WARNINGS_IGNORE_EXPECTED" = true -a \
--e "$IGNORE_FILE" ]; then
-CAT="grep -v -f"
+FILTERED_LOGS=$(mktemp)
+if [ "$CHUTNEY_WARNINGS_IGNORE_EXPECTED" = true ] && \
+   [ -e "$IGNORE_FILE" ]; then
+grep -v -f "$IGNORE_FILE" "$LOGS" | $SED_E "$FILTER" > "$FILTERED_LOGS"
 else
-CAT=cat
+$SED_E "$FILTER" "$LOGS" > "$FILTERED_LOGS"
 IGNORE_FILE=
 fi
 # Silence any messages if we are in summary mode, and there are no warnings
 # must be kept in sync with the filter commands below
-if [ `$CAT $IGNORE_FILE $FILE | $SED_E "$FILTER" | wc -c` -eq 0 -a \
-"$CHUTNEY_WARNINGS_SUMMARY" = true ]; then
-ECHO_Q=true
-ECHO_A=true
+if [ "$CHUTNEY_WARNINGS_SUMMARY" = true ] && \
+   [ "$(wc -c < "$FILTERED_LOGS")" -eq 0 ]; \
+   then
+ECHO_Q="true"
+ECHO_A="true"
  else
 # if there is output, always echo the detail message
-ECHO_A=echo
+ECHO_A="echo"
 fi
 # Give context to the warnings we're about to display
 if [ "$CHUTNEY_WARNINGS_SUMMARY" = true ]; then
-$ECHO_Q "${GREEN}Summary: `basename $1`${NC}"
+$ECHO_Q "${GREEN}Summary: $(basename "$1")${NC}"
 else
-$ECHO_Q "${GREEN}Node: `basename $1`${NC}"
+$ECHO_Q "${GREEN}Node: $(basename "$1")${NC}"
 fi
-if [ "$CHUTNEY_WARNINGS_IGNORE_EXPECTED" = true -a \
--e "$IGNORE_FILE" ]; then
-PERMANENT_DIR=`readlink -n "$1" || echo "$1"`
+if [ "$CHUTNEY_WARNINGS_IGNORE_EXPECTED" = true ] && \
+   [ -e "$IGNORE_FILE" ]; then
+PERMANENT_DIR=$(readlink -n "$1" || echo "$1")
 $ECHO_A "${GREEN}Detail: chutney/tools/warnings.sh $PERMANENT_DIR${NC}"
 fi
 # Display the warnings, after filtering and counting occurrences
 # must be kept in sync with the filter commands above
-$CAT $IGNORE_FILE $FILE | $SED_E "$FILTER" | sort | uniq -c | \
+sort "$FILTERED_LOGS" | uniq -c | \
 sed -e 's/^\s*//' -e "s/ *\([0-9][0-9]*\) *\(.*\)/${YELLOW}Warning:${NC} 
\2${YELLOW} Number: \1${NC}/"
 if [ "$CHUTNEY_WARNINGS_SUMMARY" != true ]; then
 $ECHO_Q ""
@@ -86,7 +90,7 @@ if [ -t 1 ]; then
 YELLOW=$(tput setaf 3)
 GREEN=$(tput setaf 2)
 fi
-CHUTNEY="$CHUTNEY_PATH/chutney"
+
 NAME=$(basename "$0")
 DEST="$CHUTNEY_DATA_DIR/nodes"
 LOG_FILE=info.log



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

[tor-commits] [chutney/master] fixup! fixup! test: Add tests/unit-tests.sh

2019-04-11 Thread teor

commit 65c669cc4dd5b53463553fd32a35ed533dad948e
Author: teor 
Date:   Mon Apr 8 11:50:41 2019 +1000

fixup! fixup! test: Add tests/unit-tests.sh
---
 tests/unit-tests.sh | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit-tests.sh b/tests/unit-tests.sh
index 5abc7a9..07e8b32 100755
--- a/tests/unit-tests.sh
+++ b/tests/unit-tests.sh
@@ -26,7 +26,7 @@ test -n "$LOG_FILE"
 unset CHUTNEY_DEBUG
 export CHUTNEY_DEBUG
 lib/chutney/Debug.py | tee "$LOG_FILE"
-LOG_FILE_LINES=$(wc -l "$LOG_FILE" | sed -e "s/[^0-9]*\([0-9]*\).*/\1/")
+LOG_FILE_LINES=$(wc -l < "$LOG_FILE")
 test "$LOG_FILE_LINES" -eq 1
 
 LOG_FILE=$(mktemp)
@@ -35,7 +35,7 @@ test -n "$LOG_FILE"
 
 export CHUTNEY_DEBUG=1
 lib/chutney/Debug.py | tee "$LOG_FILE"
-LOG_FILE_LINES=$(wc -l "$LOG_FILE" | sed -e "s/[^0-9]*\([0-9]*\).*/\1/")
+LOG_FILE_LINES=$(wc -l < "$LOG_FILE")
 test "$LOG_FILE_LINES" -eq 2
 
 unset CHUTNEY_DEBUG
@@ -68,9 +68,9 @@ PYTHONPATH=$PYTHONPATH:lib lib/chutney/Traffic.py  | tee 
"$LOG_FILE"
 
 # Traffic.py produces output with a single newline. But we don't want to get
 # too picky about the details: allow an extra line and a few extra chars.
-LOG_FILE_LINES=$(wc -l "$LOG_FILE" | sed -e "s/[^0-9]*\([0-9]*\).*/\1/")
+LOG_FILE_LINES=$(wc -l < "$LOG_FILE")
 test "$LOG_FILE_LINES" -le 2
-LOG_FILE_CHARS=$(wc -c "$LOG_FILE" | sed -e "s/[^0-9]*\([0-9]*\).*/\1/")
+LOG_FILE_CHARS=$(wc -c < "$LOG_FILE")
 test "$LOG_FILE_CHARS" -le 4
 
 



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

[tor-commits] [chutney/master] tests: Add a shellcheck test

2019-04-11 Thread teor

commit ef79e2143ee426eee74d322dd4140d7c076af221
Author: teor 
Date:   Mon Apr 8 12:23:48 2019 +1000

tests: Add a shellcheck test

Part of 30065.
---
 tests/shellcheck-tests.sh | 23 +++
 1 file changed, 23 insertions(+)

diff --git a/tests/shellcheck-tests.sh b/tests/shellcheck-tests.sh
new file mode 100755
index 000..02afbaa
--- /dev/null
+++ b/tests/shellcheck-tests.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Exit on errors
+set -e
+# Verbose mode
+set -v
+
+
+# Output is prefixed with the name of the script
+myname=$(basename "$0")
+
+echo "$myname: finding chutney directory"
+TEST_DIR=$(dirname "$0")
+CHUTNEY_DIR=$(dirname "$TEST_DIR")
+
+echo "$myname: changing to chutney directory"
+cd "$CHUTNEY_DIR"
+
+
+echo "$myname: running shellcheck tests"
+
+shellcheck chutney
+find . -name "*.sh" -exec shellcheck {} +



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

[tor-commits] [chutney/master] fixup! test-network: Try a default start time of 120 seconds

2019-04-11 Thread teor

commit 86fb60ac29ea11f16e82aaad4d165b02d1ba83b0
Author: teor 
Date:   Mon Apr 8 10:56:53 2019 +1000

fixup! test-network: Try a default start time of 120 seconds
---
 tools/test-network-impl.sh | 8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tools/test-network-impl.sh b/tools/test-network-impl.sh
index a2de002..a63fe97 100755
--- a/tools/test-network-impl.sh
+++ b/tools/test-network-impl.sh
@@ -11,9 +11,11 @@ fi
 # chutney starts verifying after CHUTNEY_START_TIME seconds,
 # keeps on trying for CHUTNEY_BOOTSTRAP_TIME seconds,
 # and then stops after CHUTNEY_STOP_TIME seconds.
-# Even the fastest chutney networks take 5-10 seconds for their first consensus
-# and then 10 seconds after that for relays to bootstrap and upload descriptors
-# But chutney defaults to running a bit more slowly, so it is more reliable.
+# Even the fastest chutney networks take 5-10 seconds for their first 
consensus,
+# and then 10 seconds after that for relays to bootstrap and upload 
descriptors,
+# and then 10 seconds after that for clients and onion services to bootstrap.
+# But chutney defaults to running a bit more slowly, so it is more reliable,
+# and we allow a bit more time, in case the machine is heavily loaded.
 export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-120}
 export CHUTNEY_BOOTSTRAP_TIME=${CHUTNEY_BOOTSTRAP_TIME:-60}
 export CHUTNEY_STOP_TIME=${CHUTNEY_STOP_TIME:-0}



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

[tor-commits] [chutney/master] Traffic: make the unit test compatible with python 3

2019-04-11 Thread teor

commit c5ed1580d9b864287068c3b4fa3620835c3c8ede
Author: teor 
Date:   Mon Apr 8 15:02:55 2019 +1000

Traffic: make the unit test compatible with python 3

Part of 30063.
---
 lib/chutney/Traffic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py
index cb0af2f..26976db 100755
--- a/lib/chutney/Traffic.py
+++ b/lib/chutney/Traffic.py
@@ -430,7 +430,7 @@ class TrafficTester():
 
 def main():
 """Test the TrafficTester by sending and receiving some data."""
-DATA = "a foo is a bar" * 1000
+DATA = b"a foo is a bar" * 1000
 bind_to = ('localhost', int(sys.argv[1]))
 
 tt = TrafficTester(bind_to, DATA)



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

[tor-commits] [chutney/master] README: fix grammar

2019-04-11 Thread teor

commit de76537ce4700895e517dc3a068f4dead77375cd
Author: teor 
Date:   Sat Apr 6 13:15:20 2019 +1000

README: fix grammar
---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 0cc5a1e..59b97cd 100644
--- a/README
+++ b/README
@@ -11,7 +11,7 @@ Right now it only sorta does these things.
 
 You will need:
   - Python 2.7, or a supported Python 3,
-- (we support Python versions that are still getting updates),
+- (we support Python versions that are still getting updates), and
   - Tor binaries.
 
 Chutney checks for Tor binaries in this order:



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

[tor-commits] [chutney/master] Travis: Run unit-tests.sh before running the tor integration test

2019-04-11 Thread teor

commit 03bcfa025f0eb4a33e7735883411328b62d834ba
Author: teor 
Date:   Mon Apr 8 10:32:26 2019 +1000

Travis: Run unit-tests.sh before running the tor integration test

Closes 30063.
---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 8a140dd..812ca82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -163,6 +163,7 @@ install:
   - tor --version
 
 script:
+  - tests/unit-tests.sh
   - tools/test-network.sh --allow-failures 1
 
 after_failure:



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

[tor-commits] [chutney/master] test-network: Try a default start time of 120 seconds

2019-04-11 Thread teor

commit d40ea6d478fdde2b7a3a22e05036f6e923ed29bb
Author: teor 
Date:   Mon Apr 8 10:47:26 2019 +1000

test-network: Try a default start time of 120 seconds

For Travis and other slow or loaded machines.

TODO: update the README with the new default.
(Conflicts with 30059.)

Bugfix for 30064.
---
 tools/test-network-impl.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/test-network-impl.sh b/tools/test-network-impl.sh
index 8787253..a2de002 100755
--- a/tools/test-network-impl.sh
+++ b/tools/test-network-impl.sh
@@ -14,7 +14,7 @@ fi
 # Even the fastest chutney networks take 5-10 seconds for their first consensus
 # and then 10 seconds after that for relays to bootstrap and upload descriptors
 # But chutney defaults to running a bit more slowly, so it is more reliable.
-export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-60}
+export CHUTNEY_START_TIME=${CHUTNEY_START_TIME:-120}
 export CHUTNEY_BOOTSTRAP_TIME=${CHUTNEY_BOOTSTRAP_TIME:-60}
 export CHUTNEY_STOP_TIME=${CHUTNEY_STOP_TIME:-0}
 



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

[tor-commits] [chutney/master] shellcheck: Fix warnings in the chutney script

2019-04-11 Thread teor

commit 40fd44a8ba26144b83c0e0a8e6caff03df717ec4
Author: teor 
Date:   Mon Apr 8 12:00:45 2019 +1000

shellcheck: Fix warnings in the chutney script

Part of 30065.
---
 chutney | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/chutney b/chutney
index fcd5ec5..e6fef7e 100755
--- a/chutney
+++ b/chutney
@@ -3,11 +3,13 @@
 set -o errexit
 set -o nounset
 
-export PYTHONPATH="$(dirname "${0}")/lib:$(dirname 
"${0}")/scripts:${PYTHONPATH-}"
+PYTHONPATH="$(dirname "${0}")/lib:$(dirname "${0}")/scripts:${PYTHONPATH-}"
+export PYTHONPATH
 # make a last-ditch effort to set CHUTNEY_PATH based on this script's location
 if ! test "${CHUTNEY_PATH+y}"
 then
-export CHUTNEY_PATH="`dirname $0`"
+CHUTNEY_PATH=$(dirname "$0")
+export CHUTNEY_PATH
 fi
 
 binaries="python python3 python2"



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

[tor-commits] [chutney/master] TODO: we have done some of the TODOs

2019-04-11 Thread teor

commit 9bb251f8035832920776332f8b74ed6c97007729
Author: teor 
Date:   Mon Apr 8 09:04:16 2019 +1000

TODO: we have done some of the TODOs

But we forgot to take them off our list.

Part of bug 30059.
---
 TODO | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/TODO b/TODO
index 4490c05..b1ea8ef 100644
--- a/TODO
+++ b/TODO
@@ -19,13 +19,6 @@
 
 - Pipe stdout to a file, not to nowhere with "quiet"
 
-- Log stuff.
-
 - Have launcher check for configuration
 
 - Resolve  comments
-
-- Document everything
-
-- Start writing passive "tests" like "did it bootstrap?" or "any
-  warnings in the logs?", etc



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

[tor-commits] [chutney/master] README: specify the default CHUTNEY_START_TIME

2019-04-11 Thread teor

commit aceff9ee30898ec0135002a9d5d7c9a680be91c8
Author: teor 
Date:   Sat Apr 6 12:06:05 2019 +1000

README: specify the default CHUTNEY_START_TIME
---
 README | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 93309cb..9fdee93 100644
--- a/README
+++ b/README
@@ -151,9 +151,9 @@ Multiple Tests:
 Waiting for the network:
 
   The tools/test-network.sh script uses the chutney wait_for_bootstrap
-  command to wait for up to CHUTNEY_START_TIME seconds, checking whether the
-  logged bootstrapped status for every node is 100%. It it is, great: it
-  succeeds. If not, it dumps the bootstrap statuses and exits.
+  command to wait for up to CHUTNEY_START_TIME seconds (default: 60), checking
+  whether the logged bootstrapped status for every node is 100%. It it is,
+  great: it succeeds. If not, it dumps the bootstrap statuses and exits.
   test-network.sh does not exit immediately if a tor node fails to bootstrap.
   Instead, it attempts to verify. We'll add an option to fail on tor
   bootstrap failure in #20473.



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

[tor-commits] [chutney/master] tests: Stop requiring python2 for module tests

2019-04-11 Thread teor

commit 191e280f636a724d5c80b0ff74e571711b8e94fb
Author: teor 
Date:   Mon Apr 8 10:06:12 2019 +1000

tests: Stop requiring python2 for module tests

And make the modules executable, so we can run them in unit tests.

Part of 30063.
---
 lib/chutney/Debug.py  | 2 +-
 lib/chutney/Templating.py | 2 +-
 lib/chutney/TorNet.py | 2 +-
 lib/chutney/Traffic.py| 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/chutney/Debug.py b/lib/chutney/Debug.py
old mode 100644
new mode 100755
index 556ac5c..108735f
--- a/lib/chutney/Debug.py
+++ b/lib/chutney/Debug.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright 2011 Nick Mathewson, Michael Stone
 # Copyright 2013 The Tor Project
diff --git a/lib/chutney/Templating.py b/lib/chutney/Templating.py
old mode 100644
new mode 100755
index de3de90..1e97cbe
--- a/lib/chutney/Templating.py
+++ b/lib/chutney/Templating.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright 2011 Nick Mathewson, Michael Stone
 #
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index b0061b6..16f4345 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright 2011 Nick Mathewson, Michael Stone
 # Copyright 2013 The Tor Project
diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py
old mode 100644
new mode 100755
index 766766a..7577d0f
--- a/lib/chutney/Traffic.py
+++ b/lib/chutney/Traffic.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 #
 # Copyright 2013 The Tor Project
 #



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

[tor-commits] [chutney/master] tests: Add unit tests to Debug.py

2019-04-11 Thread teor

commit 7a3db9879d0f9a6116456910207c4e2a19bf5169
Author: teor 
Date:   Mon Apr 8 10:08:36 2019 +1000

tests: Add unit tests to Debug.py

Part of 30063.
---
 lib/chutney/Debug.py | 16 
 1 file changed, 16 insertions(+)

diff --git a/lib/chutney/Debug.py b/lib/chutney/Debug.py
index 108735f..85c9eee 100755
--- a/lib/chutney/Debug.py
+++ b/lib/chutney/Debug.py
@@ -11,6 +11,7 @@ from __future__ import print_function
 
 import cgitb
 import os
+import sys
 
 # Get verbose tracebacks, so we can diagnose better.
 cgitb.enable(format="plain")
@@ -24,3 +25,18 @@ def debug(s):
 "Print a debug message on stdout if debug_flag is True."
 if debug_flag:
 print("DEBUG: %s" % s)
+
+
+def main():
+global debug_flag
+debug("This message should appear if $CHUTNEY_DEBUG is true.")
+debug_flag = True
+debug("This message should always appear.")
+debug_flag = False
+debug("This message should never appear.")
+# We don't test tracebacks, because it's hard to know what to expect
+# (and they make python exit with a non-zero exit status)
+return 0
+
+if __name__ == '__main__':
+sys.exit(main())



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

[tor-commits] [chutney/master] test: Add tests/unit-tests.sh

2019-04-11 Thread teor

commit 09fbfaefbb6f9ad59bf3947e3e9c6ec0d2fe3989
Author: teor 
Date:   Mon Apr 8 10:31:45 2019 +1000

test: Add tests/unit-tests.sh

Test each chutney module separately, using its own unit tests.

Part of 30063.
---
 tests/unit-tests.sh | 78 +
 1 file changed, 78 insertions(+)

diff --git a/tests/unit-tests.sh b/tests/unit-tests.sh
new file mode 100755
index 000..91a1841
--- /dev/null
+++ b/tests/unit-tests.sh
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# Exit on errors
+set -e
+# Verbose mode
+set -v
+
+
+# Output is prefixed with the name of the script
+myname=$(basename "$0")
+
+echo "$myname: finding chutney directory"
+TEST_DIR=$(dirname "$0")
+CHUTNEY_DIR=$(dirname "$TEST_DIR")
+
+echo "$myname: changing to chutney directory"
+cd "$CHUTNEY_DIR"
+
+
+echo "$myname: running Debug.py tests"
+
+LOG_FILE=$(mktemp)
+export LOG_FILE
+test -n "$LOG_FILE"
+
+unset CHUTNEY_DEBUG
+export CHUTNEY_DEBUG
+lib/chutney/Debug.py | tee "$LOG_FILE"
+LOG_FILE_LINES=$(wc -l "$LOG_FILE" | tr -s " " | cut -d " " -f2)
+test "$LOG_FILE_LINES" -eq 1
+
+LOG_FILE=$(mktemp)
+export LOG_FILE
+test -n "$LOG_FILE"
+
+export CHUTNEY_DEBUG=1
+lib/chutney/Debug.py | tee "$LOG_FILE"
+LOG_FILE_LINES=$(wc -l "$LOG_FILE" | tr -s " " | cut -d " " -f2)
+test "$LOG_FILE_LINES" -eq 2
+
+unset CHUTNEY_DEBUG
+export CHUTNEY_DEBUG
+
+
+echo "$myname: running Templating.py tests"
+
+LOG_FILE=$(mktemp)
+export LOG_FILE
+test -n "$LOG_FILE"
+
+lib/chutney/Templating.py torrc_templates/common.i | tee "$LOG_FILE"
+grep -q owning_controller_process "$LOG_FILE"
+grep -q connlimit "$LOG_FILE"
+grep -q controlport "$LOG_FILE"
+grep -q nick "$LOG_FILE"
+grep -q authorities "$LOG_FILE"
+grep -q dir "$LOG_FILE"
+
+
+echo "$myname: running Traffic.py tests"
+
+LOG_FILE=$(mktemp)
+export LOG_FILE
+test -n "$LOG_FILE"
+
+# Choose an arbitrary port
+PYTHONPATH=$PYTHONPATH:lib lib/chutney/Traffic.py  | tee "$LOG_FILE"
+
+# Traffic.py produces output with a single newline. But we don't want to get
+# too picky about the details: allow an extra line and a few extra chars.
+LOG_FILE_LINES=$(wc -l "$LOG_FILE" | tr -s " " | cut -d " " -f2)
+test "$LOG_FILE_LINES" -le 2
+LOG_FILE_CHARS=$(wc -c "$LOG_FILE" | tr -s " " | cut -d " " -f2)
+test "$LOG_FILE_CHARS" -le 4
+
+
+# We don't test TorNet.py: it's integration tested with tor using the
+# chutney/chutney script



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

[tor-commits] [chutney/master] README: rewrite the bandwidth tests section

2019-04-11 Thread teor

commit 8ddd5efff908bcd5998a8149418af7f06e5a30cb
Author: teor 
Date:   Sat Apr 6 13:14:55 2019 +1000

README: rewrite the bandwidth tests section
---
 README | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 9fdee93..0cc5a1e 100644
--- a/README
+++ b/README
@@ -99,15 +99,18 @@ Bandwidth Tests:
   ./chutney configure networks/basic-min
   ./chutney start networks/basic-min
   ./chutney status networks/basic-min
-  CHUTNEY_DATA_BYTES=104857600 ./chutney verify networks/basic-min
   # Send 100MB of data per client connection
-  # verify produces performance figures for:
-  # Single Stream Bandwidth: the speed of the slowest stream, end-to-end
-  # Overall tor Bandwidth: the sum of the bandwidth across each tor instance
-  # This approximates the CPU-bound tor performance on the current machine,
-  # assuming everything is multithreaded and network performance is infinite.
+  CHUTNEY_DATA_BYTES=104857600 ./chutney verify networks/basic-min
   ./chutney stop networks/basic-min
 
+If chutney sends at least 5 MB of data, and it takes at least one second,
+verify produces performance figures for:
+ - Single Stream Bandwidth: the speed of the slowest stream, end-to-end
+ - Overall tor Bandwidth: the sum of the bandwidth across each tor instance
+The overall bandwidth approximates the CPU-bound tor performance on the
+current machine, assuming tor, chutney, and the OS are multithreaded, and
+network performance is infinite.
+
 Connection Tests:
   ./chutney configure networks/basic-025
   ./chutney start networks/basic-025



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

[tor-commits] [chutney/master] tests: Stop requiring a tor (or SOCKS) proxy for the Traffic.py tests

2019-04-11 Thread teor

commit 25162cb860eb0dab828aae9718e758628b0b2d83
Author: teor 
Date:   Mon Apr 8 10:08:00 2019 +1000

tests: Stop requiring a tor (or SOCKS) proxy for the Traffic.py tests

Part of 30063.
---
 lib/chutney/Traffic.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/chutney/Traffic.py b/lib/chutney/Traffic.py
index 7577d0f..cb0af2f 100755
--- a/lib/chutney/Traffic.py
+++ b/lib/chutney/Traffic.py
@@ -431,11 +431,11 @@ class TrafficTester():
 def main():
 """Test the TrafficTester by sending and receiving some data."""
 DATA = "a foo is a bar" * 1000
-proxy = ('localhost', 9008)
 bind_to = ('localhost', int(sys.argv[1]))
 
 tt = TrafficTester(bind_to, DATA)
-tt.add(Source(tt, bind_to, DATA, proxy))
+# Don't use a proxy for self-testing, so that we avoid tor entirely
+tt.add(Source(tt, bind_to, DATA))
 success = tt.run()
 
 if success:



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

[tor-commits] [tor/maint-0.4.0] bump to 0.4.0.4-rc-dev

2019-04-11 Thread nickm

commit 40471d73e5270d615a92be2ee1e7c70232dcbbcc
Author: Nick Mathewson 
Date:   Thu Apr 11 17:05:38 2019 -0400

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

diff --git a/configure.ac b/configure.ac
index dc8fa7086..062ff5168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.4-rc])
+AC_INIT([tor],[0.4.0.4-rc-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-10"], # for 0.4.0.4-rc
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-11"], # for 0.4.0.4-rc-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4100b4619..38bbca4c6 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.4-rc"
+!define VERSION "0.4.0.4-rc-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 09d38cb1e..3a7410b8d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.4-rc"
+#define VERSION "0.4.0.4-rc-dev"
 
 
 

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

[tor-commits] [tor/master] forward-port the 0.4.0.4-rc changelog

2019-04-11 Thread nickm

commit adeecce53b68eb7183bf8d5b3051303b5f2f1d45
Author: Nick Mathewson 
Date:   Thu Apr 11 17:06:19 2019 -0400

forward-port the 0.4.0.4-rc changelog
---
 ChangeLog | 138 ++
 1 file changed, 138 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9b512c6ae..accde75b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,141 @@
+Changes in version 0.4.0.4-rc - 2019-04-11
+  Tor 0.4.0.4-rc is the first release candidate in its series; it fixes
+  several bugs from earlier versions, including some that had affected
+  stability, and one that prevented relays from working with NSS.
+
+  o Major bugfixes (NSS, relay):
+- When running with NSS, disable TLS 1.2 ciphersuites that use
+  SHA384 for their PRF. Due to an NSS bug, the TLS key exporters for
+  these ciphersuites don't work -- which caused relays to fail to
+  handshake with one another when these ciphersuites were enabled.
+  Fixes bug 29241; bugfix on 0.3.5.1-alpha.
+
+  o Minor features (bandwidth authority):
+- Make bandwidth authorities ignore relays that are reported in the
+  bandwidth file with the flag "vote=0". This change allows us to
+  report unmeasured relays for diagnostic reasons without including
+  their bandwidth in the bandwidth authorities' vote. Closes
+  ticket 29806.
+- When a directory authority is using a bandwidth file to obtain the
+  bandwidth values that will be included in the next vote, serve
+  this bandwidth file at /tor/status-vote/next/bandwidth. Closes
+  ticket 21377.
+
+  o Minor features (circuit padding):
+- Stop warning about undefined behavior in the probability
+  distribution tests. Float division by zero may technically be
+  undefined behavior in C, but it's well defined in IEEE 754.
+  Partial backport of 29298. Closes ticket 29527; bugfix
+  on 0.4.0.1-alpha.
+
+  o Minor features (continuous integration):
+- On Travis Rust builds, cleanup Rust registry and refrain from
+  caching the "target/" directory to speed up builds. Resolves
+  issue 29962.
+
+  o Minor features (dormant mode):
+- Add a DormantCanceledByStartup option to tell Tor that it should
+  treat a startup event as cancelling any previous dormant state.
+  Integrators should use this option with caution: it should only be
+  used if Tor is being started because of something that the user
+  did, and not if Tor is being automatically started in the
+  background. Closes ticket 29357.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the April 2 2019 Maxmind GeoLite2
+  Country database. Closes ticket 29992.
+
+  o Minor features (NSS, diagnostic):
+- Try to log an error from NSS (if there is any) and a more useful
+  description of our situation if we are using NSS and a call to
+  SSL_ExportKeyingMaterial() fails. Diagnostic for ticket 29241.
+
+  o Minor bugfixes (security):
+- Fix a potential double free bug when reading huge bandwidth files.
+  The issue is not exploitable in the current Tor network because
+  the vulnerable code is only reached when directory authorities
+  read bandwidth files, but bandwidth files come from a trusted
+  source (usually the authorities themselves). Furthermore, the
+  issue is only exploitable in rare (non-POSIX) 32-bit architectures,
+  which are not used by any of the current authorities. Fixes bug
+  30040; bugfix on 0.3.5.1-alpha. Bug found and fixed by
+  Tobias Stoeckmann.
+- Verify in more places that we are not about to create a buffer
+  with more than INT_MAX bytes, to avoid possible OOB access in the
+  event of bugs. Fixes bug 30041; bugfix on 0.2.0.16. Found and
+  fixed by Tobias Stoeckmann.
+
+  o Minor bugfix (continuous integration):
+- Reset coverage state on disk after Travis CI has finished. This
+  should prevent future coverage merge errors from causing the test
+  suite for the "process" subsystem to fail. The process subsystem
+  was introduced in 0.4.0.1-alpha. Fixes bug 29036; bugfix
+  on 0.2.9.15.
+- Terminate test-stem if it takes more than 9.5 minutes to run.
+  (Travis terminates the job after 10 minutes of no output.)
+  Diagnostic for 29437. Fixes bug 30011; bugfix on 0.3.5.4-alpha.
+
+  o Minor bugfixes (bootstrap reporting):
+- During bootstrap reporting, correctly distinguish pluggable
+  transports from plain proxies. Fixes bug 28925; bugfix
+  on 0.4.0.1-alpha.
+
+  o Minor bugfixes (C correctness):
+- Fix an unlikely memory leak in consensus_diff_apply(). Fixes bug
+  29824; bugfix on 0.3.1.1-alpha. This is Coverity warning
+  CID 1444119.
+
+  o Minor bugfixes (circuitpadding testing):
+- Minor tweaks to avoid rare test failures related to timers and
+  monotonic time. Fixes bug 29500; bugfix on 0.4.0.1-alpha.
+
+  o Minor bugfixes (directory

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

2019-04-11 Thread nickm

commit 7dd247c5fd91962cf12ffc1c2aced0a3e8d01f29
Merge: 9fabf104e 40471d73e
Author: Nick Mathewson 
Date:   Thu Apr 11 17:05:45 2019 -0400

Merge branch 'maint-0.4.0'




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

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

2019-04-11 Thread nickm

commit 5ae1389465f9be45530c8e07f7870e021705fe31
Merge: dac18e0b2 40471d73e
Author: Nick Mathewson 
Date:   Thu Apr 11 17:06:26 2019 -0400

Merge branch 'maint-0.4.0' into release-0.4.0

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

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

[tor-commits] [tor/master] bump to 0.4.0.4-rc-dev

2019-04-11 Thread nickm

commit 40471d73e5270d615a92be2ee1e7c70232dcbbcc
Author: Nick Mathewson 
Date:   Thu Apr 11 17:05:38 2019 -0400

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

diff --git a/configure.ac b/configure.ac
index dc8fa7086..062ff5168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.4-rc])
+AC_INIT([tor],[0.4.0.4-rc-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-10"], # for 0.4.0.4-rc
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-11"], # for 0.4.0.4-rc-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4100b4619..38bbca4c6 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.4-rc"
+!define VERSION "0.4.0.4-rc-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 09d38cb1e..3a7410b8d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.4-rc"
+#define VERSION "0.4.0.4-rc-dev"
 
 
 



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

[tor-commits] [tor/release-0.4.0] bump to 0.4.0.4-rc-dev

2019-04-11 Thread nickm

commit 40471d73e5270d615a92be2ee1e7c70232dcbbcc
Author: Nick Mathewson 
Date:   Thu Apr 11 17:05:38 2019 -0400

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

diff --git a/configure.ac b/configure.ac
index dc8fa7086..062ff5168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.4-rc])
+AC_INIT([tor],[0.4.0.4-rc-dev])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-10"], # for 0.4.0.4-rc
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-04-11"], # for 0.4.0.4-rc-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 4100b4619..38bbca4c6 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.4-rc"
+!define VERSION "0.4.0.4-rc-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 09d38cb1e..3a7410b8d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.4-rc"
+#define VERSION "0.4.0.4-rc-dev"
 
 
 



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

[tor-commits] [webwml/master] alpha version is now 0.4.0.4-rc

2019-04-11 Thread nickm

commit 5378a52ac0220f996108e24e4fa0ef59b9c30eaf
Author: Nick Mathewson 
Date:   Thu Apr 11 17:04:56 2019 -0400

alpha version is now 0.4.0.4-rc
---
 Makefile | 2 +-
 include/versions.wmi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 304cf889..9fa032ef 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@
 # website component, and set it to needs_review.
 
 export STABLETAG=tor-0.3.5.8
-export DEVTAG=tor-0.4.0.3-alpha
+export DEVTAG=tor-0.4.0.4-rc
 
 WMLBASE=.
 SUBDIRS=docs eff projects press about download getinvolved donate 
docs/torbutton
diff --git a/include/versions.wmi b/include/versions.wmi
index e13274d8..5fcea797 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
 0.3.5.8
-0.4.0.3-alpha
+0.4.0.4-rc
 
 maint-8.0
 

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

[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-04-11 Thread translation

commit 16f0a44c506d40c709ff6a437500ea195c7b00d6
Author: Translation commit bot 
Date:   Thu Apr 11 19:50:47 2019 +

Update translations for tpo-web
---
 contents+tr.po | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contents+tr.po b/contents+tr.po
index d3479e6a3..3680dcbac 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -2,6 +2,7 @@
 # erinm, 2019
 # Emma Peel, 2019
 # Kaya Zeren , 2019
+# Arda BÃ¼yÃ¼kkaya , 2019
 # 
 msgid ""
 msgstr ""
@@ -9,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-06 10:26+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Kaya Zeren , 2019\n"
+"Last-Translator: Arda BÃ¼yÃ¼kkaya , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -975,6 +976,8 @@ msgid ""
 "At the moment, we don't have any official open positions. Please check back "
 "soon, though!"
 msgstr ""
+"Åu anda herhangi bir resmi aÃ§Ä±k pozisyonumuz yok. LÃ¼tfen kÄ±sa sÃ¼re 
sonra "
+"tekrar kontrol edin!"
 
 #: templates/jobs.html:18 templates/projects.html:5
 msgid "Previous Openings"

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

[tor-commits] [translation/tpo-web_completed] Update translations for tpo-web_completed

2019-04-11 Thread translation

commit e09f60938f8d7f094ff69c744e987a257bccfee3
Author: Translation commit bot 
Date:   Thu Apr 11 19:50:52 2019 +

Update translations for tpo-web_completed
---
 contents+tr.po | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/contents+tr.po b/contents+tr.po
index d3479e6a3..3680dcbac 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -2,6 +2,7 @@
 # erinm, 2019
 # Emma Peel, 2019
 # Kaya Zeren , 2019
+# Arda BÃ¼yÃ¼kkaya , 2019
 # 
 msgid ""
 msgstr ""
@@ -9,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-06 10:26+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Kaya Zeren , 2019\n"
+"Last-Translator: Arda BÃ¼yÃ¼kkaya , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -975,6 +976,8 @@ msgid ""
 "At the moment, we don't have any official open positions. Please check back "
 "soon, though!"
 msgstr ""
+"Åu anda herhangi bir resmi aÃ§Ä±k pozisyonumuz yok. LÃ¼tfen kÄ±sa sÃ¼re 
sonra "
+"tekrar kontrol edin!"
 
 #: templates/jobs.html:18 templates/projects.html:5
 msgid "Previous Openings"

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

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

2019-04-11 Thread translation

commit afa4bb28691855c909295cd8686083c9386aa708
Author: Translation commit bot 
Date:   Thu Apr 11 19:49:49 2019 +

Update translations for torbutton-browseronboardingproperties
---
 tr/browserOnboarding.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/browserOnboarding.properties b/tr/browserOnboarding.properties
index 3df73bcac..0355a2a83 100644
--- a/tr/browserOnboarding.properties
+++ b/tr/browserOnboarding.properties
@@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=GÃ¼venlik
 onboarding.tour-tor-security=GÃ¼venlik
 onboarding.tour-tor-security.title=Deneyiminizi Ã¶zelleÅtirin.
 onboarding.tour-tor-security.description=Ek ayarlarÄ± kullanarak web 
tarayÄ±cÄ±nÄ±zÄ±n gÃ¼venliÄini arttÄ±rabilirsiniz. GÃ¼venlik DÃ¼zeyi AyarÄ±  
bilgisayarÄ±nÄ±za saldÄ±rmak iÃ§in kullanÄ±labilecek bileÅenleri engellemenizi 
saÄlar. SeÃ§eneklerinizi gÃ¶rebilmek iÃ§in aÅaÄÄ±ya tÄ±klayÄ±n.
-onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and 
HTTPS Everywhere are not included on the toolbar, but you can customize your 
toolbar to add them.
+onboarding.tour-tor-security.description-suffix=Not: VarsayÄ±lan olarak, 
NoScript ve HTTPS Everywhere araÃ§ Ã§ubuÄuna dahil edilmez, ancak araÃ§ 
Ã§ubuÄunu eklemek iÃ§in Ã¶zelleÅtirebilirsiniz.
 onboarding.tour-tor-security-level.button=GÃ¼venlik DÃ¼zeyinize BakÄ±n
 onboarding.tour-tor-security-level.next-button=Deneyim Ä°puÃ§larÄ±
 

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

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

2019-04-11 Thread translation

commit b64926926792c0ef0fa37422ec94e9e903a00157
Author: Translation commit bot 
Date:   Thu Apr 11 19:49:56 2019 +

Update translations for torbutton-browseronboardingproperties_completed
---
 tr/browserOnboarding.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/browserOnboarding.properties b/tr/browserOnboarding.properties
index 3df73bcac..0355a2a83 100644
--- a/tr/browserOnboarding.properties
+++ b/tr/browserOnboarding.properties
@@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=GÃ¼venlik
 onboarding.tour-tor-security=GÃ¼venlik
 onboarding.tour-tor-security.title=Deneyiminizi Ã¶zelleÅtirin.
 onboarding.tour-tor-security.description=Ek ayarlarÄ± kullanarak web 
tarayÄ±cÄ±nÄ±zÄ±n gÃ¼venliÄini arttÄ±rabilirsiniz. GÃ¼venlik DÃ¼zeyi AyarÄ±  
bilgisayarÄ±nÄ±za saldÄ±rmak iÃ§in kullanÄ±labilecek bileÅenleri engellemenizi 
saÄlar. SeÃ§eneklerinizi gÃ¶rebilmek iÃ§in aÅaÄÄ±ya tÄ±klayÄ±n.
-onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and 
HTTPS Everywhere are not included on the toolbar, but you can customize your 
toolbar to add them.
+onboarding.tour-tor-security.description-suffix=Not: VarsayÄ±lan olarak, 
NoScript ve HTTPS Everywhere araÃ§ Ã§ubuÄuna dahil edilmez, ancak araÃ§ 
Ã§ubuÄunu eklemek iÃ§in Ã¶zelleÅtirebilirsiniz.
 onboarding.tour-tor-security-level.button=GÃ¼venlik DÃ¼zeyinize BakÄ±n
 onboarding.tour-tor-security-level.next-button=Deneyim Ä°puÃ§larÄ±
 

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

[tor-commits] [translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

2019-04-11 Thread translation

commit 459529fdf3ad0189839b89ef8a6ba7602a983935
Author: Translation commit bot 
Date:   Thu Apr 11 19:48:11 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+tr.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 638008e61..877985b33 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -5,6 +5,7 @@
 # erinm, 2019
 # Emma Peel, 2019
 # ilkeryus , 2019
+# Arda BÃ¼yÃ¼kkaya , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-09 09:20+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: ilkeryus , 2019\n"
+"Last-Translator: Arda BÃ¼yÃ¼kkaya , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +69,7 @@ msgstr "Uygulama Ekleri"
 #: https//tb-manual.torproject.org/en-US/menu/
 #: (content/menu/contents+en-US.lrtopic.body)
 msgid "Becoming a Tor translator"
-msgstr ""
+msgstr "Tor tercÃ¼manÄ± olmak"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.title)

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

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-04-11 Thread translation

commit 97acf73e6bb7ceb927e9c6ecd5681d317fee8be3
Author: Translation commit bot 
Date:   Thu Apr 11 19:48:05 2019 +

Update translations for tbmanual-contentspot
---
 contents+tr.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+tr.po b/contents+tr.po
index 638008e61..877985b33 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -5,6 +5,7 @@
 # erinm, 2019
 # Emma Peel, 2019
 # ilkeryus , 2019
+# Arda BÃ¼yÃ¼kkaya , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-09 09:20+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: ilkeryus , 2019\n"
+"Last-Translator: Arda BÃ¼yÃ¼kkaya , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +69,7 @@ msgstr "Uygulama Ekleri"
 #: https//tb-manual.torproject.org/en-US/menu/
 #: (content/menu/contents+en-US.lrtopic.body)
 msgid "Becoming a Tor translator"
-msgstr ""
+msgstr "Tor tercÃ¼manÄ± olmak"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.title)

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-04-11 Thread translation

commit 2877699ed71b5891fe6380ad50ea10f1707cdcfb
Author: Translation commit bot 
Date:   Thu Apr 11 19:45:37 2019 +

Update translations for donatepages-messagespot
---
 locale/tr/LC_MESSAGES/messages.po | 29 -
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/locale/tr/LC_MESSAGES/messages.po 
b/locale/tr/LC_MESSAGES/messages.po
index 58a155920..662f01a14 100644
--- a/locale/tr/LC_MESSAGES/messages.po
+++ b/locale/tr/LC_MESSAGES/messages.po
@@ -4,7 +4,6 @@
 # escher , 2018
 # Hakan Y , 2018
 # psiphon3 , 2018
-# Arda BÃ¼yÃ¼kkaya , 2019
 # cenk y. , 2019
 # Lale FatoÅ TunÃ§man , 2019
 # Taha KaradoÄan , 2019
@@ -12,10 +11,11 @@
 # Kaya Zeren , 2019
 # erinm, 2019
 # Alperen KitapÃ§Ä± , 2019
+# Arda BÃ¼yÃ¼kkaya , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Alperen KitapÃ§Ä± , 2019\n"
+"Last-Translator: Arda BÃ¼yÃ¼kkaya , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -79,6 +79,11 @@ msgid ""
 "reliable source of funds to help us be nimble in an ever-changing privacy "
 "landscape."
 msgstr ""
+"ÃevrimiÃ§i olarak insanlarÄ±n gizliliÄini ve kimliÄini koruyan araÃ§lar "
+"saÄlamak, gÃ¶revimizde uyanÄ±k kalmak iÃ§in aylÄ±k baÄÄ±ÅÃ§Ä±lara - 
Gizlilik "
+"SavunucularÄ±na - ihtiyacÄ±mÄ±z var. Gizlilik SavunucularÄ±, her ay 
mÃ¼tevazÄ± bir"
+" miktar taahhÃ¼t ederler - sÃ¼rekli deÄiÅen bir gizlilik ortamÄ±nda bize "
+"ulaÅmamÄ±za yardÄ±mcÄ± olacak sabit, gÃ¼venilir bir fon kaynaÄÄ± 
oluÅtururlar."
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:105
 msgid ""
@@ -96,10 +101,13 @@ msgid ""
 "your monthly donation now and stand with the Tor Project at this critical "
 "time."
 msgstr ""
+"Sizin yardÄ±mÄ±nÄ±zla, Tor network herkesin eriÅebileceÄi hale 
getireceÄiz. "
+"Birlikte, evrensel mahremiyet hakkÄ± iÃ§in ayaÄa kalkacaÄÄ±z. LÃ¼tfen 
aylÄ±k "
+"baÄÄ±ÅÄ±nÄ±zÄ± Åimdi yapÄ±n ve bu kritik zamanda Tor Projesi'ne katÄ±lÄ±n."
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:115
 msgid "Want to make a one time donation instead?"
-msgstr ""
+msgstr "Bunun yerine bir kez baÄÄ±Å yapmak ister misiniz?"
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:122
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:102
@@ -227,7 +235,7 @@ msgstr "aylÄ±k"
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:284
 msgid "Monthly giving"
-msgstr ""
+msgstr "AylÄ±k baÄÄ±Å"
 
 #: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:34
 msgid "Processing Donation - Tor"
@@ -363,7 +371,7 @@ msgstr "Soyad"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:41
 msgid "Estimated Donation Date:"
-msgstr ""
+msgstr "Tahmini BaÄÄ±Å Tarihi:"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:46
 msgid "Email"
@@ -371,19 +379,19 @@ msgstr "E-posta"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:51
 msgid "Choose a Currency"
-msgstr ""
+msgstr "Para Birimi SeÃ§iniz"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:73
 msgid "Currency Amount"
-msgstr ""
+msgstr "DÃ¶viz tutarÄ±"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:80
 msgid "Report Donation"
-msgstr ""
+msgstr "BaÄÄ±Å Bildirimi"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:87
 msgid "Wallet Addresses"
-msgstr ""
+msgstr "CÃ¼zdan Adresleri"
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:34
 msgid "Tor Privacy Policy"
@@ -878,6 +886,9 @@ msgid ""
 "If you have any questions, or would like to donate a cryptocurrency not "
 "listed below, please email us at giv...@torproject.org."
 msgstr ""
+"Herhangi bir sorunuz varsa veya aÅaÄÄ±da listelenmeyen bir cryptocurrency "
+"parasÄ± baÄÄ±Ålamak istiyorsanÄ±z, lÃ¼tfen bize e-posta ile gÃ¶nderin "
+"giv...@torproject.org."
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:22
 msgid "See if your employer offers employee gift matching"

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

[tor-commits] [goptlib/master] Bug 28940: add support for LOG.

2019-04-11 Thread dcf

commit 350ea810838a99d9fc9bf7e3523fcc5635691eed
Author: David Fifield 
Date:   Thu Feb 7 19:56:13 2019 -0700

Bug 28940: add support for LOG.
---
 pt.go  |  65 +++
 pt_test.go | 128 +
 2 files changed, 193 insertions(+)

diff --git a/pt.go b/pt.go
index f7929e6..23893f4 100644
--- a/pt.go
+++ b/pt.go
@@ -24,6 +24,7 @@
 // conn, err := ln.AcceptSocks()
 // if err != nil {
 // if e, ok := err.(net.Error); ok && 
e.Temporary() {
+// pt.Log(pt.LogSeverityError, "accept 
error: " + err.Error())
 // continue
 // }
 // return err
@@ -83,6 +84,7 @@
 // if e, ok := err.(net.Error); ok && 
e.Temporary() {
 // continue
 // }
+// pt.Log(pt.LogSeverityError, "accept error: " + 
err.Error())
 // return err
 // }
 // go handler(conn)
@@ -347,6 +349,69 @@ func ProxyDone() {
fmt.Fprintf(Stdout, "PROXY DONE\n")
 }
 
+// Unexported type to represent log severities, preventing external callers 
from
+// inventing new severity strings that may violate quoting rules.
+//
+// pt-spec.txt section 3.3.4 specifies quoting for MESSAGE, but not for
+// SEVERITY, and the example shows an unquoted "SEVERITY=debug". While we know
+// tor's parser permits quoting of SEVERITY, it's not actually specified.
+// Therefore we we need to guard against callers passing a string that violates
+// the global protocol constraint of "any US-ASCII character but NUL or NL." So
+// here, we instantiate exactly the five supported severities, using a type 
that
+// cannot be constructed outside the package.
+type logSeverity struct {
+   string
+}
+
+// Severity levels for the Log function.
+var (
+   LogSeverityError   = logSeverity{"error"}
+   LogSeverityWarning = logSeverity{"warning"}
+   LogSeverityNotice  = logSeverity{"notice"}
+   LogSeverityInfo= logSeverity{"info"}
+   LogSeverityDebug   = logSeverity{"debug"}
+)
+
+// Encode a string according to the CString rules of section 2.1.1 in
+// control-spec.txt.
+// CString = DQUOTE *qcontent DQUOTE
+// "...in a CString, the escapes '\n', '\t', '\r', and the octal escapes '\0'
+// ... '\377' represent newline, tab, carriage return, and the 256 possible
+// octet values respectively."
+// RFC 2822 section 3.2.5 in turn defines what byte values we need to escape:
+// everything but
+// NO-WS-CTL / ; Non white space controls
+// %d33 /  ; The rest of the US-ASCII
+// %d35-91 /   ;  characters not including "\"
+// %d93-126;  or the quote character
+// Technically control-spec.txt requires us to escape the space character (32),
+// but it is an error in the spec: https://bugs.torproject.org/29432.
+//
+// We additionally need to ensure that whatever we return passes argIsSafe,
+// because strings encoded by this function are printed verbatim by Log.
+func encodeCString(s string) string {
+   result := bytes.NewBuffer([]byte{})
+   result.WriteByte('"')
+   for _, c := range []byte(s) {
+   if c == 32 || c == 33 || (35 <= c && c <= 91) || (93 <= c && c 
<= 126) {
+   result.WriteByte(c)
+   } else {
+   fmt.Fprintf(result, "\\%03o", c)
+   }
+   }
+   result.WriteByte('"')
+   return result.String()
+}
+
+// Emit a LOG message with the given severity (one of LogSeverityError,
+// LogSeverityWarning, LogSeverityNotice, LogSeverityInfo, or 
LogSeverityDebug).
+func Log(severity logSeverity, message string) {
+   // " contains the log message which can be a String or 
CString..."
+   // encodeCString always makes the string safe to emit; i.e., it
+   // satisfies argIsSafe.
+   line("LOG", "SEVERITY="+severity.string, 
"MESSAGE="+encodeCString(message))
+}
+
 // Get a pluggable transports version offered by Tor and understood by us, if
 // any. The only version we understand is "1". This function reads the
 // environment variable TOR_PT_MANAGED_TRANSPORT_VER.
diff --git a/pt_test.go b/pt_test.go
index 70f5533..d74d6d7 100644
--- a/pt_test.go
+++ b/pt_test.go
@@ -959,3 +959,131 @@ func TestMakeStateDir(t *testing.T) {
t.Errorf("MakeStateDir with a subdirectory of a file 
unexpectedly succeeded")
}
 }
+
+// Compare with unescape_string in tor's src/lib/encoding/cstring.c. That
+// function additionally allows hex escapes, but control-spec.txt's CString
+// doesn't say anything about that.
+func decodeCString(enc string) (string, error) {
+   var result bytes.Buffer
+   b := []byte(enc)
+   state := "^"
+

[tor-commits] [goptlib/master] ChangeLog for Log.

2019-04-11 Thread dcf

commit 781a46c66d2ddbc3509354ae7f1fccab74cb9927
Author: David Fifield 
Date:   Thu Apr 11 12:29:08 2019 -0600

ChangeLog for Log.
---
 ChangeLog | 5 +
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 38d63eb..2aae857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+== v1.1.0
+
+Added the Log function.
+https://bugs.torproject.org/28940
+
 == v1.0.0
 
 Changed the tag naming scheme to work better with Go modules.

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

[tor-commits] [tor/master] Fix SC2006 in minimize.sh

2019-04-11 Thread nickm

commit 0e0a0b9802e7e7bf192df9c93f257913e926033a
Author: rl1987 
Date:   Mon Apr 8 11:16:45 2019 +0300

Fix SC2006 in minimize.sh
---
 changes/ticket30079   | 3 +++
 src/test/fuzz/minimize.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changes/ticket30079 b/changes/ticket30079
new file mode 100644
index 0..56b88e7f5
--- /dev/null
+++ b/changes/ticket30079
@@ -0,0 +1,3 @@
+  o Code simplification and refactoring (shell scripts):
+- Fix shellcheck warning SC2006 in src/test/fuzz/minimize.sh. Resolves
+  issue 30079.
diff --git a/src/test/fuzz/minimize.sh b/src/test/fuzz/minimize.sh
index 87d3dda13..ce43812bb 100755
--- a/src/test/fuzz/minimize.sh
+++ b/src/test/fuzz/minimize.sh
@@ -7,7 +7,7 @@ if [ ! -d "$1" ] ; then
 exit 1
 fi
 
-which=`basename "$1"`
+which=$(basename "$1")
 
 mkdir "$1.out"
 afl-cmin -i "$1" -o "$1.out" -m none "./src/test/fuzz/fuzz-${which}"



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

[tor-commits] [tor/master] Add changes file

2019-04-11 Thread nickm

commit b2eced6c0747159ab7b3942a45c1a147a5ecfc96
Author: rl1987 
Date:   Wed Apr 3 18:05:23 2019 +0300

Add changes file
---
 changes/bug30002 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changes/bug30002 b/changes/bug30002
new file mode 100644
index 0..da61c9e4b
--- /dev/null
+++ b/changes/bug30002
@@ -0,0 +1,2 @@
+  o Code simplification and refactoring (shell scripts):
+- Fix shellcheck warnings in test_key_expiration.sh. Resolves issue 30002.



___
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 'tor-github/pr/887'

2019-04-11 Thread nickm

commit d549440124be04986cc7a2b8cb98bd878fca5532
Merge: f8dc935fb b2eced6c0
Author: Nick Mathewson 
Date:   Thu Apr 11 14:29:16 2019 -0400

Merge remote-tracking branch 'tor-github/pr/887'

 changes/bug30002|  2 ++
 src/test/test_key_expiration.sh | 14 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

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

[tor-commits] [tor/master] Fix SC2064 warning

2019-04-11 Thread nickm

commit 9e04a8722081cd761ee3a2e173b53c7859a8c916
Author: rl1987 
Date:   Wed Apr 3 17:58:05 2019 +0300

Fix SC2064 warning
---
 src/test/test_key_expiration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh
index 6e4991994..8614a4fa4 100755
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@ -60,7 +60,7 @@ if [ ! -d "$DATA_DIR" ]; then
   echo "Failure: mktemp invocation result doesn't point to directory" >&2
   exit 3
 fi
-trap "rm -rf '$DATA_DIR'" 0
+trap 'rm -rf "$DATA_DIR"' 0
 
 # Use an absolute path for this or Tor will complain
 DATA_DIR=$(cd "${DATA_DIR}" && pwd)



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

[tor-commits] [tor/master] Fix SC2086 warnings in test_key_expiration.sh

2019-04-11 Thread nickm

commit 9e0f0a565632327263c1c3466978f8bc5e759194
Author: rl1987 
Date:   Wed Apr 3 17:52:31 2019 +0300

Fix SC2086 warnings in test_key_expiration.sh
---
 src/test/test_key_expiration.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh
index cf6608634..5e89bbbd6 100755
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@ -6,7 +6,7 @@
 umask 077
 set -e
 
-if [ $# -eq 0 ] || [ ! -f ${1} ] || [ ! -x ${1} ]; then
+if [ $# -eq 0 ] || [ ! -f "${1}" ] || [ ! -x "${1}" ]; then
   if [ "$TESTING_TOR_BINARY" = "" ] ; then
 echo "Usage: ${0} PATH_TO_TOR [case-number]"
 exit 1
@@ -48,7 +48,7 @@ die() { echo "$1" >&2 ; exit 5; }
 check_dir() { [ -d "$1" ] || die "$1 did not exist"; }
 check_file() { [ -e "$1" ] || die "$1 did not exist"; }
 check_no_file() { [ -e "$1" ] && die "$1 was not supposed to exist" || true; }
-check_files_eq() { cmp "$1" "$2" || die "$1 and $2 did not match: `dump $1` vs 
`dump $2`"; }
+check_files_eq() { cmp "$1" "$2" || die "$1 and $2 did not match: `dump "$1"` 
vs `dump "$2"`"; }
 check_keys_eq() { check_files_eq "${SRC}/keys/${1}" "${ME}/keys/${1}"; }
 
 DATA_DIR=`mktemp -d -t tor_key_expiration_tests.XX`



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

[tor-commits] [tor/master] Fix SC2006 warnings

2019-04-11 Thread nickm

commit 700310df613e379dc1930917f0f8a25f0c894a52
Author: rl1987 
Date:   Wed Apr 3 17:56:52 2019 +0300

Fix SC2006 warnings
---
 src/test/test_key_expiration.sh | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh
index 5e89bbbd6..6e4991994 100755
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@ -13,7 +13,7 @@ if [ $# -eq 0 ] || [ ! -f "${1}" ] || [ ! -x "${1}" ]; then
   fi
 fi
 
-UNAME_OS=`uname -s | cut -d_ -f1`
+UNAME_OS=$(uname -s | cut -d_ -f1)
 if test "$UNAME_OS" = 'CYGWIN' || \
test "$UNAME_OS" = 'MSYS' || \
test "$UNAME_OS" = 'MINGW'; then
@@ -48,10 +48,10 @@ die() { echo "$1" >&2 ; exit 5; }
 check_dir() { [ -d "$1" ] || die "$1 did not exist"; }
 check_file() { [ -e "$1" ] || die "$1 did not exist"; }
 check_no_file() { [ -e "$1" ] && die "$1 was not supposed to exist" || true; }
-check_files_eq() { cmp "$1" "$2" || die "$1 and $2 did not match: `dump "$1"` 
vs `dump "$2"`"; }
+check_files_eq() { cmp "$1" "$2" || die "$1 and $2 did not match: $(dump "$1") 
vs $(dump "$2")"; }
 check_keys_eq() { check_files_eq "${SRC}/keys/${1}" "${ME}/keys/${1}"; }
 
-DATA_DIR=`mktemp -d -t tor_key_expiration_tests.XX`
+DATA_DIR=$(mktemp -d -t tor_key_expiration_tests.XX)
 if [ -z "$DATA_DIR" ]; then
   echo "Failure: mktemp invocation returned empty string" >&2
   exit 3
@@ -63,7 +63,7 @@ fi
 trap "rm -rf '$DATA_DIR'" 0
 
 # Use an absolute path for this or Tor will complain
-DATA_DIR=`cd "${DATA_DIR}" && pwd`
+DATA_DIR=$(cd "${DATA_DIR}" && pwd)
 
 touch "${DATA_DIR}/empty_torrc"
 



___
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 'tor-github/pr/913'

2019-04-11 Thread nickm

commit 9fabf104ed8163e6647a31d3f54aaf4eba5dacb0
Merge: d54944012 0e0a0b980
Author: Nick Mathewson 
Date:   Thu Apr 11 14:30:05 2019 -0400

Merge remote-tracking branch 'tor-github/pr/913'

 changes/ticket30079   | 3 +++
 src/test/fuzz/minimize.sh | 2 +-
 2 files changed, 4 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] Fix SC2015 warning

2019-04-11 Thread nickm

commit 4172b638b8221e2d56c20e2a408948977c68358a
Author: rl1987 
Date:   Wed Apr 3 18:03:34 2019 +0300

Fix SC2015 warning
---
 src/test/test_key_expiration.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh
index 8614a4fa4..1ed81c81c 100755
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@ -47,7 +47,7 @@ dump() { xxd -p "$1" | tr -d '\n '; }
 die() { echo "$1" >&2 ; exit 5; }
 check_dir() { [ -d "$1" ] || die "$1 did not exist"; }
 check_file() { [ -e "$1" ] || die "$1 did not exist"; }
-check_no_file() { [ -e "$1" ] && die "$1 was not supposed to exist" || true; }
+check_no_file() { if [ -e "$1" ]; then die "$1 was not supposed to exist"; fi }
 check_files_eq() { cmp "$1" "$2" || die "$1 and $2 did not match: $(dump "$1") 
vs $(dump "$2")"; }
 check_keys_eq() { check_files_eq "${SRC}/keys/${1}" "${ME}/keys/${1}"; }
 



___
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 'tor-github/pr/741'

2019-04-11 Thread nickm

commit f8dc935fb7f2d5fb2a5ec4224c7d99f0f177608e
Merge: 3c64cfe64 9b7cdd23d
Author: Nick Mathewson 
Date:   Thu Apr 11 14:27:06 2019 -0400

Merge remote-tracking branch 'tor-github/pr/741'

 doc/tor.1.txt  | 13 +++--
 src/config/torrc.sample.in | 21 -
 2 files changed, 23 insertions(+), 11 deletions(-)

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

[tor-commits] [tor/master] doc: update the man page and sample torrc for ExitRelay

2019-04-11 Thread nickm

commit 9b7cdd23deb5830cce794ce6e901b82fa094dd9f
Author: teor 
Date:   Thu Feb 28 11:22:20 2019 +1000

doc: update the man page and sample torrc for ExitRelay

We changed the default of ExitRelay in #21530 in 0.3.5.1-alpha, but
forgot to update the documentation.

Closes 29612.
---
 doc/tor.1.txt  | 13 +++--
 src/config/torrc.sample.in | 21 -
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 573fdf221..60997ad16 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1849,15 +1849,16 @@ is non-zero):
 [[ExitRelay]] **ExitRelay** **0**|**1**|**auto**::
 Tells Tor whether to run as an exit relay.  If Tor is running as a
 non-bridge server, and ExitRelay is set to 1, then Tor allows traffic to
-exit according to the ExitPolicy option (or the default ExitPolicy if
-none is specified). +
+exit according to the ExitPolicy option, the ReducedExitPolicy option,
+or the default ExitPolicy (if no other exit policy option is specified). +
  +
 If ExitRelay is set to 0, no traffic is allowed to
-exit, and the ExitPolicy option is ignored. +
+exit, and the ExitPolicy and ReducedExitPolicy options are ignored. +
  +
-If ExitRelay is set to "auto", then Tor behaves as if it were set to 1, but
-warns the user if this would cause traffic to exit.  In a future version,
-the default value will be 0. (Default: auto)
+If ExitRelay is set to "auto", then Tor checks the ExitPolicy and
+ReducedExitPolicy options. If either is set, Tor behaves as if ExitRelay
+were set to 1. If neither exit policy option is set, Tor behaves as if
+ExitRelay were set to 0. (Default: auto)
 
 [[ExitPolicy]] **ExitPolicy** __policy__,__policy__,__...__::
 Set an exit policy for this server. Each policy is of the form
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index 8d56b0896..c2ae707e9 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -1,5 +1,5 @@
 ## Configuration file for a typical Tor user
-## Last updated 22 December 2017 for Tor 0.3.2.8-rc.
+## Last updated 28 February 2019 for Tor 0.3.5.1-alpha.
 ## (may or may not work for much older or much newer versions of Tor.)
 ##
 ## Lines that begin with "## " try to explain what's going on. Lines
@@ -172,14 +172,25 @@
 ## Note: do not use MyFamily on bridge relays.
 #MyFamily $keyid,$keyid,...
 
-## Uncomment this if you do *not* want your relay to allow any exit traffic.
-## (Relays allow exit traffic by default.)
-#ExitRelay 0
+## Uncomment this if you want your relay to be an exit, with the default
+## exit policy (or whatever exit policy you set below).
+## (If ReducedExitPolicy or ExitPolicy are set, relays are exits.
+## If neither exit policy option is set, relays are non-exits.)
+#ExitRelay 1
 
 ## Uncomment this if you want your relay to allow IPv6 exit traffic.
-## (Relays only allow IPv4 exit traffic by default.)
+## You must also set ExitRelay, ReducedExitPolicy, or ExitPolicy to make your
+## relay into an exit.
+## (Relays do not allow any exit traffic by default.)
 #IPv6Exit 1
 
+## Uncomment this if you want your relay to be an exit, with a reduced set
+## of exit ports.
+#ReducedExitPolicy 1
+
+## Uncomment these lines if you want your relay to be an exit, with the
+## specified set of exit IPs and ports.
+##
 ## A comma-separated list of exit policies. They're considered first
 ## to last, and the first match wins.
 ##



___
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-60.6.1esr-8.5-1] Bug 27503: Disabling accessibility on Windows breaks screen readers

2019-04-11 Thread gk

commit f5f845f5fe14b5085f919ba46ec092b14c7fcb11
Author: Richard Pospesel 
Date:   Tue Apr 2 17:33:09 2019 -0700

Bug 27503: Disabling accessibility on Windows breaks screen readers

This patch is merely an application of the current accessibility fixes
in Mozilla 1520177 (
https://bugzilla.mozilla.org/show_bug.cgi?id=1520177 ). It replaces the
RT_MANIFEST symbol (defined in windows headers we don't include) with
the integer constant 24 to avoid includes confusion, updates the
IA2Marshall.rc file to explicitly include the dll manifest and it adds
some additional include directories previously excluded when building
with the mingw toolchain.

With this patch applied, the NVDA screen reader can now read webpage
contents, though navigation is still broken.
---
 accessible/interfaces/ia2/IA2Marshal.rc | 1 +
 toolkit/library/moz.build   | 2 +-
 toolkit/library/xulrunner.rc| 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/accessible/interfaces/ia2/IA2Marshal.rc 
b/accessible/interfaces/ia2/IA2Marshal.rc
index b120abce744c..4fd86ddd2ab5 100644
--- a/accessible/interfaces/ia2/IA2Marshal.rc
+++ b/accessible/interfaces/ia2/IA2Marshal.rc
@@ -3,3 +3,4 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 1 typelib IA2Typelib.tlb
+2 24 IA2Marshal.dll.manifest
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
old mode 100644
new mode 100755
index b0df6b98b91f..aeb850bdefba
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -45,7 +45,7 @@ def Libxul(name):
 if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['ACCESSIBILITY']:
 LOCAL_INCLUDES += ['!/accessible/interfaces/gecko/']
 
-if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['CC_TYPE'] not in ('clang', 
'gcc'):
+if CONFIG['OS_ARCH'] == 'WINNT':
 LOCAL_INCLUDES += [
 '/widget/windows',
 '/xpcom/base',
diff --git a/toolkit/library/xulrunner.rc b/toolkit/library/xulrunner.rc
index e2adca6e2f1f..29a20c3afc11 100755
--- a/toolkit/library/xulrunner.rc
+++ b/toolkit/library/xulrunner.rc
@@ -6,8 +6,8 @@
 #include "widget.rc"
 #ifdef ACCESSIBILITY
 1 typelib IGeckoCustom.tlb
-64 RT_MANIFEST IAccessible64.manifest
+64 24 IAccessible64.manifest
 #ifndef HAVE_64BIT_BUILD
-32 RT_MANIFEST IAccessible32.manifest
+32 24 IAccessible32.manifest
 #endif
 #endif

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-04-11 Thread translation

commit 4841926e898e29e2feaad26a78c0fa8851c7d1c7
Author: Translation commit bot 
Date:   Thu Apr 11 18:15:36 2019 +

Update translations for donatepages-messagespot
---
 locale/id/LC_MESSAGES/messages.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locale/id/LC_MESSAGES/messages.po 
b/locale/id/LC_MESSAGES/messages.po
index cd8557561..c1c9ece8c 100644
--- a/locale/id/LC_MESSAGES/messages.po
+++ b/locale/id/LC_MESSAGES/messages.po
@@ -5,13 +5,13 @@
 # Margaret Megan , 2018
 # Fery Setiawan , 2018
 # erinm, 2018
-# ical, 2019
 # Emma Peel, 2019
 # Muhammad Yusuf , 2019
+# ical, 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Muhammad Yusuf , 2019\n"
+"Last-Translator: ical, 2019\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
@@ -44,7 +44,7 @@ msgstr "Tor: Kuat Dalam Jumlah"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:52
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:75
 msgid "Donate to the Tor Project and protect the privacy of millions."
-msgstr ""
+msgstr "Berdonasi ke Tor Project dan lindungi privasi dari jutaan orang."
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:54
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:77

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

[tor-commits] [tor/release-0.4.0] More changelog edits (thanks, seborn!)

2019-04-11 Thread nickm

commit dac18e0b2085814c32070d603c4c94297ee778cc
Author: Nick Mathewson 
Date:   Thu Apr 11 14:04:02 2019 -0400

More changelog edits (thanks, seborn!)
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 70c040544..20a00899c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,7 +24,7 @@ Changes in version 0.4.0.4-rc - 2019-04-11
   o Minor features (circuit padding):
 - Stop warning about undefined behavior in the probability
   distribution tests. Float division by zero may technically be
-  undefined behaviour in C, but it's well-defined in IEEE 754.
+  undefined behavior in C, but it's well defined in IEEE 754.
   Partial backport of 29298. Closes ticket 29527; bugfix
   on 0.4.0.1-alpha.
 
@@ -87,7 +87,7 @@ Changes in version 0.4.0.4-rc - 2019-04-11
 
   o Minor bugfixes (circuitpadding testing):
 - Minor tweaks to avoid rare test failures related to timers and
-  monotime. Fixes bug 29500; bugfix on 0.4.0.1-alpha
+  monotonic time. Fixes bug 29500; bugfix on 0.4.0.1-alpha.
 
   o Minor bugfixes (directory authorities):
 - Actually include the bandwidth-file-digest line in directory

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

[tor-commits] [translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

2019-04-11 Thread translation

commit 320b76bdfd4536d95af6e48252fa7b204a9a9190
Author: Translation commit bot 
Date:   Thu Apr 11 17:47:59 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+id.po | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/contents+id.po b/contents+id.po
index d58595633..2cf2e0492 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -67,7 +67,7 @@ msgstr "Plugin"
 #: https//tb-manual.torproject.org/en-US/menu/
 #: (content/menu/contents+en-US.lrtopic.body)
 msgid "Becoming a Tor translator"
-msgstr ""
+msgstr "Menjadi Penerjemah Tor"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.title)
@@ -2188,6 +2188,7 @@ msgstr "# Mendaftar di Transifex"
 msgid ""
 "* Head over to the [Transifex signup page](https://transifex.com/signup/)."
 msgstr ""
+"* Pergi ke [halaman pendaftaran Transifex](https://transifex.com/signup/)."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2197,7 +2198,7 @@ msgstr "Masukkan informasi Anda pada kolom-kolom dan klik 
tombol 'Sign Up':"
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2234,6 +2235,8 @@ msgid ""
 "* You are now signed up! Go to the [Tor Transifex "
 "page](https://www.transifex.com/otf/torproject/)."
 msgstr ""
+"* Anda telah terdaftar! Pergi ke [halaman Transifex "
+"Tor](https://www.transifex.com/otf/torproject/)."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2274,6 +2277,10 @@ msgid ""
 "page](https://www.transifex.com/otf/torproject/) when you are ready to "
 "begin."
 msgstr ""
+"Setelah keanggotaan Anda diterima Anda dapat memulai menerjemahkan; ada "
+"daftar penerjemahan yang dibutuhkan pada [halaman Transifex "
+"Tor](https://www.transifex.com/otf/torproject/) saat Anda siap untuk "
+"memulai."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2281,6 +2288,8 @@ msgid ""
 "The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
 "also has information about the translations with bigger priority."
 msgstr ""
+"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) juga"
+" memiliki informasi tentang penerjemahan dengan prioritas yang lebih besar."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)

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

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-04-11 Thread translation

commit 327f2096b3f9a1922873befa38127b4557c5c6e4
Author: Translation commit bot 
Date:   Thu Apr 11 17:47:49 2019 +

Update translations for tbmanual-contentspot
---
 contents+id.po | 13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/contents+id.po b/contents+id.po
index d58595633..2cf2e0492 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -67,7 +67,7 @@ msgstr "Plugin"
 #: https//tb-manual.torproject.org/en-US/menu/
 #: (content/menu/contents+en-US.lrtopic.body)
 msgid "Becoming a Tor translator"
-msgstr ""
+msgstr "Menjadi Penerjemah Tor"
 
 #: https//tb-manual.torproject.org/en-US/about/
 #: (content/about/contents+en-US.lrtopic.title)
@@ -2188,6 +2188,7 @@ msgstr "# Mendaftar di Transifex"
 msgid ""
 "* Head over to the [Transifex signup page](https://transifex.com/signup/)."
 msgstr ""
+"* Pergi ke [halaman pendaftaran Transifex](https://transifex.com/signup/)."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2197,7 +2198,7 @@ msgstr "Masukkan informasi Anda pada kolom-kolom dan klik 
tombol 'Sign Up':"
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2234,6 +2235,8 @@ msgid ""
 "* You are now signed up! Go to the [Tor Transifex "
 "page](https://www.transifex.com/otf/torproject/)."
 msgstr ""
+"* Anda telah terdaftar! Pergi ke [halaman Transifex "
+"Tor](https://www.transifex.com/otf/torproject/)."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2274,6 +2277,10 @@ msgid ""
 "page](https://www.transifex.com/otf/torproject/) when you are ready to "
 "begin."
 msgstr ""
+"Setelah keanggotaan Anda diterima Anda dapat memulai menerjemahkan; ada "
+"daftar penerjemahan yang dibutuhkan pada [halaman Transifex "
+"Tor](https://www.transifex.com/otf/torproject/) saat Anda siap untuk "
+"memulai."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)
@@ -2281,6 +2288,8 @@ msgid ""
 "The [Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) "
 "also has information about the translations with bigger priority."
 msgstr ""
+"[Localization Lab Wiki](https://wiki.localizationlab.org/index.php/Tor) juga"
+" memiliki informasi tentang penerjemahan dengan prioritas yang lebih besar."
 
 #: https//tb-manual.torproject.org/en-US/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en-US.lrtopic.body)

___
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-60.6.1esr-8.5-1] Bug 29859: Disable HLS support for now

2019-04-11 Thread gk

commit 477af8c709134b57b530b4b94ce6b4c82cb46fce
Author: Georg Koppen 
Date:   Thu Mar 28 19:10:34 2019 +

Bug 29859: Disable HLS support for now
---
 mobile/android/app/000-tor-browser-android.js | 3 +++
 mobile/android/moz.configure  | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mobile/android/app/000-tor-browser-android.js 
b/mobile/android/app/000-tor-browser-android.js
index de51ec125406..b2ee9d0ded00 100644
--- a/mobile/android/app/000-tor-browser-android.js
+++ b/mobile/android/app/000-tor-browser-android.js
@@ -56,3 +56,6 @@ pref("general.useragent.updates.url", "");
 
 // Enable touch events on Android (highlighting text, etc)
 pref("dom.w3c_touch_events.enabled", 2);
+
+// No HLS support for now due to browser freezing, see: #29859.
+pref("media.hls.enabled", false);
diff --git a/mobile/android/moz.configure b/mobile/android/moz.configure
index 7033d4283211..d0347b5fe0b8 100644
--- a/mobile/android/moz.configure
+++ b/mobile/android/moz.configure
@@ -96,7 +96,7 @@ project_flag('MOZ_SWITCHBOARD',
 
 project_flag('MOZ_ANDROID_HLS_SUPPORT',
  help='Enable HLS (HTTP Live Streaming) support (currently using 
the ExoPlayer library)',
- default=True)
+ default=False)
 
 option(env='MOZ_ANDROID_ACTIVITY_STREAM',
help='Enable Activity Stream on Android (replacing the default 
HomePager)',

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

[tor-commits] [tor/release-0.4.0] Light editing on changelog

2019-04-11 Thread nickm

commit 5d83c34ef9dccab311b9991abc3904ab409c5cfc
Author: Nick Mathewson 
Date:   Thu Apr 11 10:26:41 2019 -0400

Light editing on changelog
---
 ChangeLog | 81 +--
 1 file changed, 37 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e7256ddc..70c040544 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Changes in version 0.4.0.4-rc - 2019-04-11
   Tor 0.4.0.4-rc is the first release candidate in its series; it fixes
-  several bugs from earlier versions, including some that had
-  affected stability.
+  several bugs from earlier versions, including some that had affected
+  stability, and one that prevented relays from working with NSS.
 
   o Major bugfixes (NSS, relay):
 - When running with NSS, disable TLS 1.2 ciphersuites that use
@@ -11,11 +11,15 @@ Changes in version 0.4.0.4-rc - 2019-04-11
   Fixes bug 29241; bugfix on 0.3.5.1-alpha.
 
   o Minor features (bandwidth authority):
-- Make bandwidth authorities to ignore relays that are reported in
-  the bandwidth file with the key-value "vote=0". This change allows
-  to report the relays that were not measured due some failure and
-  diagnose the reasons without the bandwidth being included in the
-  bandwidth authorities vote. Closes ticket 29806.
+- Make bandwidth authorities ignore relays that are reported in the
+  bandwidth file with the flag "vote=0". This change allows us to
+  report unmeasured relays for diagnostic reasons without including
+  their bandwidth in the bandwidth authorities' vote. Closes
+  ticket 29806.
+- When a directory authority is using a bandwidth file to obtain the
+  bandwidth values that will be included in the next vote, serve
+  this bandwidth file at /tor/status-vote/next/bandwidth. Closes
+  ticket 21377.
 
   o Minor features (circuit padding):
 - Stop warning about undefined behavior in the probability
@@ -26,15 +30,9 @@ Changes in version 0.4.0.4-rc - 2019-04-11
 
   o Minor features (continuous integration):
 - On Travis Rust builds, cleanup Rust registry and refrain from
-  caching target/ directory to speed up builds. Resolves
+  caching the "target/" directory to speed up builds. Resolves
   issue 29962.
 
-  o Minor features (dircache):
-- When a directory authority is using a bandwidth file to obtain the
-  bandwidth values that will be included in the next vote, serve
-  this bandwidth file at /tor/status-vote/next/bandwidth. Closes
-  ticket 21377.
-
   o Minor features (dormant mode):
 - Add a DormantCanceledByStartup option to tell Tor that it should
   treat a startup event as cancelling any previous dormant state.
@@ -58,17 +56,24 @@ Changes in version 0.4.0.4-rc - 2019-04-11
   the vulnerable code is only reached when directory authorities
   read bandwidth files, but bandwidth files come from a trusted
   source (usually the authorities themselves). Furthermore, the
-  issue is only exploitable in rare (non-POSIX) 32-bit architectures
+  issue is only exploitable in rare (non-POSIX) 32-bit architectures,
   which are not used by any of the current authorities. Fixes bug
   30040; bugfix on 0.3.5.1-alpha. Bug found and fixed by
   Tobias Stoeckmann.
+- Verify in more places that we are not about to create a buffer
+  with more than INT_MAX bytes, to avoid possible OOB access in the
+  event of bugs. Fixes bug 30041; bugfix on 0.2.0.16. Found and
+  fixed by Tobias Stoeckmann.
 
   o Minor bugfix (continuous integration):
-- Reset coverage state on disk after Travis CI has finished. This is
-  being done to prevent future gcda file merge errors which causes
-  the test suite for the process subsystem to fail. The process
-  subsystem was introduced in 0.4.0.1-alpha. Fixes bug 29036; bugfix
+- Reset coverage state on disk after Travis CI has finished. This
+  should prevent future coverage merge errors from causing the test
+  suite for the "process" subsystem to fail. The process subsystem
+  was introduced in 0.4.0.1-alpha. Fixes bug 29036; bugfix
   on 0.2.9.15.
+- Terminate test-stem if it takes more than 9.5 minutes to run.
+  (Travis terminates the job after 10 minutes of no output.)
+  Diagnostic for 29437. Fixes bug 30011; bugfix on 0.3.5.4-alpha.
 
   o Minor bugfixes (bootstrap reporting):
 - During bootstrap reporting, correctly distinguish pluggable
@@ -80,25 +85,14 @@ Changes in version 0.4.0.4-rc - 2019-04-11
   29824; bugfix on 0.3.1.1-alpha. This is Coverity warning
   CID 1444119.
 
-  o Minor bugfixes (CI):
-- Terminate test-stem if it takes more than 9.5 minutes to run.
-  (Travis terminates the job after 10 minutes of no output.)
-  Diagnostic for 29437. Fixes bug 30011; bugfix on 0.3.5.4-alpha.
-
   o Minor bugfixes (circuitpadding testing):
-- Minor tweaks to

[tor-commits] [snowflake/master] Moved data channel timeout to constant

2019-04-11 Thread cohosh

commit 62fddab153019ac7e5d7efd1d327b20aede921c3
Author: Cecylia Bocovich 
Date:   Fri Apr 5 10:40:11 2019 -0400

Moved data channel timeout to constant
---
 proxy-go/snowflake.go | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go
index 1c24e47..50c20a5 100644
--- a/proxy-go/snowflake.go
+++ b/proxy-go/snowflake.go
@@ -26,6 +26,9 @@ const defaultBrokerURL = 
"https://snowflake-broker.bamsoftware.com/;
 const defaultRelayURL = "wss://snowflake.bamsoftware.com/"
 const defaultSTUNURL = "stun:stun.l.google.com:19302"
 const pollInterval = 5 * time.Second
+//amount of time after sending an SDP answer before the proxy assumes the
+//client is not going to connect
+const dataChannelTimeout = time.Minute
 
 var brokerURL *url.URL
 var relayURL string
@@ -330,7 +333,7 @@ func makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescription, config *webrtc.
// advanced to PeerConnectionStateConnected in this time,
// destroy the peer connection and return the token.
go func() {
-   <-time.After(time.Minute)
+   <-time.After(dataChannelTimeout)
if pc.ConnectionState() != webrtc.PeerConnectionStateConnected {
log.Println("Timed out waiting for client to open data 
cannel.")
pc.Destroy()



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

[tor-commits] [snowflake/master] Merge branch 'deadlock'

2019-04-11 Thread cohosh

commit 6399ef9d4fa7d1dced903b43f329a43d3a80dfc7
Merge: 3eb9064 62fddab
Author: Cecylia Bocovich 
Date:   Thu Apr 11 09:57:38 2019 -0400

Merge branch 'deadlock'

 proxy-go/snowflake.go | 57 +--
 1 file changed, 32 insertions(+), 25 deletions(-)

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

[tor-commits] [snowflake/master] Fix for proxy deadlock bug

2019-04-11 Thread cohosh

commit c28c8ca489633aae2d9b9dbea0e781ca5e44cc66
Author: Cecylia Bocovich 
Date:   Sat Mar 30 12:19:29 2019 -0400

Fix for proxy deadlock bug

This is a fix for the proxy-go deadlock bug (ticket #25688). The
assumption that OnIceComplete is always followed by a successful
connection where OnDataChannel has been called turns out not to occur in
practice. OnICEComplete looks like it is being deprecated in other
libraries anyway, so it's safer to just remove it.
---
 proxy-go/snowflake.go | 42 --
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go
index 2e8fe20..aeb9f51 100644
--- a/proxy-go/snowflake.go
+++ b/proxy-go/snowflake.go
@@ -259,8 +259,6 @@ func datachannelHandler(conn *webRTCConn, remoteAddr 
net.Addr) {
 // Installs an OnDataChannel callback that creates a webRTCConn and passes it 
to
 // datachannelHandler.
 func makePeerConnectionFromOffer(sdp *webrtc.SessionDescription, config 
*webrtc.Configuration) (*webrtc.PeerConnection, error) {
-   errChan := make(chan error)
-   answerChan := make(chan struct{})
 
pc, err := webrtc.NewPeerConnection(config)
if err != nil {
@@ -269,9 +267,6 @@ func makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescription, config *webrtc.
pc.OnNegotiationNeeded = func() {
panic("OnNegotiationNeeded")
}
-   pc.OnIceComplete = func() {
-   answerChan <- struct{}{}
-   }
pc.OnDataChannel = func(dc *webrtc.DataChannel) {
log.Println("OnDataChannel")
 
@@ -310,30 +305,25 @@ func makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescription, config *webrtc.
}
log.Println("sdp offer successfully received.")
 
-   go func() {
-   log.Println("Generating answer...")
-   answer, err := pc.CreateAnswer() // blocking
-   if err != nil {
-   errChan <- err
-   return
-   }
-   err = pc.SetLocalDescription(answer)
-   if err != nil {
-   errChan <- err
-   return
-   }
-   }()
+   log.Println("Generating answer...")
+   answer, err := pc.CreateAnswer()
+// blocks on ICE gathering. we need to add a timeout if needed
+// not putting this in a separate go routine, because we need
+// SetLocalDescription(answer) to be called before sendAnswer
+   if err != nil {
+   pc.Destroy()
+   return nil, err
+   }
 
-   // Wait until answer is ready.
-   select {
-   case err = <-errChan:
+   if answer == nil {
+   pc.Destroy()
+   return nil, fmt.Errorf("Failed gathering ICE candidates.")
+   }
+
+   err = pc.SetLocalDescription(answer)
+   if err != nil {
pc.Destroy()
return nil, err
-   case _, ok := <-answerChan:
-   if !ok {
-   pc.Destroy()
-   return nil, fmt.Errorf("Failed gathering ICE 
candidates.")
-   }
}
return pc, nil
 }



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

[tor-commits] [snowflake/master] Added check to see if peer connection succeeded

2019-04-11 Thread cohosh

commit 08f5205461573bf8a6e8961540ac620865a3b45c
Author: Cecylia Bocovich 
Date:   Wed Apr 3 15:59:47 2019 -0400

Added check to see if peer connection succeeded

This is related to the proxy-go deadlock bug #25688. If a client doesn't
do anything with the SDP answer, a token will get lost. Added a timeout
after a minute that checks the PeerConnection state and destroys the
peer connection and returns a token if did not yet succeed
---
 proxy-go/snowflake.go | 20 +---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/proxy-go/snowflake.go b/proxy-go/snowflake.go
index aeb9f51..1c24e47 100644
--- a/proxy-go/snowflake.go
+++ b/proxy-go/snowflake.go
@@ -307,9 +307,9 @@ func makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescription, config *webrtc.
 
log.Println("Generating answer...")
answer, err := pc.CreateAnswer()
-// blocks on ICE gathering. we need to add a timeout if needed
-// not putting this in a separate go routine, because we need
-// SetLocalDescription(answer) to be called before sendAnswer
+   // blocks on ICE gathering. we need to add a timeout if needed
+   // not putting this in a separate go routine, because we need
+   // SetLocalDescription(answer) to be called before sendAnswer
if err != nil {
pc.Destroy()
return nil, err
@@ -325,6 +325,20 @@ func makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescription, config *webrtc.
pc.Destroy()
return nil, err
}
+
+   // Set a timeout on peerconnection. If the connection state has not
+   // advanced to PeerConnectionStateConnected in this time,
+   // destroy the peer connection and return the token.
+   go func() {
+   <-time.After(time.Minute)
+   if pc.ConnectionState() != webrtc.PeerConnectionStateConnected {
+   log.Println("Timed out waiting for client to open data 
cannel.")
+   pc.Destroy()
+   retToken()
+   }
+
+   }()
+
return pc, nil
 }
 



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

[tor-commits] [tor-browser-build/master] Bug 28622: Update Tor Browser icon for Android

2019-04-11 Thread gk

commit 300c55e5e0cf8e24f49959eababd2c7d9fc056ad
Author: Georg Koppen 
Date:   Wed Mar 20 11:11:39 2019 +

Bug 28622: Update Tor Browser icon for Android
---
 projects/firefox/config  | 6 +++---
 projects/firefox/mozconfig-android-armv7 | 1 -
 projects/firefox/mozconfig-android-x86   | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 679aaee..bd09c5f 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -12,7 +12,7 @@ var:
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 8.5
   torbrowser_update_channel: alpha
-  branding_directory: browser/branding/alpha
+  branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE 
%]browser[% END %]/branding/alpha'
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
 - build-essential
@@ -44,14 +44,14 @@ targets:
   release:
 var:
   torbrowser_update_channel: release
-  branding_directory: browser/branding/official
+  branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE 
%]browser[% END %]/branding/official'
 
   nightly:
 git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% 
c("var/torbrowser_branch") %]-1'
 tag_gpg_id: 0
 var:
   torbrowser_update_channel: default
-  branding_directory: browser/branding/nightly
+  branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE 
%]browser[% END %]/branding/nightly'
 
   android:
 var:
diff --git a/projects/firefox/mozconfig-android-armv7 
b/projects/firefox/mozconfig-android-armv7
index 8cfcc60..dfa3aaf 100644
--- a/projects/firefox/mozconfig-android-armv7
+++ b/projects/firefox/mozconfig-android-armv7
@@ -11,7 +11,6 @@ ac_add_options 
--with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
 ac_add_options 
--with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options 
--with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle
 ac_add_options --with-android-version=16
-ac_add_options --with-branding=mobile/android/branding/torbrowser
 
 # Android NDK does not contain llvm-config so set clang path in options
 ac_add_options 
--with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/arm/lib64
diff --git a/projects/firefox/mozconfig-android-x86 
b/projects/firefox/mozconfig-android-x86
index 1fe0b93..defe5c3 100644
--- a/projects/firefox/mozconfig-android-x86
+++ b/projects/firefox/mozconfig-android-x86
@@ -11,7 +11,6 @@ ac_add_options 
--with-android-ndk=/var/tmp/dist/android-toolchain/android-ndk
 ac_add_options 
--with-android-sdk=/var/tmp/dist/android-toolchain/android-sdk-linux
 ac_add_options 
--with-gradle=/var/tmp/dist/android-toolchain/gradle/gradle-4.1/bin/gradle
 ac_add_options --with-android-version=16
-ac_add_options --with-branding=mobile/android/branding/torbrowser
 
 # Android NDK does not contain llvm-config so set clang path in options
 ac_add_options 
--with-libclang-path=/var/tmp/dist/android-toolchain/android-ndk/x86/lib64



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

[tor-commits] [tor-browser-build/master] Merge branch 'bug_28622_v2'

2019-04-11 Thread gk

commit bfc677fcd93dc80c062a0dfe3e93115808f09480
Merge: 3ba2100 300c55e
Author: Georg Koppen 
Date:   Thu Apr 11 13:57:29 2019 +

Merge branch 'bug_28622_v2'

 projects/firefox/config  | 6 +++---
 projects/firefox/mozconfig-android-armv7 | 1 -
 projects/firefox/mozconfig-android-x86   | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

___
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-60.6.1esr-8.5-1] fixup! Bug 28622: Update Tor Browser icon for mobile

2019-04-11 Thread gk

commit 80e82b14804f677dd89a63a79d42f420ab9ccb7d
Author: Georg Koppen 
Date:   Wed Apr 10 20:29:15 2019 +

fixup! Bug 28622: Update Tor Browser icon for mobile
---
 mobile/android/branding/alpha/locales/en-US/brand.dtd   | 8 
 mobile/android/branding/alpha/locales/en-US/brand.properties| 4 ++--
 mobile/android/branding/nightly/locales/en-US/brand.dtd | 8 
 mobile/android/branding/nightly/locales/en-US/brand.properties  | 4 ++--
 mobile/android/branding/official/locales/en-US/brand.dtd| 8 
 mobile/android/branding/official/locales/en-US/brand.properties | 4 ++--
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/mobile/android/branding/alpha/locales/en-US/brand.dtd 
b/mobile/android/branding/alpha/locales/en-US/brand.dtd
index c92ea3503046..01346be36a7c 100644
--- a/mobile/android/branding/alpha/locales/en-US/brand.dtd
+++ b/mobile/android/branding/alpha/locales/en-US/brand.dtd
@@ -2,8 +2,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-
-
-
+
+
+
 
-
+
diff --git a/mobile/android/branding/alpha/locales/en-US/brand.properties 
b/mobile/android/branding/alpha/locales/en-US/brand.properties
index d06053614729..12ebf8a5d205 100644
--- a/mobile/android/branding/alpha/locales/en-US/brand.properties
+++ b/mobile/android/branding/alpha/locales/en-US/brand.properties
@@ -2,5 +2,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Nightly
-brandFullName=Mozilla Nightly
+brandShortName=Tor Browser
+brandFullName=Tor Browser for Android
diff --git a/mobile/android/branding/nightly/locales/en-US/brand.dtd 
b/mobile/android/branding/nightly/locales/en-US/brand.dtd
index c92ea3503046..01346be36a7c 100644
--- a/mobile/android/branding/nightly/locales/en-US/brand.dtd
+++ b/mobile/android/branding/nightly/locales/en-US/brand.dtd
@@ -2,8 +2,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-
-
-
+
+
+
 
-
+
diff --git a/mobile/android/branding/nightly/locales/en-US/brand.properties 
b/mobile/android/branding/nightly/locales/en-US/brand.properties
index d06053614729..12ebf8a5d205 100644
--- a/mobile/android/branding/nightly/locales/en-US/brand.properties
+++ b/mobile/android/branding/nightly/locales/en-US/brand.properties
@@ -2,5 +2,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Nightly
-brandFullName=Mozilla Nightly
+brandShortName=Tor Browser
+brandFullName=Tor Browser for Android
diff --git a/mobile/android/branding/official/locales/en-US/brand.dtd 
b/mobile/android/branding/official/locales/en-US/brand.dtd
index 59009128a273..01346be36a7c 100644
--- a/mobile/android/branding/official/locales/en-US/brand.dtd
+++ b/mobile/android/branding/official/locales/en-US/brand.dtd
@@ -2,8 +2,8 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-
-
-
+
+
+
 
-
+
diff --git a/mobile/android/branding/official/locales/en-US/brand.properties 
b/mobile/android/branding/official/locales/en-US/brand.properties
index d0203e35a492..12ebf8a5d205 100644
--- a/mobile/android/branding/official/locales/en-US/brand.properties
+++ b/mobile/android/branding/official/locales/en-US/brand.properties
@@ -2,5 +2,5 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-brandShortName=Firefox
-brandFullName=Mozilla Firefox
+brandShortName=Tor Browser
+brandFullName=Tor Browser for Android

___
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-60.6.1esr-8.5-1] Bug 28622: Update Tor Browser icon for mobile

2019-04-11 Thread gk

commit 099b6fcae28c60e96e7c24fd54ca7da14b00510f
Author: Georg Koppen 
Date:   Thu Mar 28 15:12:37 2019 +

Bug 28622: Update Tor Browser icon for mobile

We follow the desktop layout by providing icons for stable, alpha, and
nightly versions in the official, alpha, and nightly branding
directories, replacing related Firefox icons.

Moreover, this patch adjusts the displayed app name as well according
to the respective Tor Browser flavor being used.

There is no drawable-mdpi directory in Fennec anymore. Thus, we won't
ship new icons for that either and we remove the old torbrowser branding
directory and contents as those are not needed for the new layout.

At some point we could do a proper clean-up of icons we actually don't
need. For instance, right now we still need to ship the
firstrun_welcome.png icon from Fennec's onboarding because otherwise
compilation breaks, even though we have our own, Fennec unrelated
onboarding. But that's part of a different ticket.
---
 .../branding/{torbrowser => alpha}/configure.sh |   2 +-
 mobile/android/branding/alpha/content/about.png | Bin 0 -> 30131 bytes
 mobile/android/branding/alpha/content/favicon32.png | Bin 0 -> 1761 bytes
 mobile/android/branding/alpha/content/favicon64.png | Bin 0 -> 4950 bytes
 .../branding/{torbrowser => alpha}/content/jar.mn   |   2 +-
 .../{torbrowser/locales => alpha/content}/moz.build |   4 ++--
 .../{torbrowser => alpha}/locales/en-US/brand.dtd   |   8 
 .../locales/en-US/brand.properties} |   3 ++-
 .../branding/{torbrowser => alpha}/locales/jar.mn   |   2 +-
 .../{torbrowser/content => alpha/locales}/moz.build |   4 ++--
 .../branding/{torbrowser => alpha}/moz.build|   2 +-
 .../branding/alpha/res/drawable-hdpi/icon.png   | Bin 0 -> 6007 bytes
 .../branding/alpha/res/drawable-hdpi/large_icon.png | Bin 0 -> 15169 bytes
 .../res/drawable-nodpi/figure_experience.png| Bin
 .../res/drawable-nodpi/figure_network.png   | Bin
 .../res/drawable-nodpi/figure_onion.png | Bin
 .../res/drawable-nodpi/figure_privacy.png   | Bin
 .../res/drawable-nodpi/figure_security.png  | Bin
 .../res/drawable-nodpi/figure_welcome.png   | Bin
 .../alpha/res/drawable-nodpi/firstrun_welcome.png   | Bin 0 -> 50140 bytes
 .../drawable-nodpi/home_tab_menu_strip_tor.9.png| Bin
 .../branding/alpha/res/drawable-xhdpi/icon.png  | Bin 0 -> 8778 bytes
 .../alpha/res/drawable-xhdpi/large_icon.png | Bin 0 -> 22987 bytes
 .../branding/alpha/res/drawable-xxhdpi/icon.png | Bin 0 -> 16140 bytes
 .../alpha/res/drawable-xxhdpi/large_icon.png| Bin 0 -> 41886 bytes
 .../branding/alpha/res/drawable-xxxhdpi/icon.png| Bin 0 -> 24683 bytes
 mobile/android/branding/nightly/configure.sh|  10 --
 .../android/branding/nightly/content/favicon32.png  | Bin 2020 -> 1928 bytes
 .../android/branding/nightly/content/favicon64.png  | Bin 5152 -> 5398 bytes
 .../branding/nightly/res/drawable-hdpi/icon.png | Bin 6307 -> 6578 bytes
 .../nightly/res/drawable-hdpi/large_icon.png| Bin 14582 -> 17085 bytes
 .../res/drawable-nodpi/figure_experience.png| Bin 0 -> 44299 bytes
 .../nightly/res/drawable-nodpi/figure_network.png   | Bin 0 -> 70302 bytes
 .../nightly/res/drawable-nodpi/figure_onion.png | Bin 0 -> 139952 bytes
 .../nightly/res/drawable-nodpi/figure_privacy.png   | Bin 0 -> 61696 bytes
 .../nightly/res/drawable-nodpi/figure_security.png  | Bin 0 -> 52021 bytes
 .../nightly/res/drawable-nodpi/figure_welcome.png   | Bin 0 -> 83798 bytes
 .../drawable-nodpi/home_tab_menu_strip_tor.9.png| Bin 0 -> 126 bytes
 .../branding/nightly/res/drawable-xhdpi/icon.png| Bin 9490 -> 9884 bytes
 .../nightly/res/drawable-xhdpi/large_icon.png   | Bin 20843 -> 26206 bytes
 .../branding/nightly/res/drawable-xxhdpi/icon.png   | Bin 16480 -> 18335 bytes
 .../nightly/res/drawable-xxhdpi/large_icon.png  | Bin 36066 -> 49974 bytes
 .../branding/nightly/res/drawable-xxxhdpi/icon.png  | Bin 24541 -> 28434 bytes
 mobile/android/branding/official/configure.sh   |   7 ++-
 .../android/branding/official/content/favicon32.png | Bin 2240 -> 2018 bytes
 .../android/branding/official/content/favicon64.png | Bin 5324 -> 5527 bytes
 .../branding/official/res/drawable-hdpi/icon.png| Bin 6136 -> 6634 bytes
 .../official/res/drawable-hdpi/large_icon.png   | Bin 14818 -> 17467 bytes
 .../res/drawable-nodpi/figure_experience.png| Bin 0 -> 44299 bytes
 .../official/res/drawable-nodpi/figure_network.png  | Bin 0 -> 70302 bytes
 .../official/res/drawable-nodpi/figure_onion.png| Bin 0 -> 139952 bytes
 .../official/res/drawable-nodpi/figure_privacy.png  | Bin 0 -> 61696 bytes
 .../official/res/drawable-nodpi/figure_security.png | Bin 0 -> 52021 bytes
 .../official/res/drawable-nodpi/figure_welcome.png  | Bin 0 -> 83798 bytes

[tor-commits] [tor-browser/tor-browser-60.6.1esr-8.5-1] Bug 29238 - Prevent crash on Android after update

2019-04-11 Thread gk

commit bfa54eb8ac5dc923527f07e48d0a390314991fd3
Author: Matthew Finkel 
Date:   Fri Mar 22 16:24:09 2019 +

Bug 29238 - Prevent crash on Android after update
---
 mobile/android/base/AndroidManifest.xml.in | 8 
 1 file changed, 8 deletions(-)

diff --git a/mobile/android/base/AndroidManifest.xml.in 
b/mobile/android/base/AndroidManifest.xml.in
index 01b23d22a19b..c9a65da1ea1f 100644
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -415,14 +415,6 @@
 android:name="org.mozilla.gecko.cleanup.FileCleanupService">
 
 
-
-
-
-
-
-
 

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

[tor-commits] [translation/support-portal] Update translations for support-portal

2019-04-11 Thread translation

commit bf44af86672752ff7c10ab2a4635cd5c51775e89
Author: Translation commit bot 
Date:   Thu Apr 11 13:50:58 2019 +

Update translations for support-portal
---
 contents+el.po | 5 +
 1 file changed, 5 insertions(+)

diff --git a/contents+el.po b/contents+el.po
index 876ec3c07..dccf4b474 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -1096,6 +1096,8 @@ msgid ""
 "If you need other bridges, you can get them at our [Bridges "
 "website](https://bridges.torproject.org/)."
 msgstr ""
+"ÎÎ½ ÏÏÎµÎ¹Î¬Î¶ÎµÏÏÎµ Î¬Î»Î»ÎµÏ Î³ÎÏÏÏÎµÏ, Î¼ÏÎ¿ÏÎµÎ¯ÏÎµ Î½Î± 
ÏÎ¹Ï Î±ÏÎ¿ÎºÏÎ®ÏÎµÏÎµ ÏÏÎ·Î½ [ÎÏÏÎ¿ÏÎµÎ»Î¯Î´Î± "
+"ÎÎµÏÏÏÏÎ½](https://bridges.torproject.org/) Î¼Î±Ï."
 
 #: https//support.torproject.org/tbb/tbb-19/
 #: (content/tbb/tbb-19/contents+en.lrquestion.description)
@@ -1190,6 +1192,9 @@ msgid ""
 "If this doesn't fix the problem, see the Troubleshooting page on the [Tor "
 "Browser manual](https://tb-manual.torproject.org/en-US/troubleshooting)."
 msgstr ""
+"ÎÎ½ Î±ÏÏÏ Î´ÎµÎ½ Î´Î¹Î¿ÏÎ¸ÏÏÎµÎ¹ ÏÎ¿ ÏÏÏÎ²Î»Î·Î¼Î±, 
Î±Î½Î±ÏÏÎÎ¾ÏÎµ ÏÏÎ· ÏÎµÎ»Î¯Î´Î± Î±Î½ÏÎ¹Î¼ÎµÏÏÏÎ¹ÏÎ·Ï "
+"ÏÏÎ¿Î²Î»Î·Î¼Î¬ÏÏÎ½ ÏÏÎ¿ [ÎµÎ³ÏÎµÎ¹ÏÎ¯Î´Î¹Î¿ ÏÎ¿Ï Tor 
Browser](https://tb-;
+"manual.torproject.org/el/troubleshooting)."
 
 #: https//support.torproject.org/tbb/tbb-21/
 #: (content/tbb/tbb-21/contents+en.lrquestion.title)

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

[tor-commits] [translation/support-portal] Update translations for support-portal

2019-04-11 Thread translation

commit e3fa1cc67099fa4fb8574cc794710f3a82f6f116
Author: Translation commit bot 
Date:   Thu Apr 11 13:20:52 2019 +

Update translations for support-portal
---
 contents+el.po | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/contents+el.po b/contents+el.po
index 55e968354..876ec3c07 100644
--- a/contents+el.po
+++ b/contents+el.po
@@ -148,6 +148,10 @@ msgid ""
 "Browser](https://www.torproject.org/download) and then using it to navigate "
 "to the blocked site will allow access."
 msgstr ""
+"Î¤Î¹Ï ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ¿ÏÎÏ, Î±ÏÎ»ÏÏ 
ÎºÎ±ÏÎµÎ²Î¬Î¶Î¿Î½ÏÎ±Ï ÏÎ¿ [Tor "
+"Browser](https://www.torproject.org/download) ÎºÎ±Î¹ 
ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹ÏÎ½ÏÎ±Ï ÏÎ¿ Î³Î¹Î± Î½Î± "
+"ÎµÏÎ¹ÏÎºÎµÏÏÎ¿ÏÎ½ ÏÎ·Î½ Î¼ÏÎ»Î¿ÎºÎ±ÏÎ¹ÏÎ¼ÎÎ½Î· Î¹ÏÏÎ¿ÏÎµÎ»Î¯Î´Î± 
Î¸Î± ÏÎ¿ÏÏ ÎµÏÎ¹ÏÏÎÏÎµÎ¹ Î½Î± ÎÏÎ¿ÏÎ½ "
+"ÏÏÏÏÎ²Î±ÏÎ·."
 
 #: https//support.torproject.org/faq/faq-2/
 #: (content/faq/faq-2/contents+en.lrquestion.description)
@@ -440,7 +444,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpg.exe --fingerprint 0x4E2C6E8793298290"
-msgstr ""
+msgstr "gpg.exe --fingerprint 0x4E2C6E8793298290"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -617,11 +621,12 @@ msgstr ""
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpg --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290"
 msgstr ""
+"gpg --keyserver pool.sks-keyservers.net --recv-keys 0x4E2C6E8793298290"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid "gpg --fingerprint 0x4E2C6E8793298290"
-msgstr ""
+msgstr "gpg --fingerprint 0x4E2C6E8793298290"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1100,6 +1105,8 @@ msgid ""
 "For more information about bridges, see the [Tor Browser manual](https://tb-;
 "manual.torproject.org/bridges)."
 msgstr ""
+"ÎÎ¹Î± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎµÏ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¯ÎµÏ ÏÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ 
ÏÎ¹Ï Î³ÎÏÏÏÎµÏ, Î´ÎµÎ¯ÏÎµ ÏÎ¿ [ÎµÎ³ÏÎµÎ¹ÏÎ¯Î´Î¹Î¿ "
+"ÏÎ¿Ï Tor Browser](https://tb-manual.torproject.org/bridges)."
 
 #: https//support.torproject.org/tbb/tbb-2/
 #: (content/tbb/tbb-2/contents+en.lrquestion.title)

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-04-11 Thread translation

commit 41fa477a0da01c5a241fe2e4fc327c139a04a9ce
Author: Translation commit bot 
Date:   Thu Apr 11 13:15:37 2019 +

Update translations for donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 20 
 1 file changed, 20 insertions(+)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index e1d0da638..8834cc519 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -72,6 +72,12 @@ msgid ""
 "reliable source of funds to help us be nimble in an ever-changing privacy "
 "landscape."
 msgstr ""
+"á©ááá ááá¢áá áá¡áááá áááá 
á§áááááááá£á áá á¨ááááá¬áá áááááá¡ 
â ááá ááá£ááááá¡ áá£á¨ááááá¡ â "
+"á áá áá£ááá á¤á®ááááá ááá§áá 
á©áááá áááááá¡, á®ááá®áá¡áááá¡ 
á¡ááááááá á¡áá¨á£áááááááá¡ "
+"ááá¬áááááá¡áááá¡, ááá ááá 
áááááªáááááá¡á áá áááááááá¡ 
ááá£ááá¦áááááááááá¡ááá "
+"ááá¡ááªáááá. ááá ááá£ááááá¡ 
áá£á¨ááááá, á§áááááááá£á á áááá 
á«ááááá£áá á¨áááá¢áááááá, "
+"á¥ááááá áá¢áááªá, á¡áááááá 
á¨áááá¡ááááá¡ á¬á§áá áá¡, á ááááááª 
áááá®ááá ááá á¡á¬á áá¤áá ááá£á¬á§áá"
+" á¤áá®á áªááááááááá¡, ááá ááá 
áááááªáááááá¡ áááªááá¡ 
á¡ááááá®ááá¨á."
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:105
 msgid ""
@@ -81,6 +87,12 @@ msgid ""
 "tokens of our appreciation, and we no longer send them additional requests "
 "for donations throughout the year."
 msgstr ""
+"ááááá¡áááá  áá áá¡ á¨áááá«áááá 
áááá£á¥ááá áá á¨ááªááááá áá¥áááá 
á§áááááááá£á áá ááá¦ááá£áá "
+"áááá®áá¡ ááááááá ááá á¢áááá, 
giv...@torproject.org ááá¡áááá ááá 
á¨áá¢á§áááááááá. "
+"áááááááá, áá£ááááá áá®áá ááááá 
á á©áááá ááá ááá£ááááá¡ 
áá£á¨áááááá¡ááá, ááá¢áááá "
+"áááááá¨áá ááá£áá á©áááá¡ á¬áá 
ááá¢áááá¡ááá, ááá áá£ááááááá 
á¡áááááááá á¡áá®á¡áááá á¡ "
+"ááááááá áááá¡ ááá¨ááá áá 
áááá¡ááá, áá¡ááá áá¦áá  áá¦áááá 
á¨áááá¬áá á£ááááá¡ á¨áá¡áá®áá "
+"áá®áááááá¡, á¬ááá¡ ááááááááááá¨á."
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:109
 msgid ""
@@ -89,6 +101,11 @@ msgid ""
 "your monthly donation now and stand with the Tor Project at this critical "
 "time."
 msgstr ""
+"áá¥áááá áá®áá ááááá áá, á©ááá á£áá 
á£áááááá§áá¤á Tor-á¥á¡áááá¡ 
á®ááááá¡áá¬áááááááá¡ "
+"áááá®ááá ááááááá¡áááá¡. áá ááá, 
á©ááá ááááááá á ááááááááá¡ 
á¡áá§ááááááá á£á¤ááááááá¡ "
+"á¡áááá áá¯ááá, ááá ááá 
áááááªáááááá¡ á®ááá¨áá£á®ááááááá¡ 
ááá¡ááªáááá. ááá®ááá, áááá¦áá "
+"á§áááááááá£á á á¨áááá¬áá á£áááááá 
áá®áááá áá ááá£áááá áááá ááá Tor-áá 
ááá¥á¢á¡, áá "
+"áááááá¬á§ááá¢ áá áá¡."
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:115
 msgid "Want to make a one time donation instead?"
@@ -877,6 +894,9 @@ msgid ""
 "If you have any questions, or would like to donate a cryptocurrency not "
 "listed below, please email us at giv...@torproject.org."
 msgstr ""
+"áááá®ááááá¡ áá á¡áááááá¡ 
á¨áááá®ááááá¨á, áá áá áá 
ááá¢ááááá£á¢áá á¨áááá¬áá á£ááááá¡ "
+"ááá¡ááááááááá, á ááááááª 
áááªááá£á á¡ááá¨á áá áá, ááá®ááá 
ááááá¬áá áá ááá¤áá¡á¢ááá "
+"giv...@torproject.org."
 
 #: 
tmp/cache_locale/6f/6f67db0a5268c67c9254c73517aaaea60c8c65a268f9242703a3299173f14b74.php:22
 msgid

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

2019-04-11 Thread translation

commit a2211cc0f8b408cd942728dc63696574b56b4a0c
Author: Translation commit bot 
Date:   Thu Apr 11 12:45:36 2019 +

Update translations for donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index c72e78edb..e1d0da638 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -92,7 +92,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:115
 msgid "Want to make a one time donation instead?"
-msgstr ""
+msgstr "áá áá¯áá ááá á¨áááá¬áá á£ááááá¡ 
áááááááá ááá á©áááááá?"
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:122
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:102
@@ -220,7 +220,7 @@ msgstr "á§áááááááá£á áá"
 
 #: 
tmp/cache_locale/f1/f1c758a0a2b3397f444e81463a5afc68c251bdbcd430c9979e3044b79d32dffc.php:284
 msgid "Monthly giving"
-msgstr ""
+msgstr "á§áááááááá£á á á¨áááá¬áá á£áááá"
 
 #: 
tmp/cache_locale/e1/e1e12763540d9524f8871157240d5a8fbf2ea77ace1c46527b3031db68943acc.php:34
 msgid "Processing Donation - Tor"
@@ -356,7 +356,7 @@ msgstr "áááá á"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:41
 msgid "Estimated Donation Date:"
-msgstr ""
+msgstr "ááááá®ááá¡ áááá®ááááááá ááá 
áá¦á:"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:46
 msgid "Email"
@@ -364,19 +364,19 @@ msgstr "áá-á¤áá¡á¢áá¡ 
áááááááá"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:51
 msgid "Choose a Currency"
-msgstr ""
+msgstr "áááá£á¢áá¡ áá á©ááá"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:73
 msgid "Currency Amount"
-msgstr ""
+msgstr "áááá®áá¡ ááááááá"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:80
 msgid "Report Donation"
-msgstr ""
+msgstr "ááá®á¡ááááá á¨áááá¬áá á£ááááá¡ 
ááááááá"
 
 #: 
tmp/cache_locale/ce/cec5a6fe643ad38144e0af02cadfaaf024540f1f46db44998f6c033630795bef.php:87
 msgid "Wallet Addresses"
-msgstr ""
+msgstr "á¡áá¤á£ááá¡ ááá¡áááá áááá"
 
 #: 
tmp/cache_locale/ad/ad05838d90eae883761f0bcec6c27d77959c6e2884e8abf6c4aec89d7a741ea9.php:34
 msgid "Tor Privacy Policy"

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

[tor-commits] [tpo/master] add Icelandic and Georgian language

2019-04-11 Thread emmapeel

commit 9cf90b3c2aa26df2d11efb6abc86041b28c73a13
Author: emma peel 
Date:   Thu Apr 11 13:01:42 2019 +0200

add Icelandic and Georgian language
---
 configs/i18n.ini|  2 +-
 databags/about+is.ini   |  1 +
 databags/about+ka.ini   |  1 +
 databags/alternatives.ini   | 12 
 databags/menu+is.ini| 19 +++
 databags/menu+ka.ini| 19 +++
 databags/menu_footer+is.ini |  1 +
 databags/menu_footer+ka.ini |  1 +
 tpo.lektorproject   | 10 ++
 9 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/configs/i18n.ini b/configs/i18n.ini
index 482b129..81d4abd 100644
--- a/configs/i18n.ini
+++ b/configs/i18n.ini
@@ -1,5 +1,5 @@
 content = en
-translations = de,es,fr,it,pt-BR,ru,tr
+translations = de,es,fr,is,it,ka,pt-BR,ru,tr
 i18npath = i18n
 translate_paragraphwise = False
 url_prefix = https://www.torproject.org/
diff --git a/databags/about+is.ini b/databags/about+is.ini
new file mode 12
index 000..234b948
--- /dev/null
+++ b/databags/about+is.ini
@@ -0,0 +1 @@
+about+en.ini
\ No newline at end of file
diff --git a/databags/about+ka.ini b/databags/about+ka.ini
new file mode 12
index 000..234b948
--- /dev/null
+++ b/databags/about+ka.ini
@@ -0,0 +1 @@
+about+en.ini
\ No newline at end of file
diff --git a/databags/alternatives.ini b/databags/alternatives.ini
index 33cf83c..7603b21 100644
--- a/databags/alternatives.ini
+++ b/databags/alternatives.ini
@@ -22,12 +22,24 @@ order = order-last
 url = /fr/
 language = FranÃ§ais (fr)
 
+[is]
+direction = text-left
+order = order-last
+url = /is/
+language = Ãslenska (is)
+
 [it]
 direction = text-left
 order = order-last
 url = /it/
 language = Italiano (it)
 
+[ka]
+direction = text-left
+order = order-last
+language = Georgian (ka)
+url = /ka/
+
 [pt-BR]
 direction = text-left
 order = order-last
diff --git a/databags/menu+is.ini b/databags/menu+is.ini
new file mode 100644
index 000..d77e346
--- /dev/null
+++ b/databags/menu+is.ini
@@ -0,0 +1,19 @@
+[about]
+path = /about/history
+label = About
+
+[documentation]
+path = https://2019.www.torproject.org/docs/documentation.html.en
+label = Documentation
+
+[support]
+path = https://support.torproject.org/
+label = Support
+
+[blog]
+path = https://blog.torproject.org
+label = Blog
+
+[donate]
+path = https://donate.torproject.org
+label = Donate
diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini
new file mode 100644
index 000..e3357ba
--- /dev/null
+++ b/databags/menu+ka.ini
@@ -0,0 +1,19 @@
+[about]
+path = /about/history
+label = About
+
+[documentation]
+path = https://2019.www.torproject.org/docs/documentation.html.en
+label = Documentation
+
+[support]
+path = https://support.torproject.org/
+label = Support
+
+[blog]
+path = https://blog.torproject.org
+label = Blog
+
+[donate]
+path = https://donate.torproject.org/ka
+label = Donate
diff --git a/databags/menu_footer+is.ini b/databags/menu_footer+is.ini
new file mode 12
index 000..a3178a1
--- /dev/null
+++ b/databags/menu_footer+is.ini
@@ -0,0 +1 @@
+menu_footer+en.ini
\ No newline at end of file
diff --git a/databags/menu_footer+ka.ini b/databags/menu_footer+ka.ini
new file mode 12
index 000..a3178a1
--- /dev/null
+++ b/databags/menu_footer+ka.ini
@@ -0,0 +1 @@
+menu_footer+en.ini
\ No newline at end of file
diff --git a/tpo.lektorproject b/tpo.lektorproject
index e266309..8523e44 100644
--- a/tpo.lektorproject
+++ b/tpo.lektorproject
@@ -25,11 +25,21 @@ name = FranÃ§ais (fr)
 url_prefix = /fr/
 locale = fr
 
+[alternatives.is]
+name = Ãslenska (is)
+url_prefix = /is/
+locale = is
+
 [alternatives.it]
 name = Italiano (it)
 url_prefix = /it/
 locale = it
 
+[alternatives.ka]
+name = Georgian (ka)
+url_prefix = /ka/
+locale = ka
+
 [alternatives.pt-BR]
 name = PortuguÃªs Brasil (pt-BR)
 url_prefix = /pt-BR/

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

[tor-commits] [tor-browser-build/master] Merge branch 'bug_29843'

2019-04-11 Thread gk

commit 3ba210064197298ad1c54ca74f086a67653109a2
Merge: 516887a b619af7
Author: Georg Koppen 
Date:   Thu Apr 11 10:23:30 2019 +

Merge branch 'bug_29843'

 projects/firefox/1527534.patch | 139 +
 projects/firefox/build |   6 ++
 projects/firefox/config|   2 +
 3 files changed, 147 insertions(+)

diff --cc projects/firefox/config
index 9eabf05,41f7fbd..c455d21
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@@ -166,6 -166,5 +166,8 @@@ input_files
- project: firefox-locale-bundle
  name: firefox-locale-bundle
  enable: '[% c("var/android") %]'
 +  - project: tba-translation
 +name: tba-translation
 +enable: '[% c("var/android") %]'
+   - filename: 1527534.patch
+ enable: '[% c("var/android") %]'

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

[tor-commits] [tor-browser-build/master] Bug 29843: Backport the fix for bug 1527534

2019-04-11 Thread gk

commit b619af79d04bde9313d8a4a2696c4a5a06c60175
Author: Georg Koppen 
Date:   Thu Mar 21 15:06:04 2019 +

Bug 29843: Backport the fix for bug 1527534
---
 projects/firefox/1527534.patch | 139 +
 projects/firefox/build |   6 ++
 projects/firefox/config|   2 +
 3 files changed, 147 insertions(+)

diff --git a/projects/firefox/1527534.patch b/projects/firefox/1527534.patch
new file mode 100644
index 000..ad8720c
--- /dev/null
+++ b/projects/firefox/1527534.patch
@@ -0,0 +1,139 @@
+From dcd5a0e59bef209aa8301a427b749830876cdada Mon Sep 17 00:00:00 2001
+From: Jeff Gilbert 
+Date: Tue, 19 Feb 2019 15:43:39 -0800
+Subject: [PATCH] Bug 1527534 - Reuse LoadApitraceLibrary. r=lsalzman a=lizzard
+
+Differential Revision: https://phabricator.services.mozilla.com/D20418
+
+diff --git a/gfx/gl/GLContextProviderEGL.cpp b/gfx/gl/GLContextProviderEGL.cpp
+index d91d03aee6a9..f4d8c1f80176 100644
+--- a/gfx/gl/GLContextProviderEGL.cpp
 b/gfx/gl/GLContextProviderEGL.cpp
+@@ -265,11 +265,8 @@ GLContextEGL::~GLContextEGL() {
+ }
+ 
+ bool GLContextEGL::Init() {
+-#if defined(ANDROID)
+-  // We can't use LoadApitraceLibrary here because the GLContext
+-  // expects its own handle to the GL library
+-  if (!OpenLibrary(APITRACE_LIB))
+-#endif
++  mLibrary = LoadApitraceLibrary();
++  if (!mLibrary) {
+ if (!OpenLibrary(GLES2_LIB)) {
+ #if defined(XP_UNIX)
+   if (!OpenLibrary(GLES2_LIB2)) {
+@@ -278,6 +275,7 @@ bool GLContextEGL::Init() {
+   }
+ #endif
+ }
++  }
+ 
+   SetupLookupFunction();
+   if (!InitWithPrefix("gl", true)) return false;
+diff --git a/gfx/gl/GLLibraryEGL.cpp b/gfx/gl/GLLibraryEGL.cpp
+index fe4bd9811949..ef693e283968 100644
+--- a/gfx/gl/GLLibraryEGL.cpp
 b/gfx/gl/GLLibraryEGL.cpp
+@@ -63,9 +63,18 @@ static const char* sEGLExtensionNames[] = {
+ "EGL_ANGLE_device_creation_d3d11",
+ };
+ 
+-#if defined(ANDROID)
++PRLibrary* LoadApitraceLibrary() {
++  const char* path = nullptr;
++
++#ifdef ANDROID
++  // We only need to explicitly dlopen egltrace
++  // on android as we can use LD_PRELOAD or other tricks
++  // on other platforms. We look for it in /data/local
++  // as that's writeable by all users.
++  path = "/data/local/tmp/egltrace.so";
++#endif
++  if (!path) return nullptr;
+ 
+-static PRLibrary* LoadApitraceLibrary() {
+   // Initialization of gfx prefs here is only needed during the unit tests...
+   gfxPrefs::GetSingleton();
+   if (!gfxPrefs::UseApitrace()) {
+@@ -73,7 +82,6 @@ static PRLibrary* LoadApitraceLibrary() {
+   }
+ 
+   static PRLibrary* sApitraceLibrary = nullptr;
+-
+   if (sApitraceLibrary) return sApitraceLibrary;
+ 
+   nsAutoCString logFile;
+@@ -87,20 +95,19 @@ static PRLibrary* LoadApitraceLibrary() {
+   nsAutoCString logPath;
+   logPath.AppendPrintf("%s/%s", getenv("GRE_HOME"), logFile.get());
+ 
++#ifndef XP_WIN  // Windows is missing setenv and forbids PR_LoadLibrary.
+   // apitrace uses the TRACE_FILE environment variable to determine where
+   // to log trace output to
+   printf_stderr("Logging GL tracing output to %s", logPath.get());
+   setenv("TRACE_FILE", logPath.get(), false);
+ 
+-  printf_stderr("Attempting load of %s\n", APITRACE_LIB);
+-
+-  sApitraceLibrary = PR_LoadLibrary(APITRACE_LIB);
++  printf_stderr("Attempting load of %s\n", path);
++  sApitraceLibrary = PR_LoadLibrary(path);
++#endif
+ 
+   return sApitraceLibrary;
+ }
+ 
+-#endif  // ANDROID
+-
+ #ifdef XP_WIN
+ // see the comment in GLLibraryEGL::EnsureInitialized() for the rationale 
here.
+ static PRLibrary* LoadLibraryForEGLOnWindows(const nsAString& filename) {
+diff --git a/gfx/gl/GLLibraryEGL.h b/gfx/gl/GLLibraryEGL.h
+index 069a2f0908d7..3f200bf76b3f 100644
+--- a/gfx/gl/GLLibraryEGL.h
 b/gfx/gl/GLLibraryEGL.h
+@@ -18,18 +18,6 @@
+ #include 
+ #include 
+ 
+-#ifdef ANDROID
+-// We only need to explicitly dlopen egltrace
+-// on android as we can use LD_PRELOAD or other tricks
+-// on other platforms. We look for it in /data/local
+-// as that's writeable by all users
+-//
+-// This should really go in GLLibraryEGL.cpp but we currently reference
+-// APITRACE_LIB in GLContextProviderEGL.cpp. Further refactoring
+-// will come in subsequent patches on Bug 732865
+-#define APITRACE_LIB "/data/local/tmp/egltrace.so"
+-#endif
+-
+ #if defined(MOZ_X11)
+ #define EGL_DEFAULT_DISPLAY ((EGLNativeDisplayType)mozilla::DefaultXDisplay())
+ #else
+@@ -49,6 +37,7 @@ class DataSourceSurface;
+ namespace gl {
+ 
+ class GLContext;
++PRLibrary* LoadApitraceLibrary();
+ 
+ void BeforeEGLCall(const char* funcName);
+ void AfterEGLCall(const char* funcName);
+diff --git a/gfx/thebes/gfxPrefs.h b/gfx/thebes/gfxPrefs.h
+index b2e094672b59..fae5bec1e78e 100644
+--- a/gfx/thebes/gfxPrefs.h
 b/gfx/thebes/gfxPrefs.h
+@@ -433,9 +433,7 @@ class gfxPrefs final {
+ SmoothScrollMSDPhysicsRegularSpringConstant, int32_t, 1000);
+ 
+   DECL_GFX_PREF(Once, "gfx.android.rgb16.force",

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-04-11 Thread translation

commit dc820973cfe7ca06e97e210354b185ee08eb53df
Author: Translation commit bot 
Date:   Thu Apr 11 10:17:53 2019 +

Update translations for tbmanual-contentspot
---
 contents+ar.po | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/contents+ar.po b/contents+ar.po
index 5d59b6c76..84572ec33 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -4,6 +4,7 @@
 # erinm, 2019
 # Emma Peel, 2019
 # Ahmed A. <66222...@gmail.com>, 2019
+# Ramy Rostom , 2019
 # 
 msgid ""
 msgstr ""
@@ -11,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-09 09:20+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Ahmed A. <66222...@gmail.com>, 2019\n"
+"Last-Translator: Ramy Rostom , 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -226,6 +227,10 @@ msgid ""
 "mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
 "Institute](https://tor.calyxinstitute.org)."
 msgstr ""
+"Ø§Ø°Ø§ ÙÙØªÙ ØºÙØ± ÙØ§Ø¯Ø±ÙÙ Ø¹ÙÙ ØªØÙÙÙ ÙØªØµÙØ ØªÙØ± ÙÙ 
Ø§ÙÙÙÙØ¹ Ø§ÙØ±Ø³ÙÙ ÙÙÙØªØµÙØØ ÙÙÙÙÙÙ "
+"ØªØÙÙÙÙ ÙÙ Ø®ÙØ§Ù Ø§ØØ¯Ù Ø§ÙØ±ÙØ§Ø¨Ø· Ø§ÙØ¨Ø¯ÙÙØ© Ø§ÙØ±Ø³Ù
ÙØ©Ø Ø³ÙØ§Ø¡ ÙÙ Ø¹ÙÙ "
+"[EFF](https://tor.eff.org) Ø£Ù [Calyx "
+"Institute](https://tor.calyxinstitute.org)."
 
 #: https//tb-manual.torproject.org/en-US/downloading/
 #: (content/downloading/contents+en-US.lrtopic.body)
@@ -809,6 +814,8 @@ msgid ""
 "bridge.' Click on the drop-down menu and select the pluggable transport "
 "you'd like to use."
 msgstr ""
+"ÙÙ Ø¨Ø§Ø®ØªÙØ§Ø± \"ØªÙØ± ÙØØ¬ÙØ¨ ÙÙ Ø¨ÙØ¯Ù\" Ø«Ù Ø§Ø¶ØºØ· Ø¹ÙÙ 
\"Ø§Ø®ØªÙØ§Ø± Ø¬ÙØ³ÙØ± ÙØªØ¶ÙÙ\". Ø«Ù Ø§Ø¶ØºØ·"
+" Ø¹ÙÙ Ø§ÙÙØ§Ø¦ÙØ© Ø§ÙÙÙØ³Ø¯ÙØ© ÙÙÙ Ø¨Ø§Ø®ØªÙØ§Ø± Ø§ÙÙØ§ÙÙ 
Ø§ÙÙÙØµÙÙ Ø§ÙØ°Ù ØªØ±ØºØ¨ ÙÙ Ø§Ø³ØªØ®Ø¯Ø§ÙÙ."
 
 #: https//tb-manual.torproject.org/en-US/circumvention/
 #: (content/circumvention/contents+en-US.lrtopic.body)

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

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

2019-04-11 Thread translation

commit c185c0b6e5b6fa8802df966d95a1e563997a0c25
Author: Translation commit bot 
Date:   Thu Apr 11 09:49:28 2019 +

Update translations for torbutton-browseronboardingproperties
---
 sk/browserOnboarding.properties | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sk/browserOnboarding.properties b/sk/browserOnboarding.properties
index 833d61990..d62e3137a 100644
--- a/sk/browserOnboarding.properties
+++ b/sk/browserOnboarding.properties
@@ -62,10 +62,10 @@ onboarding.tor-circuit-display.two-of-three=2 z 3
 onboarding.tor-circuit-display.three-of-three=3 z 3
 
 onboarding.tor-circuit-display.intro.title=Ako pracujÃº Obvody?
-onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly 
assigned relays, which are computers around the world configured to forward Tor 
traffic. Circuits allow you to browse privately and to connect to onion 
services.
+onboarding.tor-circuit-display.intro.msg=Obvody sÃº nÃ¡hodne vybranÃ© relÃ©, 
teda poÄÃtaÄe okolo sveta nakonfigurovanÃ© na premÃ¡vku Tor. Obvody VÃ¡m 
umoÅ¾ÅujÃº prehliadaÅ¥ internet v sÃºkromÃ a pripÃ¡jaÅ¥ sa na sluÅ¾by onion.
 
 onboarding.tor-circuit-display.diagram.title=Zobrazenie Okruhov
-onboarding.tor-circuit-display.diagram.msg=This diagram shows the relays that 
make up the circuit for this website. To prevent linking of activity across 
different sites, each website gets a different circuit.
+onboarding.tor-circuit-display.diagram.msg=Tento diagram zobrazuje ktorÃ© 
relÃ© vytvÃ¡rajÃº okruh pre tÃºto webstrÃ¡nku. Na zabrÃ¡nenie prepojenia VaÅ¡ej 
aktivity cez rÃ´zne strÃ¡nky, kaÅ¾dÃ¡ dostane novÃ½ okruh.
 
-onboarding.tor-circuit-display.new-circuit.title=Do you need a new circuit?
-onboarding.tor-circuit-display.new-circuit.msg=If you are not able to connect 
to the website youâre trying to visit or it is not loading properly, then you 
can use this button to reload the site with a new circuit.
+onboarding.tor-circuit-display.new-circuit.title=Potrebujete novÃ½ okruh?
+onboarding.tor-circuit-display.new-circuit.msg=Ak sa nedÃ¡ pripojiÅ¥ na 
webstrÃ¡nku ktorÃº sa snaÅ¾Ãte navÅ¡tÃviÅ¥ alebo sa strÃ¡nka nezobrazuje 
sprÃ¡vne, mÃ´Å¾ete pouÅ¾iÅ¥ toto tlaÄidlo na znovunaÄÃtanie cez inÃ½ okruh.

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

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

2019-04-11 Thread translation

commit ca7a89dba83e8f580f41ef52131f5959293fe3c9
Author: Translation commit bot 
Date:   Thu Apr 11 09:48:52 2019 +

Update translations for torbutton-torbuttonproperties_completed
---
 sk/torbutton.properties | 60 +
 1 file changed, 60 insertions(+)

diff --git a/sk/torbutton.properties b/sk/torbutton.properties
new file mode 100644
index 0..ae07414ba
--- /dev/null
+++ b/sk/torbutton.properties
@@ -0,0 +1,60 @@
+torbutton.circuit_display.internet = Internet
+torbutton.circuit_display.ip_unknown = NeznÃ¡ma IP
+torbutton.circuit_display.onion_site = SrÃ¡nka cibule
+torbutton.circuit_display.this_browser = PrehliadaÄe
+torbutton.circuit_display.relay = Relay
+torbutton.circuit_display.tor_bridge = Premostenie
+torbutton.circuit_display.unknown_country = NeznÃ¡ma krajina
+torbutton.circuit_display.guard = Ochrana
+torbutton.circuit_display.guard_note = VÃ¡Å¡ [OchrannÃ½] uzol nie je moÅ¾nÃ© 
zmeniÅ¥
+torbutton.circuit_display.learn_more = Zistite viac
+torbutton.content_sizer.margin_tooltip = Tor Browser pridÃ¡ okraj a urobÃ 
Å¡Ãrku a vÃ½Å¡ku vÃ¡Å¡ho okna menej charakteristicku, tÃ½m zniÅ¾uje schopnosÅ¥ 
Ä¾udÃ, aby vÃ¡s sledovaÅ¥ on-line.
+torbutton.panel.tooltip.disabled = KliknutÃm aktivujem Tor
+torbutton.panel.tooltip.enabled = KliknutÃm deaktivujem Torr
+torbutton.panel.label.disabled = Tor je zablokovanÃ½
+torbutton.panel.label.enabled = Tor je aktÃvny
+extensions.torbut...@torproject.org.description = Torbutton poskytuje 
tlaÄidlo nastavenia Tora cez ktorÃ© mÃ´Å¾ete Ä¾ahko vynulovaÅ¥ sÃºkromnÃ© 
informÃ¡cie surfovania.
+torbutton.popup.external.title = NaÄÃtaÅ¥ externÃ½ obsah?
+torbutton.popup.external.app = ExternÃ© aplikÃ¡cie sa musia spracovaÅ¥:\n\n
+torbutton.popup.external.note = \n\nPOZNÃMKA: ExternÃ© aplikÃ¡cie nie sÃº 
Torom zabezpeÄnÃ© v predvolenom nastavenÃ vÃ¡s mÃ´Å¾u odmaskovaÅ¥!\n
+torbutton.popup.external.suggest = \nAk tento sÃºbor je nedÃ´veryhodnÃ½, mali 
by ste ho uloÅ¾iÅ¥ a zobraziÅ¥ si ho v reÅ¾ime offline alebo v VM,\nalebo si 
zvÃ¡Å¾te Äi by nebolo lepÅ¡ie pouÅ¾iÅ¥ proxy Tora, cez Tails LiveCD.\n
+torbutton.popup.launch = SpustiÅ¥ aplikÃ¡ciu
+torbutton.popup.cancel = ZruÅ¡iÅ¥
+torbutton.popup.dontask = Odteraz vÅ¾dy spÃºÅ¡Å¥aÅ¥ aplikÃ¡cie
+torbutton.popup.no_newnym = TorButton nemÃ´Å¾e daÅ¥ zabezpeÄenÃº novÃº 
identitu. NemÃ¡ prÃstup k portu ovlÃ¡daÄa.\n\nMÃ¡m spustiÅ¥ Tor Browser 
Bundle?
+torbutton.security_settings.menu.title = BezpeÄnostnÃ© nastavenia
+torbutton.title.prompt_torbrowser = DÃ´leÅ¾itÃ© InformÃ¡cie Torbutton
+torbutton.popup.prompt_torbrowser = Torbutton teraz pracuje odliÅ¡ne: uÅ¾ ho 
viac nie je moÅ¾nÃ© vypnÃºÅ¥.\n\nTÃºto zmenu sme vykonali z dÃ´vodu, Å¾e nie je 
bezpeÄnÃ© pouÅ¾ÃvaÅ¥ Torbutton v prehliadaÄi, ktorÃ½ sa zÃ¡roveÅ pouÅ¾Ãva 
na prehliadanie bez Tora.\n\nAk si Äalej prajete pouÅ¾ÃvaÅ¥ Firefox 
normÃ¡lne, odporÃºÄame vÃ¡m odinÅ¡talovaÅ¥ Torbutton a zaobstaraÅ¥ si Tor 
Browser Bundle. Schopnosti a sÃºkromie v Tor Browser sÃº dokonalejÅ¡ie neÅ¾ tie 
v beÅ¾nom prehliadaÄi Firefox, aj keby bol Firefox pouÅ¾itÃ½ s 
Torbutton.\n\nPre odstrÃ¡nenie Torbutton, prejdite do Nastavenia->PrÃdavnÃ© 
moduly->RozÅ¡Ãrenia a kliknite na tlaÄidlo OdstrÃ¡niÅ¥ vedÄ¾a Torbutton.
+torbutton.popup.short_torbrowser = DÃ´leÅ¾itÃ© Torbutton 
InformÃ¡cie!\n\nTorbutton je odteraz povolenÃ½.\n\nStlaÄte Torbutton pre 
viacej informÃ¡ciÃ.
+
+torbutton.popup.confirm_plugins = Pluginy, ako je Flash mÃ´Å¾u poÅ¡kodiÅ¥ 
vaÅ¡e sÃºkromie a anonymitu.\n\nMÃ´Å¾u obÃsÅ¥ Tor a odhaliÅ¥ vaÅ¡u aktuÃ¡lnu 
polohu a IP adresu.\n\nNaozaj mÃ¡m povoliÅ¥ pluginy?\n\n
+torbutton.popup.never_ask_again = Viac sa ma nepÃ½taj
+torbutton.popup.confirm_newnym = Tor Browser zavrie vÅ¡etky oknÃ¡ a karty. 
VÅ¡etky relÃ¡cie web strÃ¡nok budÃº stratenÃ©.\n\nMÃ¡m reÅ¡tartovaÅ¥ Tor 
Browser a obnoviÅ¥ svoju identitu?\n\n
+
+torbutton.maximize_warning = MaximalizÃ¡cia okna Tora umoÅ¾nÃ web strÃ¡nkam 
urÄiÅ¥ svoju veÄ¾kosÅ¥ monitora, ktorÃ½ mÃ´Å¾u pouÅ¾iÅ¥, aby vÃ¡s sledovali. 
OdporÃºÄame ponechaÅ¥ okno PrehliadaÄa Tora vo svojej pÃ´vodnej 
vÃ½chodiskovej veÄ¾kosti.
+
+# Canvas permission prompt. Strings are kept here for ease of translation.
+canvas.siteprompt=TÃ¡to webovÃ¡ strÃ¡nka (%S) sa pokÃºsila zÃskaÅ¥ dÃ¡ta z 
obrÃ¡zkov pozadia HTML 5, ktorÃ© mÃ´Å¾u byÅ¥ pouÅ¾itÃ© na identifikovanie 
VÃ¡Å¡ho poÄÃtaÄa.\n\nMÃ¡ prehliadaÄ Tor povoliÅ¥, aby tÃ¡to strÃ¡nka 
zÃskala dÃ¡ta z pozadia obrÃ¡zkov HTML5?
+canvas.notNow=Teraz nie
+canvas.notNowAccessKey=N
+canvas.allow=PovoliÅ¥ v budÃºcnosti
+canvas.allowAccessKey=A
+canvas.never=Nikdy (doporuÄenÃ©)
+canvas.neverAccessKey=e
+
+# Profile/startup error messages. Strings are kept here for ease of 
translation.
+# LOCALIZATION NOTE: %S is the application name.
+profileProblemTitle=ProblÃ©m profilu %S
+profileReadOnly=NedÃ¡ sa spustiÅ¥ %S je len pre ÄÃtanie.  ProsÃm, 
skopÃrujte %S do inÃ©ho umiestnenia pred pokusom ho pouÅ¾iÅ¥.
+profileReadOnlyMac=NedÃ¡ sa spustiÅ¥

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

2019-04-11 Thread translation

commit 3aabb60bf9981c7ea50be7d89bc490a12e30dcc1
Author: Translation commit bot 
Date:   Thu Apr 11 09:49:34 2019 +

Update translations for torbutton-browseronboardingproperties_completed
---
 sk/browserOnboarding.properties | 71 +
 1 file changed, 71 insertions(+)

diff --git a/sk/browserOnboarding.properties b/sk/browserOnboarding.properties
new file mode 100644
index 0..d62e3137a
--- /dev/null
+++ b/sk/browserOnboarding.properties
@@ -0,0 +1,71 @@
+# Copyright (c) 2019, The Tor Project, Inc.
+# See LICENSE for licensing information.
+# vim: set sw=2 sts=2 ts=8 et:
+
+onboarding.tour-tor-welcome=Vitajte
+onboarding.tour-tor-welcome.title=Ste pripravenÃ½.
+onboarding.tour-tor-welcome.description=PrehliadaÄ Tor vÃ¡m ponÃºka 
najvyÅ¡Å¡Ã Å¡tandard sÃºkromia a bezpeÄnosti na webe. Ste chrÃ¡nenÃ pred 
sledovanÃm, odpoÄÃºvanÃm a cenzÃºrou. Pripravili sme si pre vÃ¡s rÃ½chly 
nÃ¡vod.
+onboarding.tour-tor-welcome.next-button=PrejsÅ¥ do SÃºkromia
+
+onboarding.tour-tor-privacy=SÃºkromie
+onboarding.tour-tor-privacy.title=Zbavte sa sledovacÃch prvkov
+onboarding.tour-tor-privacy.description=PrehliadaÄ Tor izoluje cookies a po 
skonÄenÃ relÃ¡cie maÅ¾e histÃ³riu prehliadania. VÄaka tÃ½mto ÃºpravÃ¡m je 
zabezpeÄenÃ© vaÅ¡e sÃºkromie. KliknutÃm na sekciu âsieÅ¥ Torâ zistÃte, 
ako vÃ¡s chrÃ¡nime na Ãºrovni siete.
+onboarding.tour-tor-privacy.button=PrejsÅ¥ na sieÅ¥ Tor
+
+onboarding.tour-tor-network=SieÅ¥ Tor
+onboarding.tour-tor-network.title=Surfujte na decentralizovanej sieti.
+onboarding.tour-tor-network.description=PrehliadaÄ Tor vÃ¡s pripojÃ na sieÅ¥ 
Tor, ktorÃº prevÃ¡dzkujÃº tisÃce dobrovoÄ¾nÃkov po celom svete. Na rozdiel od 
VPN, tu nie je Å¾iadny slabÃ½ bod alebo Å¾iadna centralizovanÃ¡ autorita, 
ktorej by ste museli dÃ´verovaÅ¥ na to aby ste si mohli uÅ¾iÅ¥ prehliadanie 
internetu v sÃºkromÃ.
+onboarding.tour-tor-network.button=ÃsÅ¥ do Zobrazenia Okruhov
+
+onboarding.tour-tor-circuit-display=Zobrazenie Okruhov
+onboarding.tour-tor-circuit-display.title=ZobraziÅ¥ VaÅ¡u cestu.
+onboarding.tour-tor-circuit-display.description=Pre kaÅ¾dÃº domÃ©nu ktorÃº 
navÅ¡tÃvite, VÃ¡Å¡ dÃ¡tovÃ½ tok je presmerovanÃ½ a Å¡ifrovanÃ½ po Okruhu cez 
tri Tor relÃ© vo svete. Å½iadna webstrÃ¡nka nezistÃ odkiaÄ¾ sa pripÃ¡jate. 
MÃ´Å¾ete poÅ¾iadaÅ¥ o "NovÃ½ Okruh pre tÃºto strÃ¡nku" v naÅ¡om ZobrazenÃ 
Okruhov.
+onboarding.tour-tor-circuit-display.button=ZobraziÅ¥ moju cestu
+onboarding.tour-tor-circuit-display.next-button=PrejsÅ¥ na BezpeÄnosÅ¥
+
+onboarding.tour-tor-security=BezpeÄnosÅ¥
+onboarding.tour-tor-security.title=ÃroveÅ bezpeÄnosti zÃ¡visÃ na vÃ¡s.
+onboarding.tour-tor-security.description=Poskytujeme vÃ¡m rozÅ¡ÃrenÃ© 
nastavenia, vÄaka ktorÃ½m mÃ´Å¾ete zvÃ½Å¡iÅ¥ ÃºroveÅ zabezpeÄenia svojho 
prehliadaÄa. NaÅ¡e bezpeÄnostnÃ© nastavenia vÃ¡m umoÅ¾ÅujÃº blokovaÅ¥ prvky, 
ktorÃ© by mohli byÅ¥ pouÅ¾itÃ© na Ãºtok na vaÅ¡e zariadenie. Kliknite dolu na 
zobrazenie ako sa sprÃ¡vajÃº rÃ´zne moÅ¾nosti.
+onboarding.tour-tor-security.description-suffix=PoznÃ¡mka: Predvolene, 
NoScript a HTTPS Everywhere nie sÃº na paneli nÃ¡strojov, ale mÃ´Å¾ete ich tam 
pridaÅ¥.
+onboarding.tour-tor-security-level.button=ZobraziÅ¥ VaÅ¡u ÃºroveÅ 
zabezpeÄenia.
+onboarding.tour-tor-security-level.next-button=ZobraziÅ¥ tipy zo skÃºsenosti
+
+onboarding.tour-tor-expect-differences=Tipy zo skÃºsenostÃ
+onboarding.tour-tor-expect-differences.title=OÄakÃ¡vajte nejakÃ© rozdiely
+onboarding.tour-tor-expect-differences.description=Ak mÃ¡te aktivovanÃ© 
vÅ¡etky funkcie, ktorÃ© vÃ¡m Tor ponÃºka na zvÃ½Å¡enie Ãºrovne vaÅ¡ej 
bezpeÄnosti a sÃºkromia, vaÅ¡e prehliadanie sa vÃ¡m sprvu mÃ´Å¾e zdaÅ¥ 
zvlÃ¡Å¡tne, inÃ©. V zÃ¡vislosti na Ãºrovni vÃ¡Å¡ho zabezpeÄenia mÃ´Å¾e byÅ¥ 
vaÅ¡e prehliadanie trochu pomalÃ© a niektorÃ© prvky sa nemusia naÄÃtaÅ¥. 
TaktieÅ¾ mÃ´Å¾ete byÅ¥ poÅ¾iadanÃ, aby ste dokÃ¡zali, Å¾e nie ste robot.
+onboarding.tour-tor-expect-differences.button=ZobraziÅ¥ Äasto KladenÃ© OtÃ¡zky
+onboarding.tour-tor-expect-differences.next-button=ZobraziÅ¥ SluÅ¾by Onion
+
+onboarding.tour-tor-onion-services=SluÅ¾by Onion
+onboarding.tour-tor-onion-services.title=BuÄte viacej chrÃ¡nenÃ½.
+onboarding.tour-tor-onion-services.description=SluÅ¾by Onion sÃº strÃ¡nky, 
ktorÃ© konÄia koncovkou .onion a poskytujÃº extra ochranu svojim vydavateÄ¾om 
a nÃ¡vÅ¡tevnÃkom, vrÃ¡tane zabudovanÃ½ch bezpeÄnostnÃ½ch prvkov tÃ½kajÃºcich 
sa cenzÃºry. SluÅ¾by Onion umoÅ¾ÅujÃº komukoÄ¾vek poskytovaÅ¥ obsah a sluÅ¾by 
anonymne. Kliknite dolu pre nÃ¡vÅ¡tevu onion strÃ¡nky DuckDuckGo.
+onboarding.tour-tor-onion-services.button=NavÅ¡tÃvte Onion strÃ¡nku
+onboarding.tour-tor-onion-services.next-button=Hotovo 
+
+onboarding.overlay-icon-tooltip-updated2=ZobraziÅ¥ Äo je novÃ©\nv %S
+onboarding.tour-tor-update.prefix-new=NovÃ½
+onboarding.tour-tor-update.prefix-updated=AktualizovanÃ©
+
+onboarding.tour-tor-toolbar=NÃ¡stroje
+onboarding.tour-tor-toolbar-update-8.5.title=RozloÅ¾enie

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

2019-04-11 Thread translation

commit ce2c1b9686a041595f68d3e243f610c9edb5a62e
Author: Translation commit bot 
Date:   Thu Apr 11 09:48:45 2019 +

Update translations for torbutton-torbuttonproperties
---
 sk/torbutton.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sk/torbutton.properties b/sk/torbutton.properties
index 5dfb6b36b..ae07414ba 100644
--- a/sk/torbutton.properties
+++ b/sk/torbutton.properties
@@ -5,8 +5,8 @@ torbutton.circuit_display.this_browser = PrehliadaÄe
 torbutton.circuit_display.relay = Relay
 torbutton.circuit_display.tor_bridge = Premostenie
 torbutton.circuit_display.unknown_country = NeznÃ¡ma krajina
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
+torbutton.circuit_display.guard = Ochrana
+torbutton.circuit_display.guard_note = VÃ¡Å¡ [OchrannÃ½] uzol nie je moÅ¾nÃ© 
zmeniÅ¥
 torbutton.circuit_display.learn_more = Zistite viac
 torbutton.content_sizer.margin_tooltip = Tor Browser pridÃ¡ okraj a urobÃ 
Å¡Ãrku a vÃ½Å¡ku vÃ¡Å¡ho okna menej charakteristicku, tÃ½m zniÅ¾uje schopnosÅ¥ 
Ä¾udÃ, aby vÃ¡s sledovaÅ¥ on-line.
 torbutton.panel.tooltip.disabled = KliknutÃm aktivujem Tor
@@ -53,8 +53,8 @@ profileMigrationFailed=Presun existujÃºceho profilu %S 
zlyhalo.\nPouÅ¾itÃ© bude
 # "Downloading update" string for the hamburger menu (see #28885).
 # This string is kept here for ease of translation.
 # LOCALIZATION NOTE: %S is the application name.
-updateDownloadingPanelUILabel=Downloading %S update
+updateDownloadingPanelUILabel=PreberÃ¡m %S aktualizÃ¡ciu
 
 # .Onion Page Info prompt.  Strings are kept here for ease of translation.
-pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion 
Service, %1$S, %2$S bit keys, %3$S)
-pageInfo_OnionEncryption=Connection Encrypted (Onion Service)
+pageInfo_OnionEncryptionWithBitsAndProtocol=Spojenie Å¡ifrovanÃ© (SluÅ¾ba 
Onion, %1$S, %2$S bitovÃ© kÄ¾uÄe, %3$S)
+pageInfo_OnionEncryption=Spojenie Å¡ifrovanÃ© (SluÅ¾ba Onion)

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

[tor-commits] [tpo/master] Add Alex to people

2019-04-11 Thread hiro

commit d18b755658674a6f4c96f5fec31517af62746408
Author: hiro 
Date:   Thu Apr 11 11:36:57 2019 +0200

Add Alex to people
---
 content/about/people/acat/contents.lr | 15 +++
 1 file changed, 15 insertions(+)

diff --git a/content/about/people/acat/contents.lr 
b/content/about/people/acat/contents.lr
new file mode 100644
index 000..47a35df
--- /dev/null
+++ b/content/about/people/acat/contents.lr
@@ -0,0 +1,15 @@
+_model: person
+---
+_hidden: yes
+---
+role: core
+---
+name: Alex Catarineu
+---
+pronoun: https://pronoun.is/he
+---
+nickname: acat
+---
+description:
+
+Works on Tor Browser

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

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

2019-04-11 Thread translation

commit 42a4afbeced62c603407343a22337eddc42aedf9
Author: Translation commit bot 
Date:   Thu Apr 11 09:19:29 2019 +

Update translations for torbutton-browseronboardingproperties
---
 sk/browserOnboarding.properties | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sk/browserOnboarding.properties b/sk/browserOnboarding.properties
index 0042695ac..833d61990 100644
--- a/sk/browserOnboarding.properties
+++ b/sk/browserOnboarding.properties
@@ -38,21 +38,21 @@ 
onboarding.tour-tor-expect-differences.next-button=ZobraziÅ¥ SluÅ¾by Onion
 
 onboarding.tour-tor-onion-services=SluÅ¾by Onion
 onboarding.tour-tor-onion-services.title=BuÄte viacej chrÃ¡nenÃ½.
-onboarding.tour-tor-onion-services.description=Onion services are sites that 
end with a .onion that provide extra protections to publishers and visitors, 
including added safeguards against censorship. Onion services allow anyone to 
provide content and services anonymously. Click below to visit the DuckDuckGo 
onion site.
-onboarding.tour-tor-onion-services.button=Visit an Onion
+onboarding.tour-tor-onion-services.description=SluÅ¾by Onion sÃº strÃ¡nky, 
ktorÃ© konÄia koncovkou .onion a poskytujÃº extra ochranu svojim vydavateÄ¾om 
a nÃ¡vÅ¡tevnÃkom, vrÃ¡tane zabudovanÃ½ch bezpeÄnostnÃ½ch prvkov tÃ½kajÃºcich 
sa cenzÃºry. SluÅ¾by Onion umoÅ¾ÅujÃº komukoÄ¾vek poskytovaÅ¥ obsah a sluÅ¾by 
anonymne. Kliknite dolu pre nÃ¡vÅ¡tevu onion strÃ¡nky DuckDuckGo.
+onboarding.tour-tor-onion-services.button=NavÅ¡tÃvte Onion strÃ¡nku
 onboarding.tour-tor-onion-services.next-button=Hotovo 
 
-onboarding.overlay-icon-tooltip-updated2=See what's new\nin %S
+onboarding.overlay-icon-tooltip-updated2=ZobraziÅ¥ Äo je novÃ©\nv %S
 onboarding.tour-tor-update.prefix-new=NovÃ½
-onboarding.tour-tor-update.prefix-updated=Updated
+onboarding.tour-tor-update.prefix-updated=AktualizovanÃ©
 
-onboarding.tour-tor-toolbar=Toolbar
-onboarding.tour-tor-toolbar-update-8.5.title=Toolbar layout
-onboarding.tour-tor-toolbar-update-8.5.description=We improved the browser 
toolbar layout. We moved the Torbutton icon after the URL bar, and we added a 
security level icon next to it.
+onboarding.tour-tor-toolbar=NÃ¡stroje
+onboarding.tour-tor-toolbar-update-8.5.title=RozloÅ¾enie nÃ¡strojov
+onboarding.tour-tor-toolbar-update-8.5.description=VylepÅ¡ili sme rozloÅ¾enie 
nÃ¡strojov prehliadaÄa. Posunuli sme ikonu TortlaÄidla za URL adresovÃ½ panel 
a pridali sme vedÄ¾a ikonu Ãºrovne zabezpeÄenia. 
 onboarding.tour-tor-toolbar-update-8.5.next-button=PrejsÅ¥ do BezpeÄnosti
 
-onboarding.tour-tor-security-update-8.5.title=Security level experience
-onboarding.tour-tor-security-update-8.5.description=We improved how you see 
and set your security level. We replaced the security slider with a toolbar 
icon that makes your current level visible at all times. Click it to view 
details about your current level or to change your security settings.
+onboarding.tour-tor-security-update-8.5.title=SkÃºsenosti s ÃºrovÅou 
zabezpeÄenia
+onboarding.tour-tor-security-update-8.5.description=VylepÅ¡ili sme pre VÃ¡s 
zobrazenie a nastavenie Ãºrovne zabezpeÄenia. Zamenili sme bezpeÄnostnÃ½ 
slider s ikonou, ktorÃ¡ VÃ¡m bude stÃ¡le zobrazovaÅ¥ aktuÃ¡lnu ÃºroveÅ. 
Kliknite pre zobrazenie detailov alebo zmeny  VaÅ¡ej aktuÃ¡lnej Ãºrovni 
bezpeÄnosti.
 
 # Circuit Display onboarding.
 onboarding.tor-circuit-display.next=NasledujÃºce
@@ -61,7 +61,7 @@ onboarding.tor-circuit-display.one-of-three=1 z 3
 onboarding.tor-circuit-display.two-of-three=2 z 3
 onboarding.tor-circuit-display.three-of-three=3 z 3
 
-onboarding.tor-circuit-display.intro.title=How do circuits work?
+onboarding.tor-circuit-display.intro.title=Ako pracujÃº Obvody?
 onboarding.tor-circuit-display.intro.msg=Circuits are made up of randomly 
assigned relays, which are computers around the world configured to forward Tor 
traffic. Circuits allow you to browse privately and to connect to onion 
services.
 
 onboarding.tor-circuit-display.diagram.title=Zobrazenie Okruhov

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

[tor-commits] [translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

2019-04-11 Thread translation

commit b21570b1110b8d2ab71a2443f0b83fbe506ce2fe
Author: Translation commit bot 
Date:   Thu Apr 11 09:17:55 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+es.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 2d0b985a5..5dcff058f 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1,7 +1,7 @@
 # Translators:
 # erinm, 2019
-# Emma Peel, 2019
 # Zuhualime Akoochimoya, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-09 09:20+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Zuhualime Akoochimoya, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -934,11 +934,11 @@ msgid ""
 "across different sites."
 msgstr ""
 "Cuando conectas a un sitio web, no son sÃ³lo los operadores de ese sitio los "
-"que pueden registrar informaciÃ³n sobre tu visita. La mayorÃa de los sitios "
-"web ahora usan numerosos servicios de terceros, incluyendo botones \"Me "
-"gusta\" de redes sociales, rastreadores para analÃticas, y balizas "
-"publicitarias, todos los cuales pueden vincular tu actividad por distintos "
-"sitios."
+"que pueden registrar informaciÃ³n sobre tu visita. Hoy en dÃa la mayorÃa de 
"
+"los sitios web usan numerosos servicios de terceros, incluyendo botones \"Me"
+" gusta\" de redes sociales, rastreadores para estadÃsticas, y anuncios "
+"publicitarios, todos los cuales pueden vincular tu actividad a travÃ©s de los"
+" distintos sitios."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)

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

[tor-commits] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-04-11 Thread translation

commit 5ce519576c0438e8a44efd149b475d4105b432dd
Author: Translation commit bot 
Date:   Thu Apr 11 09:17:49 2019 +

Update translations for tbmanual-contentspot
---
 contents+es.po | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 2d0b985a5..5dcff058f 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1,7 +1,7 @@
 # Translators:
 # erinm, 2019
-# Emma Peel, 2019
 # Zuhualime Akoochimoya, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -9,7 +9,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-09 09:20+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Zuhualime Akoochimoya, 2019\n"
+"Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -934,11 +934,11 @@ msgid ""
 "across different sites."
 msgstr ""
 "Cuando conectas a un sitio web, no son sÃ³lo los operadores de ese sitio los "
-"que pueden registrar informaciÃ³n sobre tu visita. La mayorÃa de los sitios "
-"web ahora usan numerosos servicios de terceros, incluyendo botones \"Me "
-"gusta\" de redes sociales, rastreadores para analÃticas, y balizas "
-"publicitarias, todos los cuales pueden vincular tu actividad por distintos "
-"sitios."
+"que pueden registrar informaciÃ³n sobre tu visita. Hoy en dÃa la mayorÃa de 
"
+"los sitios web usan numerosos servicios de terceros, incluyendo botones \"Me"
+" gusta\" de redes sociales, rastreadores para estadÃsticas, y anuncios "
+"publicitarios, todos los cuales pueden vincular tu actividad a travÃ©s de los"
+" distintos sitios."
 
 #: https//tb-manual.torproject.org/en-US/managing-identities/
 #: (content/managing-identities/contents+en-US.lrtopic.body)

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

[tor-commits] [translation/tpo-web] Update translations for tpo-web

2019-04-11 Thread translation

commit c760ac3670a311d35ce0a3daa6d0a823cb19dc70
Author: Translation commit bot 
Date:   Thu Apr 11 08:51:47 2019 +

Update translations for tpo-web
---
 contents+sk.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/contents+sk.po b/contents+sk.po
index fbc86d275..d3a42eeb9 100644
--- a/contents+sk.po
+++ b/contents+sk.po
@@ -3,6 +3,7 @@
 # Michal Sykora , 2019
 # erinm, 2019
 # Lenka JeÅ¾kovÃ¡ , 2019
+# Marek ÄÃ¡pek , 2019
 # 
 msgid ""
 msgstr ""
@@ -10,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-06 10:26+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Lenka JeÅ¾kovÃ¡ , 2019\n"
+"Last-Translator: Marek ÄÃ¡pek , 2019\n"
 "Language-Team: Slovak (https://www.transifex.com/otf/teams/1519/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -875,7 +876,7 @@ msgstr ""
 
 #: templates/press.html:30
 msgid "Onion Services"
-msgstr ""
+msgstr "SluÅ¾by Onion"
 
 #: templates/press.html:40
 msgid "Press Releases"

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

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

2019-04-11 Thread translation

commit 934dc6914bc11a957768f54b39021d6daaea188b
Author: Translation commit bot 
Date:   Thu Apr 11 08:50:43 2019 +

Update translations for torbutton-browseronboardingproperties
---
 sk/browserOnboarding.properties | 38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/sk/browserOnboarding.properties b/sk/browserOnboarding.properties
index eb3bdbd81..0042695ac 100644
--- a/sk/browserOnboarding.properties
+++ b/sk/browserOnboarding.properties
@@ -15,29 +15,29 @@ onboarding.tour-tor-privacy.button=PrejsÅ¥ na sieÅ¥ Tor
 onboarding.tour-tor-network=SieÅ¥ Tor
 onboarding.tour-tor-network.title=Surfujte na decentralizovanej sieti.
 onboarding.tour-tor-network.description=PrehliadaÄ Tor vÃ¡s pripojÃ na sieÅ¥ 
Tor, ktorÃº prevÃ¡dzkujÃº tisÃce dobrovoÄ¾nÃkov po celom svete. Na rozdiel od 
VPN, tu nie je Å¾iadny slabÃ½ bod alebo Å¾iadna centralizovanÃ¡ autorita, 
ktorej by ste museli dÃ´verovaÅ¥ na to aby ste si mohli uÅ¾iÅ¥ prehliadanie 
internetu v sÃºkromÃ.
-onboarding.tour-tor-network.button=Go to Circuit Display
+onboarding.tour-tor-network.button=ÃsÅ¥ do Zobrazenia Okruhov
 
-onboarding.tour-tor-circuit-display=Circuit Display
-onboarding.tour-tor-circuit-display.title=See your path.
-onboarding.tour-tor-circuit-display.description=For each domain you visit, 
your traffic is relayed and encrypted in a circuit across three Tor relays 
around the world. No website knows where you are connecting from. You can 
request a new circuit by clicking âNew Circuit for this Siteâ on our 
Circuit Display.
-onboarding.tour-tor-circuit-display.button=See My Path
-onboarding.tour-tor-circuit-display.next-button=Go to Security
+onboarding.tour-tor-circuit-display=Zobrazenie Okruhov
+onboarding.tour-tor-circuit-display.title=ZobraziÅ¥ VaÅ¡u cestu.
+onboarding.tour-tor-circuit-display.description=Pre kaÅ¾dÃº domÃ©nu ktorÃº 
navÅ¡tÃvite, VÃ¡Å¡ dÃ¡tovÃ½ tok je presmerovanÃ½ a Å¡ifrovanÃ½ po Okruhu cez 
tri Tor relÃ© vo svete. Å½iadna webstrÃ¡nka nezistÃ odkiaÄ¾ sa pripÃ¡jate. 
MÃ´Å¾ete poÅ¾iadaÅ¥ o "NovÃ½ Okruh pre tÃºto strÃ¡nku" v naÅ¡om ZobrazenÃ 
Okruhov.
+onboarding.tour-tor-circuit-display.button=ZobraziÅ¥ moju cestu
+onboarding.tour-tor-circuit-display.next-button=PrejsÅ¥ na BezpeÄnosÅ¥
 
 onboarding.tour-tor-security=BezpeÄnosÅ¥
 onboarding.tour-tor-security.title=ÃroveÅ bezpeÄnosti zÃ¡visÃ na vÃ¡s.
-onboarding.tour-tor-security.description=We also provide you with additional 
settings for bumping up your browser security. Our Security Settings allow you 
to block elements that could be used to attack your computer. Click below to 
see what the different options do.
-onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and 
HTTPS Everywhere are not included on the toolbar, but you can customize your 
toolbar to add them.
-onboarding.tour-tor-security-level.button=See Your Security Level
-onboarding.tour-tor-security-level.next-button=Go to Experience Tips
+onboarding.tour-tor-security.description=Poskytujeme vÃ¡m rozÅ¡ÃrenÃ© 
nastavenia, vÄaka ktorÃ½m mÃ´Å¾ete zvÃ½Å¡iÅ¥ ÃºroveÅ zabezpeÄenia svojho 
prehliadaÄa. NaÅ¡e bezpeÄnostnÃ© nastavenia vÃ¡m umoÅ¾ÅujÃº blokovaÅ¥ prvky, 
ktorÃ© by mohli byÅ¥ pouÅ¾itÃ© na Ãºtok na vaÅ¡e zariadenie. Kliknite dolu na 
zobrazenie ako sa sprÃ¡vajÃº rÃ´zne moÅ¾nosti.
+onboarding.tour-tor-security.description-suffix=PoznÃ¡mka: Predvolene, 
NoScript a HTTPS Everywhere nie sÃº na paneli nÃ¡strojov, ale mÃ´Å¾ete ich tam 
pridaÅ¥.
+onboarding.tour-tor-security-level.button=ZobraziÅ¥ VaÅ¡u ÃºroveÅ 
zabezpeÄenia.
+onboarding.tour-tor-security-level.next-button=ZobraziÅ¥ tipy zo skÃºsenosti
 
-onboarding.tour-tor-expect-differences=Experience Tips
-onboarding.tour-tor-expect-differences.title=Expect some differences.
-onboarding.tour-tor-expect-differences.description=With all the security and 
privacy features provided by Tor, your experience while browsing the internet 
may be a little different. Things may be a bit slower, and depending on your 
security level, some elements may not work or load. You may also be asked to 
prove you are a human and not a robot.
-onboarding.tour-tor-expect-differences.button=See FAQs
-onboarding.tour-tor-expect-differences.next-button=Go to Onion Services
+onboarding.tour-tor-expect-differences=Tipy zo skÃºsenostÃ
+onboarding.tour-tor-expect-differences.title=OÄakÃ¡vajte nejakÃ© rozdiely
+onboarding.tour-tor-expect-differences.description=Ak mÃ¡te aktivovanÃ© 
vÅ¡etky funkcie, ktorÃ© vÃ¡m Tor ponÃºka na zvÃ½Å¡enie Ãºrovne vaÅ¡ej 
bezpeÄnosti a sÃºkromia, vaÅ¡e prehliadanie sa vÃ¡m sprvu mÃ´Å¾e zdaÅ¥ 
zvlÃ¡Å¡tne, inÃ©. V zÃ¡vislosti na Ãºrovni vÃ¡Å¡ho zabezpeÄenia mÃ´Å¾e byÅ¥ 
vaÅ¡e prehliadanie trochu pomalÃ© a niektorÃ© prvky sa nemusia naÄÃtaÅ¥. 
TaktieÅ¾ mÃ´Å¾ete byÅ¥ poÅ¾iadanÃ, aby ste dokÃ¡zali, Å¾e nie ste robot.
+onboarding.tour-tor-expect-differences.button=ZobraziÅ¥ Äasto KladenÃ© OtÃ¡zky

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

2019-04-11 Thread translation

commit cbffe0f22c9b7763afe64b1fff9e6d85507a4245
Author: Translation commit bot 
Date:   Thu Apr 11 08:20:33 2019 +

Update translations for torbutton-browseronboardingproperties_completed
---
 nl/browserOnboarding.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/browserOnboarding.properties b/nl/browserOnboarding.properties
index 4e1740bc0..b46d9b8d4 100644
--- a/nl/browserOnboarding.properties
+++ b/nl/browserOnboarding.properties
@@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Naar 
Beveiliging
 onboarding.tour-tor-security=Beveiliging
 onboarding.tour-tor-security.title=Kies uw ervaring.
 onboarding.tour-tor-security.description=We bieden ook aanvullende 
instellingen om de beveiliging van uw browser te verhogen. Via onze 
Beveiligingsinstellingen kunt u elementen blokkeren die kunnen worden gebruikt 
om uw computer aan te vallen. Klik hieronder om te zien wat de verschillende 
opties doen.
-onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and 
HTTPS Everywhere are not included on the toolbar, but you can customize your 
toolbar to add them.
+onboarding.tour-tor-security.description-suffix=Opmerking: NoScript en HTTPS 
Everywhere zijn standaard niet in de werkbalk opgenomen, maar deze kunt u 
aanpassen om ze toe te voegen.
 onboarding.tour-tor-security-level.button=Uw beveiligingsniveau bekijken
 onboarding.tour-tor-security-level.next-button=Naar Ervaringstips
 

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

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

2019-04-11 Thread translation

commit 5981b23a56ac28e84aed94777e798af07849c219
Author: Translation commit bot 
Date:   Thu Apr 11 08:20:27 2019 +

Update translations for torbutton-browseronboardingproperties
---
 nl/browserOnboarding.properties | 2 +-
 sk/browserOnboarding.properties | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nl/browserOnboarding.properties b/nl/browserOnboarding.properties
index 4e1740bc0..b46d9b8d4 100644
--- a/nl/browserOnboarding.properties
+++ b/nl/browserOnboarding.properties
@@ -26,7 +26,7 @@ onboarding.tour-tor-circuit-display.next-button=Naar 
Beveiliging
 onboarding.tour-tor-security=Beveiliging
 onboarding.tour-tor-security.title=Kies uw ervaring.
 onboarding.tour-tor-security.description=We bieden ook aanvullende 
instellingen om de beveiliging van uw browser te verhogen. Via onze 
Beveiligingsinstellingen kunt u elementen blokkeren die kunnen worden gebruikt 
om uw computer aan te vallen. Klik hieronder om te zien wat de verschillende 
opties doen.
-onboarding.tour-tor-security.description-suffix=Note: By default, NoScript and 
HTTPS Everywhere are not included on the toolbar, but you can customize your 
toolbar to add them.
+onboarding.tour-tor-security.description-suffix=Opmerking: NoScript en HTTPS 
Everywhere zijn standaard niet in de werkbalk opgenomen, maar deze kunt u 
aanpassen om ze toe te voegen.
 onboarding.tour-tor-security-level.button=Uw beveiligingsniveau bekijken
 onboarding.tour-tor-security-level.next-button=Naar Ervaringstips
 
diff --git a/sk/browserOnboarding.properties b/sk/browserOnboarding.properties
index 058f1e462..eb3bdbd81 100644
--- a/sk/browserOnboarding.properties
+++ b/sk/browserOnboarding.properties
@@ -4,8 +4,8 @@
 
 onboarding.tour-tor-welcome=Vitajte
 onboarding.tour-tor-welcome.title=Ste pripravenÃ½.
-onboarding.tour-tor-welcome.description=Tor Browser offers the highest 
standard of privacy and security while browsing the web. Youâre now protected 
against tracking, surveillance, and censorship. This quick onboarding will show 
you how.
-onboarding.tour-tor-welcome.next-button=Go to Privacy
+onboarding.tour-tor-welcome.description=PrehliadaÄ Tor vÃ¡m ponÃºka 
najvyÅ¡Å¡Ã Å¡tandard sÃºkromia a bezpeÄnosti na webe. Ste chrÃ¡nenÃ pred 
sledovanÃm, odpoÄÃºvanÃm a cenzÃºrou. Pripravili sme si pre vÃ¡s rÃ½chly 
nÃ¡vod.
+onboarding.tour-tor-welcome.next-button=PrejsÅ¥ do SÃºkromia
 
 onboarding.tour-tor-privacy=SÃºkromie
 onboarding.tour-tor-privacy.title=Zbavte sa sledovacÃch prvkov
@@ -14,7 +14,7 @@ onboarding.tour-tor-privacy.button=PrejsÅ¥ na sieÅ¥ Tor
 
 onboarding.tour-tor-network=SieÅ¥ Tor
 onboarding.tour-tor-network.title=Surfujte na decentralizovanej sieti.
-onboarding.tour-tor-network.description=Tor Browser connects you to the Tor 
network run by thousands of volunteers around the world. Unlike a VPN, 
thereâs no one point of failure or centralized entity you need to trust in 
order to enjoy the internet privately.
+onboarding.tour-tor-network.description=PrehliadaÄ Tor vÃ¡s pripojÃ na sieÅ¥ 
Tor, ktorÃº prevÃ¡dzkujÃº tisÃce dobrovoÄ¾nÃkov po celom svete. Na rozdiel od 
VPN, tu nie je Å¾iadny slabÃ½ bod alebo Å¾iadna centralizovanÃ¡ autorita, 
ktorej by ste museli dÃ´verovaÅ¥ na to aby ste si mohli uÅ¾iÅ¥ prehliadanie 
internetu v sÃºkromÃ.
 onboarding.tour-tor-network.button=Go to Circuit Display
 
 onboarding.tour-tor-circuit-display=Circuit Display

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

[tor-commits] [translation/tba-torbrowserstringsdtd_completed] Update translations for tba-torbrowserstringsdtd_completed

2019-04-11 Thread translation

commit 1d02838f36fcd6900cbd677dae391e5c7d8865f7
Author: Translation commit bot 
Date:   Thu Apr 11 08:18:20 2019 +

Update translations for tba-torbrowserstringsdtd_completed
---
 sk/torbrowser_strings.dtd | 57 +++
 1 file changed, 57 insertions(+)

diff --git a/sk/torbrowser_strings.dtd b/sk/torbrowser_strings.dtd
new file mode 100644
index 0..01a4814c4
--- /dev/null
+++ b/sk/torbrowser_strings.dtd
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd

2019-04-11 Thread translation

commit 44d259949226e57d762d65f389fe640fc86204c2
Author: Translation commit bot 
Date:   Thu Apr 11 08:18:14 2019 +

Update translations for tba-torbrowserstringsdtd
---
 sk/torbrowser_strings.dtd | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/sk/torbrowser_strings.dtd b/sk/torbrowser_strings.dtd
index d3e7916f9..01a4814c4 100644
--- a/sk/torbrowser_strings.dtd
+++ b/sk/torbrowser_strings.dtd
@@ -32,26 +32,26 @@
 
 
 
-
-
+
+
 
 
 
 
 
 
-
-
+
+
 
-
+
 
 
-
+
 
 
-
-
-
-
+
+
+
+
 
-
+

___
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-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens

2019-04-11 Thread gk

commit 7b5f5ee887cd6fd865e86784ad536b4c0136ce83
Author: Matthew Finkel 
Date:   Tue Apr 9 17:52:28 2019 +

fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration 
screens
---
 .../app/src/main/res/layout/tor_bootstrap.xml  |   9 +-
 .../base/java/org/mozilla/gecko/BrowserApp.java|   2 +-
 .../gecko/torbootstrap/TorBootstrapPanel.java  | 203 +
 .../mozilla/gecko/torbootstrap/TorPreferences.java |  13 +-
 4 files changed, 176 insertions(+), 51 deletions(-)

diff --git a/mobile/android/app/src/main/res/layout/tor_bootstrap.xml 
b/mobile/android/app/src/main/res/layout/tor_bootstrap.xml
index ce2b1c910a44..af9c7d11d3f2 100644
--- a/mobile/android/app/src/main/res/layout/tor_bootstrap.xml
+++ b/mobile/android/app/src/main/res/layout/tor_bootstrap.xml
@@ -74,13 +74,10 @@
android:tint="#"
android:layout_height="wrap_content"
android:layout_width="match_parent"
-   android:layout_marginTop="130dp"
android:layout_marginBottom="37dp"
-   android:layout_marginRight="95dp"
-   android:layout_marginLeft="95dp"
+   android:layout_marginRight="10dp"
+   android:layout_marginLeft="10dp"
android:layout_centerHorizontal="true"
android:layout_below="@id/tor_bootstrap_settings_gear"
-   android:layout_above="@id/tor_bootstrap_last_status_message"
-   android:paddingLeft="20dp"
-   android:paddingRight="20dp"/>
+   
android:layout_above="@id/tor_bootstrap_last_status_message" />
 
diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java 
b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index dce3dc1548c2..006d5c11f210 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -3134,7 +3134,7 @@ public class BrowserApp extends GeckoApp
 // When the content loaded in the background (such as 
about:tor),
 // it was loaded while mBrowserChrome was GONE. We should 
refresh the
 // height now so the page is rendered correctly.
-Tabs.getInstance().getSelectedTab().doReload(false);
+Tabs.getInstance().getSelectedTab().doReload(true);
 
 // If we finished, then Tor bootstrapped 100%
 mTorNeedsStart = false;
diff --git 
a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
 
b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
index 8d42b13a2a8e..2ee4c2528691 100644
--- 
a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
+++ 
b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
@@ -7,7 +7,6 @@ package org.mozilla.gecko.torbootstrap;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.graphics.drawable.Animatable2;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Bundle;
@@ -16,6 +15,7 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -44,6 +44,8 @@ public class TorBootstrapPanel extends FirstrunPanel 
implements TorBootstrapLogg
 protected Activity mActContext;
 protected TorBootstrapPager.TorBootstrapController mBootstrapController;
 
+private ViewTreeLayoutListener mViewTreeLayoutListener;
+
 // These are used by the background AlphaChanging thread for dynamically 
changing
 // the alpha value of the Onion during bootstrap.
 private int mOnionCurrentAlpha = 255;
@@ -85,6 +87,155 @@ public class TorBootstrapPanel extends FirstrunPanel 
implements TorBootstrapLogg
 }
 }
 
+// Android tries scaling the image as a square. Create a modified ViewPort 
via padding
+// top, left, right, and bottom such that the image aspect ratio is 
correct.
+private void setOnionImgLayout() {
+if (mRoot == null) {
+Log.i(LOGTAG, "setOnionImgLayout: mRoot is null");
+return;
+}
+
+ImageView onionImg = (ImageView) 
mRoot.findViewById(R.id.tor_bootstrap_onion);
+if (onionImg == null) {
+Log.i(LOGTAG, "setOnionImgLayout: onionImg is null");
+return;
+}
+
+// Dimensions of the SVG. If the image is ever changed, update these 
values. The
+// SVG viewport is 2dp wider due to clipping.
+final double imgHeight = 289.;
+final double imgWidth = 247.;
+
+// Dimensions of the current ImageView
+final int

[tor-commits] [tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens

2019-04-11 Thread gk

commit d3ea3528ce2cde0675d297ea934090c77f4b5f76
Author: Matthew Finkel 
Date:   Mon Apr 1 21:39:53 2019 +

fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration 
screens

Bug 29906 Add API-level guard
---
 .../org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git 
a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
 
b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
index 584c0fc3cdde..8d42b13a2a8e 100644
--- 
a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
+++ 
b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorBootstrapPanel.java
@@ -106,11 +106,16 @@ public class TorBootstrapPanel extends FirstrunPanel 
implements TorBootstrapLogg
 }
 });
 
-// This should be declared in the xml layout, however there is a bug
-// preventing this (the XML attribute isn't actually defined in the
-// SDK).
-// https://issuetracker.google.com/issues/37036728
-connectButton.setClipToOutline(true);
+if (Build.VERSION.SDK_INT > 20) {
+// Round the button's edges, but only on API 21+. Earlier versions
+// do not support this.
+//
+// This should be declared in the xml layout, however there is a 
bug
+// preventing this (the XML attribute isn't actually defined in the
+// SDK).
+// https://issuetracker.google.com/issues/37036728
+connectButton.setClipToOutline(true);
+}
 
 configureGearCogClickHandler();
 



___
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-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens

2019-04-11 Thread gk

commit fd7cccb3f4a908ff38edfefc36b194666c886f69
Author: Matthew Finkel 
Date:   Tue Apr 2 20:59:30 2019 +

fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration 
screens

Bug 29982 - Adding additional safe guards
---
 .../mozilla/gecko/torbootstrap/TorPreferences.java | 42 +-
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git 
a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java 
b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java
index 32a3bed3e685..9a8468292e7d 100644
--- 
a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java
+++ 
b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java
@@ -15,6 +15,7 @@ import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
+import android.support.v7.app.ActionBar;
 import android.text.style.ClickableSpan;
 import android.text.SpannableString;
 import android.text.Spanned;
@@ -138,7 +139,9 @@ public class TorPreferences extends 
AppCompatPreferenceActivity {
 // Save the current preference when the app is minimized or swiped away.
 @Override
 public void onStop() {
-mFrag.onSaveState();
+if (mFrag != null) {
+mFrag.onSaveState();
+}
 super.onStop();
 }
 
@@ -163,7 +166,9 @@ public class TorPreferences extends 
AppCompatPreferenceActivity {
 // the back button
 @Override
 public void onBackPressed() {
-mFrag.onSaveState();
+if (mFrag != null) {
+mFrag.onSaveState();
+}
 super.onBackPressed();
 }
 
@@ -200,7 +205,7 @@ public class TorPreferences extends 
AppCompatPreferenceActivity {
 // 
https://android.googlesource.com/platform/frameworks/base/+/6af15ebcfec64d0cc6879a0af9cfffd3e084ee73
 @Override
 public boolean onOptionsItemSelected(MenuItem item) {
-if (item.getItemId() == android.R.id.home) {
+if (item != null && item.getItemId() == android.R.id.home) {
 Log.i(LOGTAG, "onOptionsItemSelected(): Home");
 onNavigateUp();
 return true;
@@ -214,8 +219,8 @@ public class TorPreferences extends 
AppCompatPreferenceActivity {
 protected TorPreferences mTorPrefAct;
 
 @Override
-public void onCreate(Bundle savedInstanceState) {
-super.onCreate(savedInstanceState);
+public void onActivityCreated(Bundle savedInstanceState) {
+super.onActivityCreated(savedInstanceState);
 
 // This is only ever a TorPreferences
 mTorPrefAct = (TorPreferences) getActivity();
@@ -317,6 +322,11 @@ public class TorPreferences extends 
AppCompatPreferenceActivity {
 
 // Disable the bridges.enabled Preference
 protected void disableBridges(PreferenceFragment frag) {
+if (frag == null) {
+Log.w(LOGTAG, "disableBridges: frag is null");
+return;
+}
+
 SwitchPreference bridgesEnabled = (SwitchPreference) 
frag.findPreference(PREFS_BRIDGES_ENABLED);
 Preference bridgesType = frag.findPreference(PREFS_BRIDGES_TYPE);
 Preference bridgesProvide = 
frag.findPreference(PREFS_BRIDGES_PROVIDE);
@@ -349,7 +359,14 @@ public class TorPreferences extends 
AppCompatPreferenceActivity {
 
 // Set the current title
 protected void setTitle(int resId) {
-mTorPrefAct.getSupportActionBar().setTitle(resId);
+ActionBar actionBar = mTorPrefAct.getSupportActionBar();
+
+if (actionBar == null) {
+Log.w(LOGTAG, "setTitle: actionBar is null");
+return;
+}
+
+actionBar.setTitle(resId);
 }
 }
 
@@ -446,6 +463,8 @@ public class TorPreferences extends 
AppCompatPreferenceActivity {
 public void onChildViewAdded(View parent, View child) {
 Log.i(LOGTAG, "onChildViewAdded: Adding ListView child 
view");
 
+setTitle(R.string.pref_tor_network_title);
+
 // Make sure the Switch widget is synchronized with the 
preference
 final Switch bridgesEnabledSwitch =
 (Switch) 
parent.findViewById(android.R.id.switch_widget);
@@ -541,6 +560,11 @@ public class TorPreferences extends 
AppCompatPreferenceActivity {
 //   If PREFS_BRIDGES_PROVIDE is not null, then true
 //   Else false
 private boolean isBridgeProvided(SwitchPreference bridgesEnabled) {
+if (bridgesEnabled == null) {
+Log.i(LOGTAG, "isBridgeProvided: bridgesEnabled is null");
+return false;
+}
+
 if (!bridgesEnabled.isChecked()) {
 Log.i(LOGTAG, "isBridgeProvided: bridgesEnabled is not 
checked");

[tor-commits] [tor-browser/tor-browser-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 1. Add new Tor resources

2019-04-11 Thread gk

commit be91c6f0a5cba14a7ba0e17682b158ada97667be
Author: Matthew Finkel 
Date:   Tue Apr 9 17:53:01 2019 +

fixup! Bug 28329 - Part 1. Add new Tor resources
---
 mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml 
b/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml
index 6bcc52f87f93..e0909237886c 100644
--- a/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml
+++ b/mobile/android/app/src/main/res/drawable/tor_spinning_onion.xml
@@ -3,7 +3,7 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/.  -->
 
 http://schemas.android.com/apk/res/android;>
+android:viewportWidth="249" android:width="24dp" 
xmlns:android="http://schemas.android.com/apk/res/android;>
 
 
 



___
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-60.6.1esr-8.5-1] fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens

2019-04-11 Thread gk

commit 8b16afa5b647078a22a862360f4764bce82760ca
Author: Matthew Finkel 
Date:   Fri Mar 22 13:43:30 2019 +

fixup! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration 
screens

Bug 29858 - Load onboarding panels after bootstrapping is completed.
---
 mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java 
b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index f8af42f09b5f..dce3dc1548c2 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -1363,10 +1363,10 @@ public class BrowserApp extends GeckoApp
 if (!IntentUtils.getIsInAutomationFromEnvironment(intent)) {
 if (mTorNeedsStart) {
 showTorBootstrapPager();
+} else {
+// We can't show the first run experience until Gecko has 
finished initialization (bug 1077583).
+checkFirstrun(this, intent);
 }
-
-// We can't show the first run experience until Gecko has finished 
initialization (bug 1077583).
-checkFirstrun(this, intent);
 }
 }
 
@@ -3138,6 +3138,11 @@ public class BrowserApp extends GeckoApp
 
 // If we finished, then Tor bootstrapped 100%
 mTorNeedsStart = false;
+
+// When bootstrapping completes, check if the Firstrun 
(onboarding) screens
+// should be shown.
+final SafeIntent intent = new SafeIntent(getIntent());
+checkFirstrun(BrowserApp.this, intent);
 }
 });
 }



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

[tor-commits] [translation/tba-torbrowserstringsdtd] Update translations for tba-torbrowserstringsdtd

2019-04-11 Thread translation

commit 02a24cc47b9e55b54a3ffb9178e082a246dee973
Author: Translation commit bot 
Date:   Thu Apr 11 07:47:42 2019 +

Update translations for tba-torbrowserstringsdtd
---
 sk/torbrowser_strings.dtd | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sk/torbrowser_strings.dtd b/sk/torbrowser_strings.dtd
index 4ddf27da3..d3e7916f9 100644
--- a/sk/torbrowser_strings.dtd
+++ b/sk/torbrowser_strings.dtd
@@ -24,22 +24,22 @@
 
 
 
-
+
 
-
+
 
 
-
-
+
+
 
 
 
 
-
-
+
+
 
-
-
+
+
 
 
 

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

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

2019-04-11 Thread translation

commit a9f5cad518b52479d7e6ba39b0fba363ec660add
Author: Translation commit bot 
Date:   Thu Apr 11 07:46:40 2019 +

Update translations for tails-misc_completed
---
 sk.po | 897 ++
 1 file changed, 569 insertions(+), 328 deletions(-)

diff --git a/sk.po b/sk.po
index ae8b6d73c..fa17fbd90 100644
--- a/sk.po
+++ b/sk.po
@@ -5,32 +5,33 @@
 # Translators:
 # elo, 2014
 # FooBar , 2015
+# Marek ÄÃ¡pek , 2019
 # Michal SlovÃ¡k , 2013
 # Roman 'Kaktuxista' Benji , 2014
 # Stanislav TomÃ¡Å¡ , 2015
 msgid ""
 msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-05 22:32+0200\n"
-"PO-Revision-Date: 2015-08-04 20:56+\n"
-"Last-Translator: Stanislav TomÃ¡Å¡ \n"
+"POT-Creation-Date: 2019-04-06 14:00+0200\n"
+"PO-Revision-Date: 2019-04-11 07:43+\n"
+"Last-Translator: Marek ÄÃ¡pek \n"
 "Language-Team: Slovak 
(http://www.transifex.com/otf/torproject/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n 
>= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:43
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
 msgid "Tor is ready"
 msgstr "Tor je pripravenÃ½"
 
-#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:44
+#: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:40
 msgid "You can now access the Internet."
 msgstr "Teraz mÃ´Å¾ete pristupovaÅ¥ k Internetu."
 
-#: config/chroot_local-includes/etc/whisperback/config.py:64
+#: config/chroot_local-includes/etc/whisperback/config.py:69
 #, python-format
 msgid ""
 "Help us fix your bug!\n"
@@ -47,308 +48,397 @@ msgid ""
 "\n"
 msgstr "PomÃ´Å¾te nÃ¡m opraviÅ¥ vaÅ¡u chybu!\nÄÃtajte naÅ¡e inÅ¡trukcie pre nahlÃ¡senie 
chyby.\nNevkladajte viac osobnÃ½ch Ãºdajov ako 
je\nnevyhnutnÃ©!\nO poskytovanÃ emailovej adresy 
nÃ¡m\n\nPoskytnutie emailovej adresy nÃ¡m umoÅ¾Åuje kontaktovaÅ¥ vÃ¡s 
aby sme objasnili problÃ©m. Toto\nje potrebnÃ© pre obrovskÃ© mnoÅ¾stvo, 
vÃ¤ÄÅ¡ina \nhlÃ¡senÃ, ktorÃ© dostÃ¡vame, priÄom najviac bez akÃ½chkoÄ¾vek 
kontaktnÃ½ch Ãºdajov, je nepouÅ¾iteÄ¾nÃ¡. Na druhej strane to taktieÅ¾ 
poskytuje\nprÃleÅ¾itosÅ¥ Å¡pehom, ako vÃ¡Å¡mu emailovÃ©mu Äi internetovÃ©mu 
poskytovateÄ¾ovi,\nsi potvrdiÅ¥, Å¾e\npouÅ¾Ãvate Tails.\n\n"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:14
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:51
+msgid ""
+"You can install additional software automatically from your persistent "
+"storage when starting Tails."
+msgstr "MÃ´Å¾ete inÅ¡talovaÅ¥ doplnkovÃ½ softvÃ©r automaticky z VÃ¡Å¡ho 
TrvalÃ©ho ÃºloÅ¾iska keÄ Tails naÅ¡tartuje."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:77
+msgid ""
+"The following software is installed automatically from your persistent "
+"storage when starting Tails."
+msgstr "NasledujÃºci softvÃ©r bude automaticky nainÅ¡talovanÃ½ z VÃ¡Å¡ho 
TrvalÃ©ho ÃºloÅ¾iska keÄ Tails naÅ¡tartuje."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:135
+#: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:173
+msgid ""
+"To add more, install some software using Synaptic Package Manager or APT on the command line."
+msgstr "Ak chcete pridaÅ¥ viac, nainÅ¡talujte ÄalÅ¡Ã softvÃ©r pomocou SprÃ¡vcu baliÄkov Synaptic alebo APT v prÃkazovom riadku."
+
+#: 
config/chroot_local-includes/usr/share/tails/additional-software/configuration-window.ui:154
+msgid "_Create persistent storage"
+msgstr "_VytvoriÅ¥ TrvalÃ© ÃºloÅ¾isko"
+
+#: config/chroot_local-includes/usr/local/bin/electrum:57
 msgid "Persistence is disabled for Electrum"
 msgstr "ZotrvaÄnosÅ¥ je pre Electrum vypnutÃ¡"
 
-#: config/chroot_local-includes/usr/local/bin/electrum:16
+#: config/chroot_local-includes/usr/local/bin/electrum:59
 msgid ""
 "When you reboot Tails, all of Electrum's data will be lost, including your "
 "Bitcoin wallet. It is strongly recommended to only run Electrum when its "
 "persistence feature is activated."
 msgstr "KeÄ reÅ¡tartujete Tails vÅ¡etky Ãºdaje z Electrum-u budÃº stratenÃ©, 
vrÃ¡tane vaÅ¡ej Bitcoin-ovej peÅaÅ¾enky. Je preto hlboko odporÃºÄanÃ© 
spÃºÅ¡Å¥aÅ¥ Electrum vtedy keÄ je funkcia zotrvaÄnosti aktivovanÃ¡."
 
-#: config/chroot_local-includes/usr/local/bin/electrum:18
+#: config/chroot_local-includes/usr/local/bin/electrum:60
 msgid "Do you want to start Electrum anyway?"
 msgstr "Chcete spustiÅ¥ napriek tomu Electrum?"
 
-#:

1 2 >

1 - 100 of 107 matches

Mail list logo