date:20190829

[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml

2019-08-29 Thread translation

commit eb2bbd6c1957ac6e9d6d4d231e4c2a2c5ec6f729
Author: Translation commit bot 
Date:   Thu Aug 29 21:17:10 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 lt/index.html | 33 -
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/lt/index.html b/lt/index.html
index afc9436eb..66231d97d 100644
--- a/lt/index.html
+++ b/lt/index.html
@@ -35,11 +35,11 @@
 
   PlÄtinys
 
-  If your internet access is not censored, you 
should
-  consider installing the Snowflake extension to help users in censored
-  networks. There is no need to worry about which websites people are
-  accessing through your proxy. Their visible browsing IP address will
-  match their Tor exit node, not yours.
+  Jeigu jÅ«sÅ³ interneto prieiga nÄra blokuojama, 
jÅ«s turÄtumÄte
+  pagalvoti apie Snowflake plÄtinio Ä¯diegimÄ, kad padÄtumÄte 
naudotojams
+  kuriÅ³ tinklai blokuojami. Nereikia jaudintis dÄl to kokius 
tinklalapius lankys Å¾monÄs
+  per jÅ«sÅ³ tarpinÄ¯ serverÄ¯. JÅ³ matomas IP adresas atitiks
+  jÅ³ iÅ¡Äjimo mazgÄ, o ne jÅ«siÅ¡kÄ¯.
 
   https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/;>
   Diegi Ä¯ Firefox
@@ -54,22 +54,21 @@
 
   PRANEÅ AMA APIE KLAIDAS
   
-  If you encounter problems with Snowflake as a client or a proxy,
-  please consider filing a bug.  To do so, you will have to,
+  Jei turite problemÅ³ su Snowflake kaip klientas arba kaip tarpinis 
serveris,
+  uÅ¾pildykite klaidos bilietÄ.  NorÄdami tai padaryti jÅ«s 
turÄsite,
   
   
-Either https://trac.torproject.org/projects/tor/register;>create 
an
-account or https://trac.torproject.org/projects/tor/login;>log in
-using the shared cypherpunks account with password 
writecode.
+Arba https://trac.torproject.org/projects/tor/register;>susikurti
+paskyrÄ arba https://trac.torproject.org/projects/tor/login;>prisijungti
+naudojant bendrÄ cypherpunks'Å³ paskyrÄ su slaptaÅ¾odÅ¾io 
raÅ¡ymo kodu.
 
-https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake;>File
 a ticket
-using our bug tracker.
+https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake;>Registruokite
 klaidÄ
+naudodamiesi mÅ«sÅ³ klaidÅ³ sekliu.
   
-Please try to be as descriptive as possible with your ticket and if
-  possible include log messages that will help us reproduce the bug.
-  Consider adding keywords snowflake-webextension or 
snowflake-client
-  to let us know how which part of the Snowflake system is experiencing
-  problems.
+BÅ«kite kuo iÅ¡samesni pildydami bilietÄ ir jei Ä¯manoma pridÄkite
+  Å¾urnalo praneÅ¡imus, kurie mums padÄs atgaminti klaidÄ.
+  Galite pridÄti raktinius Å¾odÅ¾ius snowflake-webextension arba 
snowflake-client
+  kurie leis mums suprasti, su kuria Snowflake sistemos dalimi kyla 
problema.
 
   Ä®TERPTI
 

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

[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml

2019-08-29 Thread translation

commit ecac9490ea5b29be23e53d4274b647ac970eb5d5
Author: Translation commit bot 
Date:   Thu Aug 29 20:47:11 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 lt/index.html | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lt/index.html b/lt/index.html
index af2af388c..afc9436eb 100644
--- a/lt/index.html
+++ b/lt/index.html
@@ -15,11 +15,11 @@
 
   
 
-  Snowflake is a system to defeat internet censorship. People who are
-  censored can use Snowflake to access the internet. Their connection goes
-  through Snowflake proxies, which are run by volunteers. For more detailed
-  information about how Snowflake works see our
-  https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/;>documentation
 wiki.
+  Snowflake yra sistema nugalÄti interneto blokavimÄ. Blokuojami
+  Å¾monÄs gali naudotis Snowflake interneto pasiekimui. JÅ³ jungtis eina 
per
+  Snowflake tarpinius serverius, kuriuos palaiko savanoriai. Daugiau 
detalios
+  informacijos apie tai kaip veikia Snowflake rasite mÅ«sÅ³
+  https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/;>wiki 
dokumnetacijoje.
 
   
 

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

[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml

2019-08-29 Thread translation

commit 5749a01672e1cf8588c09cb92bf092b5c0a707bf
Author: Translation commit bot 
Date:   Thu Aug 29 19:47:10 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 lt/index.html | 86 +++
 1 file changed, 86 insertions(+)

diff --git a/lt/index.html b/lt/index.html
new file mode 100644
index 0..af2af388c
--- /dev/null
+++ b/lt/index.html
@@ -0,0 +1,86 @@
+
+
+
+
+
+
+Snowflake
+
+
+
+https://www.torproject.org/;>
+
+
+  SNOWFLAKE
+
+  
+
+  Snowflake is a system to defeat internet censorship. People who are
+  censored can use Snowflake to access the internet. Their connection goes
+  through Snowflake proxies, which are run by volunteers. For more detailed
+  information about how Snowflake works see our
+  https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/;>documentation
 wiki.
+
+  
+
+
+  NarÅ¡yklÄ
+
+  Jei jÅ«sÅ³ interneto prieiga blokuojama, turÄtumÄte parsisiÅ³sti
+  https://www.torproject.org/download/;>Tor 
NarÅ¡yklÄ.
+
+  
+
+
+
+  PlÄtinys
+
+  If your internet access is not censored, you 
should
+  consider installing the Snowflake extension to help users in censored
+  networks. There is no need to worry about which websites people are
+  accessing through your proxy. Their visible browsing IP address will
+  match their Tor exit node, not yours.
+
+  https://addons.mozilla.org/en-US/firefox/addon/torproject-snowflake/;>
+  Diegi Ä¯ Firefox
+
+https://chrome.google.com/webstore/detail/snowflake/mafpmfcccpbjnhfhjnllmmalhifmlcie;>
+  Diegti Ä¯ Chrome
+
+
+
+
+  
+
+  PRANEÅ AMA APIE KLAIDAS
+  
+  If you encounter problems with Snowflake as a client or a proxy,
+  please consider filing a bug.  To do so, you will have to,
+  
+  
+Either https://trac.torproject.org/projects/tor/register;>create 
an
+account or https://trac.torproject.org/projects/tor/login;>log in
+using the shared cypherpunks account with password 
writecode.
+
+https://trac.torproject.org/projects/tor/newticket?component=Circumvention%2FSnowflake;>File
 a ticket
+using our bug tracker.
+  
+Please try to be as descriptive as possible with your ticket and if
+  possible include log messages that will help us reproduce the bug.
+  Consider adding keywords snowflake-webextension or 
snowflake-client
+  to let us know how which part of the Snowflake system is experiencing
+  problems.
+
+  Ä®TERPTI
+
+  Dabar Ä¯manoma Ä¯terpti Snowflake Å¾enkliukÄ bet kuriame 
tinklalapyje:
+
+  iframe 
src="https://snowflake.torproject.org/embed.html; width="320px" height="200px" 
frameborder="0" scrolling="no"/iframeKuris atrodo 
taip:
+
+  
+
+
+  
+
+
+

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-08-29 Thread translation

commit c6f22efd75958a10ce223e910d0eb3138c4265f2
Author: Translation commit bot 
Date:   Thu Aug 29 19:17:00 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 lt/messages.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lt/messages.json b/lt/messages.json
index 6c7b64d6d..2e7086c95 100644
--- a/lt/messages.json
+++ b/lt/messages.json
@@ -18,13 +18,13 @@
 "message": "Å iuo metu prisijungusiÅ³ naudotojÅ³ skaiÄius: $1"
   },
   "popupStatusReady": {
-"message": "Your Snowflake is ready to help users circumvent censorship"
+"message": "JÅ«sÅ³ Snowflake yra parengta padÄti naudotojams iÅ¡vengti 
cenzÅ«ros"
   },
   "popupWebRTCOff": {
 "message": "WebRTC funkcija neaptikta."
   },
   "popupDescOn": {
-"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+"message": "NaudotojÅ³ skaiÄius, kuriems jÅ«sÅ³ Snowflake padÄjo 
iÅ¡vengti cenzÅ«ros per paskutines 24 valandas: $1"
   },
   "badgeCookiesOff": {
 "message": "Slapukai nÄra Ä¯jungti."

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

[tor-commits] [translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed

2019-08-29 Thread translation

commit d7e0f98b667bf81ca272df7c431afd2ddd0f5340
Author: Translation commit bot 
Date:   Thu Aug 29 19:17:05 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
---
 lt/messages.json | 22 ++
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/lt/messages.json b/lt/messages.json
index 1424de212..37341750d 100644
--- a/lt/messages.json
+++ b/lt/messages.json
@@ -1,26 +1,32 @@
 {
   "appDesc": {
-"message": "Snowflake yra WebRTC prijungiamas transportas skirtas Tor."
+"message": "Snowflake is a WebRTC pluggable transport for Tor."
   },
   "popupTurnOn": {
-"message": "Ä®jungti"
+"message": "Turn On"
   },
   "popupTurnOff": {
-"message": "IÅ¡jungti"
+"message": "Turn Off"
   },
   "popupLearnMore": {
-"message": "SuÅ¾inoti daugiau"
+"message": "Learn more"
   },
   "popupStatusOff": {
-"message": "Snowflake iÅ¡jungta"
+"message": "Snowflake is off"
   },
   "popupStatusOn": {
-"message": "$1 prisijungÄ klientai."
+"message": "Å iuo metu prisijungusiÅ³ naudotojÅ³ skaiÄius: $1"
+  },
+  "popupStatusReady": {
+"message": "Your Snowflake is ready to help users circumvent censorship"
   },
   "popupWebRTCOff": {
-"message": "WebRTC funkcija neaptikta."
+"message": "WebRTC feature is not detected."
   },
   "popupDescOn": {
-"message": "JÅ«sÅ³ snowflake per paskutines 24 valandas padÄjo $1 
naudotojams iÅ¡vengti cenzÅ«ros."
+"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+  },
+  "badgeCookiesOff": {
+"message": "Cookies are not enabled."
   }
 }

___
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-68.1.0esr-9.0-1] squash! TB4: Tor Browser's Firefox preference overrides.

2019-08-29 Thread gk

commit 3b423362d6729d76b0c79274f52972346900c4fc
Author: Alex Catarineu 
Date:   Wed Aug 28 18:52:09 2019 +0200

squash! TB4: Tor Browser's Firefox preference overrides.

Bug 30845: Make sure default themes and other internal extensions are 
enabled
---
 browser/app/profile/000-tor-browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index f9114b7a892e..fd0b691d1831 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -264,7 +264,7 @@ pref("extensions.checkCompatibility.4.*", false);
 pref("extensions.databaseSchema", 3);
 pref("extensions.enabledAddons", 
"https-everywhere%40eff.org:3.1.4,%7B73a6fe31-595d-460b-a920-fcc0f8843232%7D:2.6.6.1,torbutton%40torproject.org:1.5.2,ubufox%40ubuntu.com:2.6,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:17.0.5");
 pref("extensions.enabledItems", 
"langpack-en...@firefox.mozilla.org:,{73a6fe31-595d-460b-a920-fcc0f8843232}:1.9.9.57,{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}:1.2.4,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.5.8");
-pref("extensions.enabledScopes", 1);
+pref("extensions.enabledScopes", 5); // AddonManager.SCOPE_PROFILE=1 | 
AddonManager.SCOPE_APPLICATION=4
 pref("extensions.pendingOperations", false);
 pref("xpinstall.whitelist.add", "");
 pref("xpinstall.whitelist.add.36", "");

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

[tor-commits] [translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback

2019-08-29 Thread translation

commit 15a54f4efd0d2b648383777b9538157cf0aa
Author: Translation commit bot 
Date:   Thu Aug 29 17:24:13 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=whisperback
---
 ta/ta.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ta/ta.po b/ta/ta.po
index 7a8f6e56c..b3242c40d 100644
--- a/ta/ta.po
+++ b/ta/ta.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-29 12:08+0200\n"
-"PO-Revision-Date: 2019-08-29 16:50+\n"
+"PO-Revision-Date: 2019-08-29 17:00+\n"
 "Last-Translator: Stymy RAT\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
@@ -80,7 +80,7 @@ msgstr "à®à®¤à¯ à®à®¿à®±à®¿à®¤à¯ à®¨à¯à®°à®®à¯ 
à®à®à¯à®à¯à®à®²à®¾à®®
 
 #: ../whisperBack/gui.py:189
 msgid "The contact email address doesn't seem valid."
-msgstr ""
+msgstr "à®¤à¯à®à®°à¯à®ªà¯ à®®à®¿à®©à¯à®©à®à¯à®à®²à¯ 
à®à®±à¯à®ªà¯à®à¯à®¯à®¤à®¾à®à®¤à¯ à®¤à¯à®©à¯à®±à®µà®¿à®²à¯à®²à¯."
 
 #: ../whisperBack/gui.py:206
 msgid "Unable to send the mail: SMTP error."
@@ -197,11 +197,11 @@ msgstr "à®à®¤à®µà®¿:"
 
 #: ../data/whisperback.ui.h:25
 msgid "Read our bug reporting guidelines."
-msgstr ""
+msgstr "à®¨à®®à®¤à¯ à®µà®´à¯ à®à®±à®¿à®µà®¿à®ªà¯à®ªà¯ 
à®¨à¯à®±à®¿à®®à¯à®±à¯à®à®³à¯à®ªà¯ à®ªà®à®¿à®à¯à®à®µà¯à®®à¯."
 
 #: ../data/whisperback.ui.h:26
 msgid "Email address (if you want an answer from us)"
-msgstr ""
+msgstr "à®®à®¿à®©à¯à®©à®à¯à®à®²à¯ à®®à¯à®à®µà®°à®¿ 
(à®à®®à¯à®®à®¿à®à®®à®¿à®°à¯à®¨à¯à®¤à¯ à®µà®¿à®à¯ 
à®µà¯à®£à¯à®à®¿à®©à®¾à®²à¯)"
 
 #: ../data/whisperback.ui.h:27
 msgid "optional PGP key"

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

[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml

2019-08-29 Thread translation

commit eae1a699d239d6af58b4d2312ac2ed5d9bbf9639
Author: Translation commit bot 
Date:   Thu Aug 29 17:17:19 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 ta/index.html | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ta/index.html b/ta/index.html
index 674edccb6..f3dc7c9ea 100644
--- a/ta/index.html
+++ b/ta/index.html
@@ -8,8 +8,10 @@
 
 
 
-https://www.torproject.org/;>
-
+
+https://www.torproject.org/;>
+
+
 
   SNOWFLAKE
 

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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1236'

2019-08-29 Thread dgoulet

commit 88a8deb420801085cfdbcb147a748a8138124bd3
Merge: 960d98941 360a29e28
Author: David Goulet 
Date:   Thu Aug 29 12:58:25 2019 -0400

Merge branch 'tor-github/pr/1236'

 .travis.yml  | 10 ++
 changes/bug31442 |  3 +++
 configure.ac |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

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

[tor-commits] [tor/master] Rust: Update version requirements and CI

2019-08-29 Thread dgoulet

commit 360a29e282a546c47ad1346bb035ffb01fe11c0d
Author: Sebastian Hahn 
Date:   Sun Aug 18 21:31:09 2019 +0200

Rust: Update version requirements and CI

The #[global_allocator] attribute is not available in versions prior to
1.28.0, the default-linker-libraries feature requires rust 1.31.0.

Adapt the CI to prevent accidental increases in Rust version by testing
against 1.31.0, beta and nightly.
---
 .travis.yml  | 10 ++
 changes/bug31442 |  3 +++
 configure.ac |  4 ++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 36fb3a1b7..8ba33f1bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,6 +29,8 @@ env:
 - HARDENING_OPTIONS="--enable-expensive-hardening"
 ## We turn off asciidoc by default, because it's slow
 - ASCIIDOC_OPTIONS="--disable-asciidoc"
+## Our default rust version is the minimum supported version
+- RUST_VERSION="1.31.0"
   matrix:
 ## We want to use each build option at least once
 ##
@@ -55,9 +57,9 @@ matrix:
 # We clone our stem repo and run `make test-stem`
 - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes"
 ## Check rust online with distcheck, to make sure we remove rust products
-- env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust 
--enable-cargo-online-mode"
+- env: DISTCHECK="yes" RUST_VERSION="beta" RUST_OPTIONS="--enable-rust 
--enable-cargo-online-mode"
 ## Check disable module dirauth with and without rust
-- env: MODULES_OPTIONS="--disable-module-dirauth" 
RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
+- env: MODULES_OPTIONS="--disable-module-dirauth" RUST_VERSION="nightly" 
RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
 - env: MODULES_OPTIONS="--disable-module-dirauth"
 ## Check NSS
 - env: NSS_OPTIONS="--enable-nss"
@@ -173,8 +175,8 @@ install:
   - if [[ "$ASCIIDOC_OPTIONS" == "" ]] && [[ "$TRAVIS_OS_NAME" == "osx" ]]; 
then export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"; fi
   ## If we're using Rust, download rustup
   - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh 
https://sh.rustup.rs; fi
-  ## Install the nightly channels of rustc and cargo and setup our toolchain 
environment
-  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
nightly; fi
+  ## Install the stable channels of rustc and cargo and setup our toolchain 
environment
+  - if [[ "$RUST_OPTIONS" != "" ]]; then sh rustup.sh -y --default-toolchain 
$RUST_VERSION; fi
   - if [[ "$RUST_OPTIONS" != "" ]]; then source $HOME/.cargo/env; fi
   ## If we're testing rust builds in offline-mode, then set up our vendored 
dependencies
   - if [[ "$TOR_RUST_DEPENDENCIES" == "true" ]]; then export 
TOR_RUST_DEPENDENCIES=$PWD/src/ext/rust/crates; fi
diff --git a/changes/bug31442 b/changes/bug31442
new file mode 100644
index 0..4df9fc6df
--- /dev/null
+++ b/changes/bug31442
@@ -0,0 +1,3 @@
+  o Minor bugfixes (rust):
+- Raise the minimum rustc version to 1.31.0, as checked by configure
+  and CI. Fixes bug 31442; bugfix on 0.3.5.4-alpha.
diff --git a/configure.ac b/configure.ac
index 9ec123f51..f90a0c09b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -558,8 +558,8 @@ if test "x$enable_rust" = "xyes"; then
   if test "x$RUSTC_VERSION_MAJOR" = "x" -o "x$RUSTC_VERSION_MINOR" = "x"; then
 AC_MSG_ERROR([rustc version couldn't be identified])
   fi
-  if test "$RUSTC_VERSION_MAJOR" -lt 2 -a "$RUSTC_VERSION_MINOR" -lt 14; then
-AC_MSG_ERROR([rustc must be at least version 1.14])
+  if test "$RUSTC_VERSION_MAJOR" -lt 2 -a "$RUSTC_VERSION_MINOR" -lt 31; then
+AC_MSG_ERROR([rustc must be at least version 1.31.0])
   fi
   AC_MSG_RESULT([$RUSTC_VERSION])
 fi



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

[tor-commits] [translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback

2019-08-29 Thread translation

commit d0475be13a5b2540c532115ec4983939ddbc0fe8
Author: Translation commit bot 
Date:   Thu Aug 29 16:54:09 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=whisperback
---
 ta/ta.po | 79 
 1 file changed, 40 insertions(+), 39 deletions(-)

diff --git a/ta/ta.po b/ta/ta.po
index d1a8a7a17..7a8f6e56c 100644
--- a/ta/ta.po
+++ b/ta/ta.po
@@ -7,14 +7,15 @@
 # Arun M S , 2015
 # git12a , 2015
 # Senthil Kumar , 2017
+# Stymy RAT, 2019
 # Khaleel Jageer , 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-04-29 12:08+0200\n"
-"PO-Revision-Date: 2019-04-29 19:07+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-08-29 16:50+\n"
+"Last-Translator: Stymy RAT\n"
 "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,16 +27,16 @@ msgstr ""
 #: ../whisperBack/whisperback.py:63
 #, python-format
 msgid "Invalid contact email: %s"
-msgstr ""
+msgstr "à®¤à®µà®±à®¾à®© à®¤à¯à®¾à®à®°à¯à®ªà¯ 
à®®à®¿à®©à¯à®©à®à¯à®à®²à¯: %s"
 
 #: ../whisperBack/whisperback.py:83
 #, python-format
 msgid "Invalid contact OpenPGP key: %s"
-msgstr ""
+msgstr "à®à¯à®²à¯à®²à®¾ à®¤à¯à®¾à®à®°à¯à®ªà¯ OpenPGP à®à®¾à®µà®¿: %s"
 
 #: ../whisperBack/whisperback.py:85
 msgid "Invalid contact OpenPGP public key block"
-msgstr ""
+msgstr "à®à¯à®²à¯à®²à®¾ à®¤à¯à®¾à®à®°à¯à®ªà¯ OpenPGP à®à®£à¯ 
à®ªà¯à®¾à®¤à¯ à®à®¾à®µà®¿ à®¤à¯à®¾à®à¯à®¤à®¿"
 
 #: ../whisperBack/exceptions.py:41
 #, python-format
@@ -46,36 +47,36 @@ msgstr ""
 
 #: ../whisperBack/gui.py:114
 msgid "Name of the affected software"
-msgstr ""
+msgstr "à®ªà®¾à®¤à®¿à®ªà¯à®ªà®à¯à®¨à¯à®¤ 
à®®à¯à®©à¯à®ªà¯à®°à¯à®³à®¿à®©à¯ à®ªà¯à®¯à®°à¯"
 
 #: ../whisperBack/gui.py:116
 msgid "Exact steps to reproduce the error"
-msgstr ""
+msgstr "à®ªà®¿à®´à¯à®¯à¯ à®®à¯à®£à¯à®à¯à®®à¯ à®à®°à¯à®µà®¾à®à¯à® 
à®¤à¯à®²à¯à®²à®¿à®¯ à®à¯à®¯à®²à¯à®®à¯à®±à¯"
 
 #: ../whisperBack/gui.py:118
 msgid "Actual result and description of the error"
-msgstr ""
+msgstr "à®à®£à¯à®®à¯à®¯à®¾à®© à®µà®¿à®³à¯à®µà¯ à®®à®±à¯à®±à¯à®®à¯ 
à®ªà®¿à®´à¯ à®ªà®±à¯à®±à®¿à®¯ à®µà®¿à®³à®à¯à®à®®à¯"
 
 #: ../whisperBack/gui.py:120
 msgid "Desired result"
-msgstr ""
+msgstr "à®à®¤à®¿à®°à¯à®ªà®¾à®°à¯à®¤à¯à®¤ à®µà®¿à®³à¯à®µà¯"
 
 #: ../whisperBack/gui.py:133
 msgid "Unable to load a valid configuration."
-msgstr ""
+msgstr "à®à®°à®¿à®¯à®¾à®© à®à®à¯à®à®®à¯à®ªà¯à®ªà¯ à®à®±à¯à®± 
à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯."
 
 #: ../whisperBack/gui.py:170
 msgid "Sending mail..."
-msgstr ""
+msgstr "à®®à®¿à®©à¯à®©à®à¯à®à®²à¯ à®à®©à¯à®ªà¯à®ªà¯à®à®¿à®±à®¤à¯..."
 
 #: ../whisperBack/gui.py:171
 msgid "Sending mail"
-msgstr ""
+msgstr "à®®à®¿à®©à¯à®©à®à¯à®à®²à¯ à®à®©à¯à®ªà¯à®ªà¯à®à®¿à®±à®¤à¯"
 
 #. pylint: disable=C0301
 #: ../whisperBack/gui.py:173
 msgid "This could take a while..."
-msgstr ""
+msgstr "à®à®¤à¯ à®à®¿à®±à®¿à®¤à¯ à®¨à¯à®°à®®à¯ 
à®à®à¯à®à¯à®à®²à®¾à®®à¯..."
 
 #: ../whisperBack/gui.py:189
 msgid "The contact email address doesn't seem valid."
@@ -83,15 +84,15 @@ msgstr ""
 
 #: ../whisperBack/gui.py:206
 msgid "Unable to send the mail: SMTP error."
-msgstr ""
+msgstr "à®®à®¿à®©à¯à®©à®à¯à®à®²à¯ à®à®©à¯à®ªà¯à®ª 
à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯: SMTP à®ªà®¿à®´à¯."
 
 #: ../whisperBack/gui.py:208
 msgid "Unable to connect to the server."
-msgstr ""
+msgstr "à®à¯à®µà¯à®¯à®à®¤à¯à®¤à¯à®à®©à¯ à®à®£à¯à®à¯à® 
à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯."
 
 #: ../whisperBack/gui.py:210
 msgid "Unable to create or to send the mail."
-msgstr ""
+msgstr "à®®à®¿à®©à¯à®©à®à¯à®à®²à¯ à®à®°à¯à®µà®¾à®à¯à® à®
à®²à¯à®²à®¤à¯ à®à®©à¯à®ªà¯à®ª à®®à¯à®à®¿à®¯à®µà®¿à®²à¯à®²à¯."
 
 #: ../whisperBack/gui.py:213
 msgid ""
@@ -100,20 +101,20 @@ msgid ""
 "The bug report could not be sent, likely due to network problems. Please try 
to reconnect to the network and click send again.\n"
 "\n"
 "If it does not work, you will be offered to save the bug report."
-msgstr ""
+msgstr "\n\nà®ªà®¿à®´à¯ à®à®±à®¿à®à¯à®à¯ 
à®¨à¯à®à¯à®µà¯à®¾à®°à¯à®à¯ à®ªà®¿à®°à®à¯à®©à¯à®¯à®¾à®²à¯ à®
à®©à¯à®ªà¯à®ªà®ªà¯à®ªà®à®¯à®¿à®¯à®²à®µà®¿à®²à¯à®²à¯. 
à®¨à¯à®à¯à®µà¯à®¾à®°à¯à®à¯à®à¯ à®®à¯à®£à¯à®à¯à®®à¯ 
à®à®£à¯à®à¯à® à®®à¯à®¯à®±à¯à®à®¿à®¤à¯à®¤à®ªà®¿à®©à¯ , 
à®®à¯à®£à¯à®à¯à®®à¯ à®à®©à¯à®ªà¯à®ªà¯ à®à®¿à®³à®¿à®à¯ 
à®à¯à®¯à¯à®¯à®µà¯à®®à¯.\n\n\nà®à®¤à¯ à®µà¯à®²à¯ 
à®à¯à®¯à¯à®¯à®µà®¿à®²à¯à®²à¯ à®à®©à¯à®±à®¾à®²à¯, à®ªà®¿à®´à¯ à®
à®±à®¿à®à¯à®à¯à®¯à¯ à®à¯à®¾à®ªà¯à®ªà®¾à® à®à¯à®®à®¿à®à¯à® 
à®µà®´à®¿à®µà®´à®à¯à®à®ªà¯à®ªà®à¯à®®à¯."
 
 #: ../whisperBack/gui.py:226
 msgid "Your message has been sent."
-msgstr ""
+msgstr "à®à®à¯à®à®³à¯ à®¤à®à®µà®²à¯ à®
à®©à¯à®ªà¯à®ªà®ªà¯à®ªà®à¯à®à®¤à¯."
 
 #:

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2019-08-29 Thread translation

commit 491e8d9084e4f9185d045d0445945d949ca9a99f
Author: Translation commit bot 
Date:   Thu Aug 29 16:54:27 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+es.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 5204e1bfa..caf6974f4 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -6437,11 +6437,11 @@ msgstr ""
 
 #: templates/macros/question.html:14
 msgid "Edit this page"
-msgstr ""
+msgstr "Edita esta pÃ¡gina"
 
 #: templates/macros/question.html:15
 msgid "Suggest Feedback"
-msgstr ""
+msgstr "Sugiere cambios"
 
 #: templates/macros/question.html:16
 msgid "Permalink"

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

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2019-08-29 Thread translation

commit 750f29ae4df31e4773b343f50f7556af50cf2a37
Author: Translation commit bot 
Date:   Thu Aug 29 16:50:28 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+es.po | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 5187c7142..86968c4af 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -2,8 +2,8 @@
 # Zuhualime Akoochimoya, 2019
 # Antonela D , 2019
 # erinm, 2019
-# Emma Peel, 2019
 # sim, 2019
+# Emma Peel, 2019
 # 
 msgid ""
 msgstr ""
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-08-27 14:16+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: sim, 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"
@@ -1220,7 +1220,7 @@ msgid ""
 " reloaded. This option does not clear any private information or unlink your"
 " activity, nor does it affect your current connections to other websites."
 msgstr ""
-"Esta opciÃ³n es Ãºtil si el repetidor de "
+"Esta opciÃ³n es Ãºtil si el repetidor de 
"
 "salida que estÃ¡s usando no puede conectar al sitio web que solicitas, o "
 "no estÃ¡ cargando adecuadamente. Seleccionarla provocarÃ¡ que la pestaÃ±a "
 "actualmente activa se recargue sobre un nuevo circuito de Tor. Otras "
@@ -2469,11 +2469,11 @@ msgstr ""
 
 #: templates/macros/topic.html:21
 msgid "Edit this page"
-msgstr ""
+msgstr "Edita esta pÃ¡gina"
 
 #: templates/macros/topic.html:22
 msgid "Suggest Feedback"
-msgstr ""
+msgstr "Sugiere cambios"
 
 #: templates/macros/topic.html:23
 msgid "Permalink"

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

[tor-commits] [translation/snowflake-website-indexhtml] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml

2019-08-29 Thread translation

commit a49fdde7dfb1ea935794ec3eb04614809d7b88c6
Author: Translation commit bot 
Date:   Thu Aug 29 16:47:21 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml
---
 es/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/es/index.html b/es/index.html
index 273c06d28..5ac9a6be2 100644
--- a/es/index.html
+++ b/es/index.html
@@ -8,7 +8,7 @@
 
 
 
-https://www.torproject.org/;>
+https://www.torproject.org/es/;>
 
 
   SNOWFLAKE
@@ -29,7 +29,7 @@
   Si tu acceso a internet estÃ¡ censurado deberÃas bajarte
   https://www.torproject.org/download/;>el Navegador 
Tor.
 
-  
+  
 
 
 

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

[tor-commits] [translation/snowflake-website-indexhtml_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml_completed

2019-08-29 Thread translation

commit 3f3c450e62d1bc81a810b4fbf2c7209569c0efb4
Author: Translation commit bot 
Date:   Thu Aug 29 16:47:26 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflake-website-indexhtml_completed
---
 es/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/es/index.html b/es/index.html
index bf000997c..f260f6a43 100644
--- a/es/index.html
+++ b/es/index.html
@@ -29,7 +29,7 @@
   Si tu acceso a internet estÃ¡ censurado deberÃas bajarte
   https://www.torproject.org/download/;>el Navegador 
Tor.
 
-  
+  
 
 
 

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-08-29 Thread translation

commit 0ef580cadcc0015f9930d080af31eb8ea5a4b45c
Author: Translation commit bot 
Date:   Thu Aug 29 16:47:10 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 ta/messages.json | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ta/messages.json b/ta/messages.json
index 8b5bafa2e..2bdf52593 100644
--- a/ta/messages.json
+++ b/ta/messages.json
@@ -18,15 +18,15 @@
 "message": "à®¤à®±à¯à®ªà¯à®´à¯à®¤à¯ 
à®¤à¯à®à®°à¯à®ªà®¿à®²à¯à®³à¯à®³ à®ªà®¯à®©à®°à¯à®à®³à®¿à®©à¯ 
à®à®£à¯à®£à®¿à®à¯à®à¯: $1"
   },
   "popupStatusReady": {
-"message": "Your Snowflake is ready to help users circumvent censorship"
+"message": "à®ªà®¯à®©à®°à¯à®à®³à¯ à®¤à®£à®¿à®à¯à®à¯à®¯à¯à®¤à¯ 
à®¤à®µà®¿à®°à¯à®¤à¯à®¤à¯à®à¯à®à¯à®²à¯à®² à®à®¤à®µ 
à®à®à¯à®à®³à¯à®à¯à®¯ Snowflake à®¤à®¯à®¾à®°à®¾à® à®à®³à¯à®³à®¤à¯"
   },
   "popupWebRTCOff": {
-"message": "WebRTC feature is not detected."
+"message": "à®à®£à¯à®¯ à®¨à®¿à®à®´à¯à®¨à¯à®°à®¤à¯ 
à®¤à¯à®à®°à¯à®ªà¯à®ªà¯ à®ªà®£à¯à®ªà¯ 
à®à®£à¯à®à®±à®¿à®¯à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯."
   },
   "popupDescOn": {
-"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+"message": "à®à®à®¨à¯à®¤ 24 à®®à®£à®¿ à®¨à¯à®°à®¤à¯à®¤à®¿à®²à¯ 
à®¤à®£à®¿à®à¯à®à¯à®¯à¯à®¤à¯ 
à®¤à®µà®¿à®°à¯à®¤à¯à®¤à¯à®à¯à®à¯à®²à¯à®²à¯à®®à®¾à®±à¯ 
à®à®à¯à®à®³à¯ Snowflake à®à®¤à®µà®¿ à®à¯à®¯à¯à®¤ 
à®ªà®¯à®©à®°à¯à®à®³à®¿à®©à¯ à®à®£à¯à®£à®¿à®à¯à®à¯: $1"
   },
   "badgeCookiesOff": {
-"message": "Cookies are not enabled."
+"message": "à®¨à®¿à®©à¯à®µà®¿à®à®³à¯ 
à®à¯à®¯à®²à¯à®ªà®à¯à®¤à¯à®¤à®ªà¯à®ªà®à®µà®¿à®²à¯à®²à¯."
   }
 }

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-08-29 Thread translation

commit c441e024901cfeb8be127b830e594ecc6cf0076f
Author: Translation commit bot 
Date:   Thu Aug 29 16:17:26 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 ta/messages.json | 32 
 1 file changed, 32 insertions(+)

diff --git a/ta/messages.json b/ta/messages.json
new file mode 100644
index 0..8b5bafa2e
--- /dev/null
+++ b/ta/messages.json
@@ -0,0 +1,32 @@
+{
+  "appDesc": {
+"message": "Snowflake à®à®©à¯à®ªà®¤à¯ Tor-à®à¯à®à®¾à®© à®à®£à¯à®¯ 
à®¨à®¿à®à®´à¯à®¨à¯à®°à®¤à¯ à®¤à¯à®à®°à¯à®ªà¯à®à¯ (WebRTC) 
à®à¯à®°à¯à®à®²à¯ à®ªà¯à®à¯à®à¯à®µà®°à®¤à¯à®¤à¯."
+  },
+  "popupTurnOn": {
+"message": "à®à®¯à®à¯à®à¯à®"
+  },
+  "popupTurnOff": {
+"message": "à®¨à®¿à®±à¯à®¤à¯à®¤à¯à®"
+  },
+  "popupLearnMore": {
+"message": "à®®à¯à®²à¯à®®à¯ à®à®±à®¿à®¯"
+  },
+  "popupStatusOff": {
+"message": "Snowflake 
à®¨à®¿à®±à¯à®¤à¯à®¤à®ªà¯à®ªà®à¯à®à¯à®³à¯à®³à®¤à¯"
+  },
+  "popupStatusOn": {
+"message": "à®¤à®±à¯à®ªà¯à®´à¯à®¤à¯ 
à®¤à¯à®à®°à¯à®ªà®¿à®²à¯à®³à¯à®³ à®ªà®¯à®©à®°à¯à®à®³à®¿à®©à¯ 
à®à®£à¯à®£à®¿à®à¯à®à¯: $1"
+  },
+  "popupStatusReady": {
+"message": "Your Snowflake is ready to help users circumvent censorship"
+  },
+  "popupWebRTCOff": {
+"message": "WebRTC feature is not detected."
+  },
+  "popupDescOn": {
+"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+  },
+  "badgeCookiesOff": {
+"message": "Cookies are not enabled."
+  }
+}

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

[tor-commits] [gettor/master] Add scripts to export stats and edit gitignore

2019-08-29 Thread hiro

commit f4fc5a499f16f340aed68a79e3a1c1d2ff41725b
Author: hiro 
Date:   Thu Aug 29 16:17:11 2019 +0200

Add scripts to export stats and edit gitignore
---
 .gitignore   |  3 ++-
 scripts/export_stats | 15 +++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 1f08289..d6e21ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ __pycache__
 log
 gettor.db
 _trial_temp
-
+gettor.pid
+csv
diff --git a/scripts/export_stats b/scripts/export_stats
new file mode 100644
index 000..a0b9f99
--- /dev/null
+++ b/scripts/export_stats
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# This file is part of GetTor, a Tor Browser distribution system.
+#
+# :authors: hiro 
+#   see also AUTHORS file
+#
+# :copyright:   (c) 2008-2019, The Tor Project, Inc.
+#
+# :license: This is Free Software. See LICENSE for license information.
+
+cd ~/gettor
+mkdir -p csv
+sqlite3 -header -csv gettor.db "select * from stats;" > csv/$(date 
"+%Y-%m-%d").csv
+./scripts/add_links_to_db -f gettor.db

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

[tor-commits] [translation/orfox-stringsxml] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml

2019-08-29 Thread translation

commit c54ca35cd8da22c95c13608743f9d95ee6a8a8c6
Author: Translation commit bot 
Date:   Thu Aug 29 13:46:55 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
---
 nl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/strings.xml b/nl/strings.xml
index 52e793cba..2f6282d38 100644
--- a/nl/strings.xml
+++ b/nl/strings.xml
@@ -2,7 +2,7 @@
 OrfoxRIP
 Probeer Tor Browser
 Orfox is nu Tor Browser voor 
Android.
-Downloaden vanaf uw voorkeursbron:
+Download het vanaf uw voorkeursbron:
 NAAR F-DROID
 NAAR GOOGLE PLAY
 .APK DOWNLOADEN

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

[tor-commits] [translation/torbutton-securitylevelproperties_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties_completed

2019-08-29 Thread translation

commit 26623a9792e14b552eac6b052addef6678604d56
Author: Translation commit bot 
Date:   Thu Aug 29 13:23:39 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties_completed
---
 nl/securitylevel.properties | 44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/nl/securitylevel.properties b/nl/securitylevel.properties
index a2e7084ee..f9f963ebe 100644
--- a/nl/securitylevel.properties
+++ b/nl/securitylevel.properties
@@ -1,22 +1,22 @@
-securityLevel.securityLevel = Beveiligingsniveau
-securityLevel.customWarning = Aangepast
-securityLevel.overview = Bepaalde websitefuncties uitschakelen die kunnen 
worden gebruikt om uw beveiliging en anonimiteit aan te vallen.
-securityLevel.standard.level = Standaard
-securityLevel.standard.tooltip = Beveiligingsniveau: standaard
-securityLevel.standard.summary = Alle Tor Browser- en websitefuncties zijn 
ingeschakeld.
-securityLevel.safer.level = Veiliger
-securityLevel.safer.tooltip = Beveiligingsniveau: veiliger
-securityLevel.safer.summary = Schakelt websitefuncties uit die vaak gevaarlijk 
zijn, waardoor sommige websites functionaliteit verliezen.
-securityLevel.safer.description1 = JavaScript is uitgeschakeld op 
niet-HTTPS-websites.
-securityLevel.safer.description2 = Sommige lettertypen en wiskundige symbolen 
zijn uitgeschakeld.
-securityLevel.safer.description3 = Geluid en video (HTML5 media) en WebGL zijn 
klik-om-af-te-spelen.
-securityLevel.safest.level = Veiligste
-securityLevel.safest.tooltip = Beveiligingsniveau: veiligste
-securityLevel.safest.summary = Staat alleen websitefuncties toe die voor 
statische websites en basisservices zijn vereist. Deze wijzigingen zijn van 
invloed op afbeeldingen, media en scripts.
-securityLevel.safest.description1 = JavaScript is standaard uitgeschakeld op 
alle websites.
-securityLevel.safest.description2 = Sommige lettertypen, pictogrammen, 
wiskundige symbolen en afbeeldingen zijn uitgeschakeld.
-securityLevel.safest.description3 = Audio en video (HTML5-media) zijn 
klikken-voor-afspelen.
-securityLevel.custom.summary = Uw aangepaste browservoorkeuren hebben tot 
ongebruikelijke beveiligingsinstellingen geleid. Uit veiligheids- en 
privacyoverwegingen raden we aan een van de standaard beveiligingsniveaus te 
kiezen.
-securityLevel.learnMore = Meer info
-securityLevel.restoreDefaults = Standaardwaarden herstellen
-securityLevel.advancedSecuritySettings = Geavanceerde 
beveiligingsinstellingenâ¦
+# securityLevel.securityLevel = Security Level
+# securityLevel.customWarning = Custom
+# securityLevel.overview = Disable certain web features that can be used to 
attack your security and anonymity.
+# securityLevel.standard.level = Standard
+# securityLevel.standard.tooltip = Security Level : Standard
+# securityLevel.standard.summary = All Tor Browser and website features are 
enabled.
+# securityLevel.safer.level = Safer
+# securityLevel.safer.tooltip = Security Level : Safer
+# securityLevel.safer.summary = Disables website features that are often 
dangerous, causing some sites to lose functionality.
+# securityLevel.safer.description1 = JavaScript is disabled on non-HTTPS sites.
+# securityLevel.safer.description2 = Some fonts and math symbols are disabled.
+# securityLevel.safer.description3 = Audio and video (HTML5 media), and WebGL 
are click-to-play.
+# securityLevel.safest.level = Safest
+# securityLevel.safest.tooltip = Security Level : Safest
+# securityLevel.safest.summary = Only allows website features required for 
static sites and basic services. These changes affect images, media, and 
scripts.
+# securityLevel.safest.description1 = JavaScript is disabled by default on all 
sites.
+# securityLevel.safest.description2 = Some fonts, icons, math symbols, and 
images are disabled.
+# securityLevel.safest.description3 = Audio and video (HTML5 media) are 
click-to-play.
+# securityLevel.custom.summary = Your custom browser preferences have resulted 
in unusual security settings. For security and privacy reasons, we recommend 
you choose one of the default security levels.
+# securityLevel.learnMore = Learn more
+# securityLevel.restoreDefaults = Restore Defaults
+# securityLevel.advancedSecuritySettings = Advanced Security Settingsâ¦

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

[tor-commits] [translation/torbutton-securitylevelproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties

2019-08-29 Thread translation

commit ae6317fd854d5e9f0cb42433a906abfbe493a0ae
Author: Translation commit bot 
Date:   Thu Aug 29 13:23:30 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-securitylevelproperties
---
 nl/securitylevel.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/securitylevel.properties b/nl/securitylevel.properties
index a2e7084ee..25d29f72f 100644
--- a/nl/securitylevel.properties
+++ b/nl/securitylevel.properties
@@ -9,7 +9,7 @@ securityLevel.safer.tooltip = Beveiligingsniveau: veiliger
 securityLevel.safer.summary = Schakelt websitefuncties uit die vaak gevaarlijk 
zijn, waardoor sommige websites functionaliteit verliezen.
 securityLevel.safer.description1 = JavaScript is uitgeschakeld op 
niet-HTTPS-websites.
 securityLevel.safer.description2 = Sommige lettertypen en wiskundige symbolen 
zijn uitgeschakeld.
-securityLevel.safer.description3 = Geluid en video (HTML5 media) en WebGL zijn 
klik-om-af-te-spelen.
+securityLevel.safer.description3 = Audio en video (HTML5-media) zijn 
klikken-voor-afspelen.
 securityLevel.safest.level = Veiligste
 securityLevel.safest.tooltip = Beveiligingsniveau: veiligste
 securityLevel.safest.summary = Staat alleen websitefuncties toe die voor 
statische websites en basisservices zijn vereist. Deze wijzigingen zijn van 
invloed op afbeeldingen, media en scripts.

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

[tor-commits] [translation/torbutton-torbuttondtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd_completed

2019-08-29 Thread translation

commit b0245ace9ea5e0e4c7b42aa945b0ec833aef3d36
Author: Translation commit bot 
Date:   Thu Aug 29 13:22:44 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd_completed
---
 nl/torbutton.dtd | 82 
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd
index 1110aa74d..4a80e6d6c 100644
--- a/nl/torbutton.dtd
+++ b/nl/torbutton.dtd
@@ -1,41 +1,41 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

[tor-commits] [translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd

2019-08-29 Thread translation

commit f8d6806228aebb952fb7c413460c02df612a
Author: Translation commit bot 
Date:   Thu Aug 29 13:22:35 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd
---
 nl/torbutton.dtd | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd
index 1110aa74d..7125d44f9 100644
--- a/nl/torbutton.dtd
+++ b/nl/torbutton.dtd
@@ -6,21 +6,21 @@
 
 
 
-
+
 
 
 
-
+
 
 
 
 
 
 
-
-
-
-
+
+
+
+
 
 
 
@@ -36,6 +36,6 @@
 
 
 
-
+
 
 

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

[tor-commits] [translation/tails-onioncircuits_completed] https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits_completed

2019-08-29 Thread translation

commit c3c995f06c1b90eb2980c5734f39a8fe0d9239e8
Author: Translation commit bot 
Date:   Thu Aug 29 13:20:15 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits_completed
---
 nl/onioncircuits.pot | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/onioncircuits.pot b/nl/onioncircuits.pot
index e98bca102..a54d05613 100644
--- a/nl/onioncircuits.pot
+++ b/nl/onioncircuits.pot
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2019-08-28 09:35+\n"
+"PO-Revision-Date: 2019-08-29 12:52+\n"
 "Last-Translator: Tonnes \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"

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

[tor-commits] [translation/tails-onioncircuits] https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits

2019-08-29 Thread translation

commit b312ce9770bc751c247e8953448f728e38227065
Author: Translation commit bot 
Date:   Thu Aug 29 13:20:07 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-onioncircuits
---
 nl/onioncircuits.pot | 34 +-
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/nl/onioncircuits.pot b/nl/onioncircuits.pot
index e98bca102..64b0985a5 100644
--- a/nl/onioncircuits.pot
+++ b/nl/onioncircuits.pot
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-08-03 13:00+\n"
-"PO-Revision-Date: 2019-08-28 09:35+\n"
+"PO-Revision-Date: 2019-08-29 12:52+\n"
 "Last-Translator: Tonnes \n"
 "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -22,67 +22,67 @@ msgstr ""
 
 #: ../onioncircuits:81
 msgid "You are not connected to Tor yet..."
-msgstr ""
+msgstr "U bent nog niet verbonden met Tor..."
 
 #: ../onioncircuits:95
 msgid "Onion Circuits"
-msgstr ""
+msgstr "Onion-circuits"
 
 #: ../onioncircuits:125
 msgid "Circuit"
-msgstr ""
+msgstr "Circuit"
 
 #: ../onioncircuits:126
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #: ../onioncircuits:142
 msgid "Click on a circuit for more detail about its Tor relays."
-msgstr ""
+msgstr "Klik op een circuit voor meer info over de Tor-relays ervan."
 
 #: ../onioncircuits:221
 msgid "The connection to Tor was lost..."
-msgstr ""
+msgstr "De verbinding met Tor is verbroken..."
 
 #: ../onioncircuits:317
 msgid "..."
-msgstr ""
+msgstr "..."
 
 #: ../onioncircuits:343
 #, c-format
 msgid "%s: %s"
-msgstr ""
+msgstr "%s: %s"
 
 #: ../onioncircuits:554
 msgid "GeoIP database unavailable. No country information will be displayed."
-msgstr ""
+msgstr "GeoIP-database niet beschikbaar. Er wordt geen landinformatie 
weergeven."
 
 #: ../onioncircuits:585
 #, c-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #: ../onioncircuits:590
 #, c-format
 msgid "%.2f Mb/s"
-msgstr ""
+msgstr "%.2f Mb/s"
 
 #: ../onioncircuits:592 ../onioncircuits:593 ../onioncircuits:594
 msgid "Unknown"
-msgstr ""
+msgstr "Onbekend"
 
 #: ../onioncircuits:607
 msgid "Fingerprint:"
-msgstr ""
+msgstr "Vingerafdruk:"
 
 #: ../onioncircuits:608
 msgid "Published:"
-msgstr ""
+msgstr "Gepubliceerd:"
 
 #: ../onioncircuits:609
 msgid "IP:"
-msgstr ""
+msgstr "IP:"
 
 #: ../onioncircuits:610
 msgid "Bandwidth:"
-msgstr ""
+msgstr "Bandbreedte:"

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

[tor-commits] [community/master] Update colors in relay guide

2019-08-29 Thread hiro

commit 43c584877255c628207c5bf4f014c845df03030f
Author: hiro 
Date:   Thu Aug 29 15:17:14 2019 +0200

Update colors in relay guide
---
 .../bridge/centos-rhel-opensuse/contents.lr| 14 --
 .../technical-setup/bridge/debian-ubuntu/contents.lr   |  2 ++
 .../technical-setup/bridge/docker/contents.lr  |  2 ++
 .../technical-setup/bridge/freebsd/contents.lr |  6 --
 .../technical-setup/bridge/getting-help/contents.lr|  2 ++
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git 
a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
 
b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
index 091dbb5..2d232a7 100644
--- 
a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
+++ 
b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr
@@ -1,10 +1,12 @@
 _model: page
 ---
+color: primary
+---
 title: CentOS / RHEL / OpenSUSE
 ---
 body:
 
-### 1. Install tor and dependencies 
+### 1. Install tor and dependencies
 
 * Redhat / RHEL:
 
@@ -19,7 +21,7 @@ yum install git golang tor
 zypper install tor go git
 ```
 
-### 2. Build obfs4proxy and move it into place. 
+### 2. Build obfs4proxy and move it into place.
 
 Heavily outdated versions of git can make `go get` fail, so try upgrading to a 
more recent git version if you're running into this problem.
 
@@ -71,7 +73,7 @@ ContactInfo 
 Nickname PickANickname
 ```
 
- Don't forget to change the `ORPort`, `ServerTransportListenAddr`, 
`ContactInfo`, and `Nickname` options. 
+ Don't forget to change the `ORPort`, `ServerTransportListenAddr`, 
`ContactInfo`, and `Nickname` options.
 
 * Note that both Tor's OR port and its obfs4 port must be reachable. If your 
bridge is behind a firewall or NAT, make sure to open both ports. You can use 
[our reachability test](https://bridges.torproject.org/scan/) to see if your 
obfs4 port is reachable from the Internet.
 
@@ -83,7 +85,7 @@ Nickname PickANickname
 
 To confirm your bridge is running with no issues, you should see something 
like this:
 
-``` 
+```
 [notice] Your Tor server's identity key fingerprint is ' 
'
 [notice] Your Tor bridge's hashed identity key fingerprint is ' 
'
 [notice] Registered server transport 'obfs4' at '[::]:46396'
@@ -91,7 +93,7 @@ To confirm your bridge is running with no issues, you should 
see something like
 [notice] Bootstrapped 100%: Done
 [notice] Now checking whether ORPort :3818 is reachable... (this may 
take up to 20 minutes -- look for log messages indicating success)
 [notice] Self-testing indicates your ORPort is reachable from the outside. 
Excellent. Publishing server descriptor.
-``` 
+```
 
 ### 6. Final notes
 
@@ -105,7 +107,7 @@ html: two-columns-page.html
 ---
 key:
 
-2 
+2
 ---
 color: primary
 ---
diff --git 
a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr 
b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
index d1eeb17..41b4f76 100644
--- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr
@@ -1,5 +1,7 @@
 _model: page
 ---
+color: primary
+---
 title: Debian / Ubuntu
 ---
 body:
diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr 
b/content/relay-operations/technical-setup/bridge/docker/contents.lr
index 1c36012..f8925a1 100644
--- a/content/relay-operations/technical-setup/bridge/docker/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr
@@ -1,5 +1,7 @@
 _model: page
 ---
+color: primary
+---
 title: Docker
 ---
 body:
diff --git 
a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr 
b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
index d4bb28e..9088fa5 100644
--- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
+++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr
@@ -1,5 +1,7 @@
 _model: page
 ---
+color: primary
+---
 title: FreeBSD
 ---
 html: two-columns-page.html
@@ -47,7 +49,7 @@ Nickname PickANickname
 Log notice file /var/log/tor/notices.log
 ```
 
-Don't forget to change the `ORPort`, `ServerTransportListenAddr`, 
`ContactInfo`, and `Nickname` options. 
+Don't forget to change the `ORPort`, `ServerTransportListenAddr`, 
`ContactInfo`, and `Nickname` options.
 
 * Note that both Tor's OR port and its obfs4 port must be reachable. If your 
bridge is behind a firewall or NAT, make sure to open both ports. You can use 
[our reachability test](https://bridges.torproject.org/scan/) to see if your 
obfs4 port is reachable from the Internet.
 
@@ -67,7 +69,7 @@ sysrc tor_enable=YES
 service tor start
 ```
 
-### 5. Monitor your logs 
+### 5. Monitor your logs
 
 To confirm your bridge is running with no issues, you should see something 
like this in `/var/log/tor/notices.log`:

[tor-commits] [translation/orfox-stringsxml_completed] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml_completed

2019-08-29 Thread translation

commit 271f795c43eccae10ecb6d4cf5aa0f347892042c
Author: Translation commit bot 
Date:   Thu Aug 29 13:17:14 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml_completed
---
 nl/strings.xml | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/nl/strings.xml b/nl/strings.xml
index 3a71c5327..cb5acbb4f 100644
--- a/nl/strings.xml
+++ b/nl/strings.xml
@@ -1,9 +1,2 @@
 
-OrfoxRIP
-Probeer Tor Browser
-Orfox is nu Tor Browser voor 
Android.
-Download het op de manier die uw voorkeur 
heeft:
-NAAR F-DROID
-NAAR GOOGLE PLAY
-.APK DOWNLOADEN
-
+

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

[tor-commits] [translation/orfox-stringsxml] https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml

2019-08-29 Thread translation

commit 149135ba07f61d51b214bfe6c0a65be7e66c8068
Author: Translation commit bot 
Date:   Thu Aug 29 13:17:07 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=orfox-stringsxml
---
 nl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nl/strings.xml b/nl/strings.xml
index 3a71c5327..52e793cba 100644
--- a/nl/strings.xml
+++ b/nl/strings.xml
@@ -2,7 +2,7 @@
 OrfoxRIP
 Probeer Tor Browser
 Orfox is nu Tor Browser voor 
Android.
-Download het op de manier die uw voorkeur 
heeft:
+Downloaden vanaf uw voorkeursbron:
 NAAR F-DROID
 NAAR GOOGLE PLAY
 .APK DOWNLOADEN

___
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.1] hs: v3 single onion services fall back to 3-hop intro for unreachable nodes

2019-08-29 Thread dgoulet

commit e2e1c07fd25c96a83b38f5d84d2c063b98ed8f46
Author: teor 
Date:   Fri Aug 23 16:17:47 2019 +1000

hs: v3 single onion services fall back to 3-hop intro for unreachable nodes

Previously, v3 single onion services failed when all intro nodes were
unreachable via a 1-hop path. Now, we select intros that are only available
via a 3-hop path, and use a 3-hop path to connect to them.

Fixes bug 23507; bugfix on 0.3.2.1-alpha.
---
 src/feature/hs/hs_circuit.c | 25 +++--
 src/feature/hs/hs_circuit.h |  3 ++-
 src/feature/hs/hs_service.c | 30 +++---
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index d74b088f0..8acfcbd65 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -758,13 +758,16 @@ hs_circ_retry_service_rendezvous_point(origin_circuit_t 
*circ)
 }
 
 /* For a given service and a service intro point, launch a circuit to the
- * extend info ei. If the service is a single onion, a one-hop circuit will be
- * requested. Return 0 if the circuit was successfully launched and tagged
+ * extend info ei. If the service is a single onion, and direct_conn is true,
+ * a one-hop circuit will be requested.
+ *
+ * Return 0 if the circuit was successfully launched and tagged
  * with the correct identifier. On error, a negative value is returned. */
 int
 hs_circ_launch_intro_point(hs_service_t *service,
const hs_service_intro_point_t *ip,
-   extend_info_t *ei)
+   extend_info_t *ei,
+   bool direct_conn)
 {
   /* Standard flags for introduction circuit. */
   int ret = -1, circ_flags = CIRCLAUNCH_NEED_UPTIME | CIRCLAUNCH_IS_INTERNAL;
@@ -775,15 +778,17 @@ hs_circ_launch_intro_point(hs_service_t *service,
   tor_assert(ei);
 
   /* Update circuit flags in case of a single onion service that requires a
-   * direct connection.
-   *
-   * We only use a one-hop path on the first attempt. If the first attempt
+   * direct connection. */
+  tor_assert_nonfatal(ip->circuit_retries > 0);
+  /* Only single onion services can make direct conns */
+  if (BUG(!service->config.is_single_onion && direct_conn)) {
+goto end;
+  }
+  /* We only use a one-hop path on the first attempt. If the first attempt
* fails, we use a 3-hop path for reachability / reliability.
* (Unlike v2, retries is incremented by the caller before it calls this
-   * function.)
-   */
-  tor_assert_nonfatal(ip->circuit_retries > 0);
-  if (service->config.is_single_onion && ip->circuit_retries == 1) {
+   * function.) */
+  if (direct_conn && ip->circuit_retries == 1) {
 circ_flags |= CIRCLAUNCH_ONEHOP_TUNNEL;
   }
 
diff --git a/src/feature/hs/hs_circuit.h b/src/feature/hs/hs_circuit.h
index b8d8b25ad..e168b301f 100644
--- a/src/feature/hs/hs_circuit.h
+++ b/src/feature/hs/hs_circuit.h
@@ -26,7 +26,8 @@ void hs_circ_service_rp_has_opened(const hs_service_t 
*service,
origin_circuit_t *circ);
 int hs_circ_launch_intro_point(hs_service_t *service,
const hs_service_intro_point_t *ip,
-   extend_info_t *ei);
+   extend_info_t *ei,
+   bool direct_conn);
 int hs_circ_launch_rendezvous_point(const hs_service_t *service,
 const curve25519_public_key_t *onion_key,
 const uint8_t *rendezvous_cookie);
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 402929036..b05f20366 100644
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -2105,6 +2105,7 @@ build_all_descriptors(time_t now)
 static hs_service_intro_point_t *
 pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes)
 {
+  const or_options_t *options = get_options();
   const node_t *node;
   extend_info_t *info = NULL;
   hs_service_intro_point_t *ip = NULL;
@@ -2113,11 +2114,19 @@ pick_intro_point(unsigned int direct_conn, smartlist_t 
*exclude_nodes)
   /* Single onion flags. */
   router_crn_flags_t direct_flags = flags | CRN_PREF_ADDR | CRN_DIRECT_CONN;
 
-  node = router_choose_random_node(exclude_nodes, get_options()->ExcludeNodes,
+  node = router_choose_random_node(exclude_nodes, options->ExcludeNodes,
direct_conn ? direct_flags : flags);
-  /* Unable to find a node. When looking for a node for a direct connection,
-   * we could try a 3-hop path instead. We'll add support for this in a later
-   * release. */
+
+  /* If we are in single onion mode, retry node selection for a 3-hop
+   * path */
+  if (direct_conn && !node) {
+log_info(LD_REND,
+ "Unable to find an intro point that we can connect to "
+ "directly, falling back to a 3-hop path.");
+node =

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

2019-08-29 Thread dgoulet

commit 7b60368ccf1bc16d61db1868eece73178ae28e65
Merge: 561134610 ff905f8e1
Author: David Goulet 
Date:   Thu Aug 29 08:55:58 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug23507   |  5 +
 changes/bug23818_v2|  6 ++
 changes/bug23818_v3|  6 ++
 src/feature/hs/hs_circuit.c| 28 ++--
 src/feature/hs/hs_circuit.h|  3 ++-
 src/feature/hs/hs_service.c| 30 +++---
 src/feature/rend/rendservice.c | 19 +++
 7 files changed, 79 insertions(+), 18 deletions(-)

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

[tor-commits] [tor/release-0.4.1] hs: Always use a 3-hop path when a v3 single onion rend fails

2019-08-29 Thread dgoulet

commit c94904b35982a73a652d9bed8b195ce625bbb962
Author: teor 
Date:   Fri Aug 23 14:41:24 2019 +1000

hs: Always use a 3-hop path when a v3 single onion rend fails

Previously, we used a 1-hop path when a single onion rend failed
immediately, and a 3-hop path when it failed after trying to build
a circuit.

Fixes bug 23818; bugfix on 0.3.2.1-alpha.
---
 src/feature/hs/hs_circuit.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index e3873d2f1..f7996a24f 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -405,8 +405,12 @@ launch_rendezvous_point_circuit(const hs_service_t 
*service,
 if (circ_needs_uptime) {
   circ_flags |= CIRCLAUNCH_NEED_UPTIME;
 }
-/* Firewall and policies are checked when getting the extend info. */
-if (service->config.is_single_onion) {
+/* Firewall and policies are checked when getting the extend info.
+ *
+ * We only use a one-hop path on the first attempt. If the first attempt
+ * fails, we use a 3-hop path for reachability / reliability.
+ * See the comment in retry_service_rendezvous_point() for details. */
+if (service->config.is_single_onion && i == 0) {
   circ_flags |= CIRCLAUNCH_ONEHOP_TUNNEL;
 }
 



___
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.1] Merge branch 'tor-github/pr/1256' into maint-0.4.1

2019-08-29 Thread dgoulet

commit ff905f8e1e3a9df9349a82cfa2724cc50b1523f4
Merge: 337b733cf 41bc1fac8
Author: David Goulet 
Date:   Thu Aug 29 08:55:31 2019 -0400

Merge branch 'tor-github/pr/1256' into maint-0.4.1

 changes/bug23507|  5 +
 changes/bug23818_v3 |  6 ++
 src/feature/hs/hs_circuit.c | 28 ++--
 src/feature/hs/hs_circuit.h |  3 ++-
 src/feature/hs/hs_service.c | 30 +++---
 5 files changed, 58 insertions(+), 14 deletions(-)

diff --cc src/feature/hs/hs_service.c
index 8a4f1efb1,b05f20366..283591274
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@@ -2071,7 -2105,9 +2071,8 @@@ build_all_descriptors(time_t now
  static hs_service_intro_point_t *
  pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes)
  {
+   const or_options_t *options = get_options();
const node_t *node;
 -  extend_info_t *info = NULL;
hs_service_intro_point_t *ip = NULL;
/* Normal 3-hop introduction point flags. */
router_crn_flags_t flags = CRN_NEED_UPTIME | CRN_NEED_DESC;



___
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.1] changes: file for 23818, v3 onion service fix

2019-08-29 Thread dgoulet

commit 084245134b022aa983c45aa3fc0ace9fd7ae21a9
Author: teor 
Date:   Fri Aug 23 15:10:45 2019 +1000

changes: file for 23818, v3 onion service fix
---
 changes/bug23818_v3 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/bug23818_v3 b/changes/bug23818_v3
new file mode 100644
index 0..c430144d8
--- /dev/null
+++ b/changes/bug23818_v3
@@ -0,0 +1,6 @@
+  o Minor bugfixes (v3 single onion services):
+- Always retry v3 single onion service intro and rend circuits with a
+  3-hop path. Previously, v3 single onion services used a 3-hop path
+  when rend circuits were retried after a remote or delayed failure,
+  but a 1-hop path for immediate retries. Fixes bug 23818;
+  bugfix on 0.3.2.1-alpha.



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

[tor-commits] [tor/master] hs: Remove an outdated comment

2019-08-29 Thread dgoulet

commit 55580d063d03ee100a75f4acea8286a6c6e53c8f
Author: teor 
Date:   Fri Aug 23 14:43:16 2019 +1000

hs: Remove an outdated comment
---
 src/feature/hs/hs_circuit.c | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index 716c4b1f1..e3f9ca1de 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -389,10 +389,7 @@ launch_rendezvous_point_circuit(const hs_service_t 
*service,
 >onion_pk,
 service->config.is_single_onion);
   if (info == NULL) {
-/* We are done here, we can't extend to the rendezvous point.
- * If you're running an IPv6-only v3 single onion service on 0.3.2 or with
- * 0.3.2 clients, and somehow disable the option check, it will fail here.
- */
+/* We are done here, we can't extend to the rendezvous point. */
 log_fn(LOG_PROTOCOL_WARN, LD_REND,
"Not enough info to open a circuit to a rendezvous point for "
"%s service %s.",



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

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

2019-08-29 Thread dgoulet

commit 7c99a4dddee8350a4997ed2e2033dc9c20242da1
Merge: 04ab357df ff905f8e1
Author: David Goulet 
Date:   Thu Aug 29 08:55:58 2019 -0400

Merge branch 'maint-0.4.1'

 changes/bug23507   |  5 +
 changes/bug23818_v2|  6 ++
 changes/bug23818_v3|  6 ++
 src/feature/hs/hs_circuit.c| 28 ++--
 src/feature/hs/hs_circuit.h|  3 ++-
 src/feature/hs/hs_service.c| 30 +++---
 src/feature/rend/rendservice.c | 19 +++
 7 files changed, 79 insertions(+), 18 deletions(-)




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

[tor-commits] [tor/master] hs: Always use a 3-hop path when a v3 single onion rend fails

2019-08-29 Thread dgoulet

commit c94904b35982a73a652d9bed8b195ce625bbb962
Author: teor 
Date:   Fri Aug 23 14:41:24 2019 +1000

hs: Always use a 3-hop path when a v3 single onion rend fails

Previously, we used a 1-hop path when a single onion rend failed
immediately, and a 3-hop path when it failed after trying to build
a circuit.

Fixes bug 23818; bugfix on 0.3.2.1-alpha.
---
 src/feature/hs/hs_circuit.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index e3873d2f1..f7996a24f 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -405,8 +405,12 @@ launch_rendezvous_point_circuit(const hs_service_t 
*service,
 if (circ_needs_uptime) {
   circ_flags |= CIRCLAUNCH_NEED_UPTIME;
 }
-/* Firewall and policies are checked when getting the extend info. */
-if (service->config.is_single_onion) {
+/* Firewall and policies are checked when getting the extend info.
+ *
+ * We only use a one-hop path on the first attempt. If the first attempt
+ * fails, we use a 3-hop path for reachability / reliability.
+ * See the comment in retry_service_rendezvous_point() for details. */
+if (service->config.is_single_onion && i == 0) {
   circ_flags |= CIRCLAUNCH_ONEHOP_TUNNEL;
 }
 



___
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.1] changes: file for 23507, v3 onion service fix

2019-08-29 Thread dgoulet

commit 41bc1fac8e77e399572e020c5ba59462afd75f4b
Author: teor 
Date:   Fri Aug 23 16:25:33 2019 +1000

changes: file for 23507, v3 onion service fix
---
 changes/bug23507 | 5 +
 1 file changed, 5 insertions(+)

diff --git a/changes/bug23507 b/changes/bug23507
new file mode 100644
index 0..de18273fd
--- /dev/null
+++ b/changes/bug23507
@@ -0,0 +1,5 @@
+  o Minor bugfixes (v3 single onion services):
+- Make v3 single onion services fall back to a 3-hop intro, when there
+  all intro points are unreachable via a 1-hop path. Previously, v3
+  single onion services failed when all intro nodes were unreachable
+  via a 1-hop path. Fixes bug 23507; bugfix on 0.3.2.1-alpha.



___
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.1] changes: file for 23818, v2 onion service fix

2019-08-29 Thread dgoulet

commit 231a74363fa9ccd1769b61229dc70a72e1e5807b
Author: teor 
Date:   Fri Aug 23 15:08:43 2019 +1000

changes: file for 23818, v2 onion service fix
---
 changes/bug23818_v2 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/bug23818_v2 b/changes/bug23818_v2
new file mode 100644
index 0..0219a20f4
--- /dev/null
+++ b/changes/bug23818_v2
@@ -0,0 +1,6 @@
+  o Minor bugfixes (v2 single onion services):
+- Always retry v2 single onion service intro and rend circuits with a
+  3-hop path. Previously, v2 single onion services used a 3-hop path
+  when rend circuits were retried after a remote or delayed failure,
+  but a 1-hop path for immediate retries. Fixes bug 23818;
+  bugfix on 0.2.9.3-alpha.



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

[tor-commits] [tor/master] Merge branch 'bug23818_035' into bug23818_master

2019-08-29 Thread dgoulet

commit 65935f6da7ac9201c6197f4fc1b57527c8e3457a
Merge: d475d7c2f 41bc1fac8
Author: teor 
Date:   Fri Aug 23 16:26:32 2019 +1000

Merge branch 'bug23818_035' into bug23818_master

 changes/bug23507   |  5 +
 changes/bug23818_v2|  6 ++
 changes/bug23818_v3|  6 ++
 src/feature/hs/hs_circuit.c| 28 ++--
 src/feature/hs/hs_circuit.h|  3 ++-
 src/feature/hs/hs_service.c| 30 +++---
 src/feature/rend/rendservice.c | 19 +++
 7 files changed, 79 insertions(+), 18 deletions(-)

diff --cc src/feature/hs/hs_service.c
index 8a4f1efb1,b05f20366..283591274
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@@ -2071,7 -2105,9 +2071,8 @@@ build_all_descriptors(time_t now
  static hs_service_intro_point_t *
  pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes)
  {
+   const or_options_t *options = get_options();
const node_t *node;
 -  extend_info_t *info = NULL;
hs_service_intro_point_t *ip = NULL;
/* Normal 3-hop introduction point flags. */
router_crn_flags_t flags = CRN_NEED_UPTIME | CRN_NEED_DESC;



___
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.1] hs: Always use a 3-hop path when a v3 single onion intro fails

2019-08-29 Thread dgoulet

commit 229a982405e0fd2f9980d3c1a41c34e0cf26ae26
Author: teor 
Date:   Fri Aug 23 14:56:01 2019 +1000

hs: Always use a 3-hop path when a v3 single onion intro fails

Previously, we always used a 1-hop path, no matter how many times a v3
single onion intro failed.

Fixes bug 23818; bugfix on 0.3.2.1-alpha.
---
 src/feature/hs/hs_circuit.c | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index f7996a24f..d74b088f0 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -775,8 +775,15 @@ hs_circ_launch_intro_point(hs_service_t *service,
   tor_assert(ei);
 
   /* Update circuit flags in case of a single onion service that requires a
-   * direct connection. */
-  if (service->config.is_single_onion) {
+   * direct connection.
+   *
+   * We only use a one-hop path on the first attempt. If the first attempt
+   * fails, we use a 3-hop path for reachability / reliability.
+   * (Unlike v2, retries is incremented by the caller before it calls this
+   * function.)
+   */
+  tor_assert_nonfatal(ip->circuit_retries > 0);
+  if (service->config.is_single_onion && ip->circuit_retries == 1) {
 circ_flags |= CIRCLAUNCH_ONEHOP_TUNNEL;
   }
 



___
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.1] rendservice: Always use a 3-hop path when a v2 single onion rend fails

2019-08-29 Thread dgoulet

commit dc08f8ac70e95b9a76f86a5e15dfcabd7ada25b9
Author: teor 
Date:   Fri Aug 23 14:38:54 2019 +1000

rendservice: Always use a 3-hop path when a v2 single onion rend fails

Previously, we used a 1-hop path when a single onion rend failed
immediately, and a 3-hop path when it failed after trying to build
a circuit.

Fixes bug 23818; bugfix on 0.2.9.3-alpha.
---
 src/or/rendservice.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 32b856452..f145e9d69 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -2073,8 +2073,12 @@ rend_service_receive_introduction(origin_circuit_t 
*circuit,
 int flags = CIRCLAUNCH_NEED_CAPACITY | CIRCLAUNCH_IS_INTERNAL;
 if (circ_needs_uptime) flags |= CIRCLAUNCH_NEED_UPTIME;
 /* A Single Onion Service only uses a direct connection if its
- * firewall rules permit direct connections to the address. */
-if (rend_service_use_direct_connection(options, rp)) {
+ * firewall rules permit direct connections to the address.
+ *
+ * We only use a one-hop path on the first attempt. If the first attempt
+ * fails, we use a 3-hop path for reachability / reliability.
+ * See the comment in rend_service_relauch_rendezvous() for details. */
+if (rend_service_use_direct_connection(options, rp) && i == 0) {
   flags = flags | CIRCLAUNCH_ONEHOP_TUNNEL;
 }
 launched = circuit_launch_by_extend_info(



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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1256' into maint-0.4.1

2019-08-29 Thread dgoulet

commit ff905f8e1e3a9df9349a82cfa2724cc50b1523f4
Merge: 337b733cf 41bc1fac8
Author: David Goulet 
Date:   Thu Aug 29 08:55:31 2019 -0400

Merge branch 'tor-github/pr/1256' into maint-0.4.1

 changes/bug23507|  5 +
 changes/bug23818_v3 |  6 ++
 src/feature/hs/hs_circuit.c | 28 ++--
 src/feature/hs/hs_circuit.h |  3 ++-
 src/feature/hs/hs_service.c | 30 +++---
 5 files changed, 58 insertions(+), 14 deletions(-)

diff --cc src/feature/hs/hs_service.c
index 8a4f1efb1,b05f20366..283591274
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@@ -2071,7 -2105,9 +2071,8 @@@ build_all_descriptors(time_t now
  static hs_service_intro_point_t *
  pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes)
  {
+   const or_options_t *options = get_options();
const node_t *node;
 -  extend_info_t *info = NULL;
hs_service_intro_point_t *ip = NULL;
/* Normal 3-hop introduction point flags. */
router_crn_flags_t flags = CRN_NEED_UPTIME | CRN_NEED_DESC;



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

[tor-commits] [tor/master] hs: v3 single onion services fall back to 3-hop intro for unreachable nodes

2019-08-29 Thread dgoulet

commit e2e1c07fd25c96a83b38f5d84d2c063b98ed8f46
Author: teor 
Date:   Fri Aug 23 16:17:47 2019 +1000

hs: v3 single onion services fall back to 3-hop intro for unreachable nodes

Previously, v3 single onion services failed when all intro nodes were
unreachable via a 1-hop path. Now, we select intros that are only available
via a 3-hop path, and use a 3-hop path to connect to them.

Fixes bug 23507; bugfix on 0.3.2.1-alpha.
---
 src/feature/hs/hs_circuit.c | 25 +++--
 src/feature/hs/hs_circuit.h |  3 ++-
 src/feature/hs/hs_service.c | 30 +++---
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index d74b088f0..8acfcbd65 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -758,13 +758,16 @@ hs_circ_retry_service_rendezvous_point(origin_circuit_t 
*circ)
 }
 
 /* For a given service and a service intro point, launch a circuit to the
- * extend info ei. If the service is a single onion, a one-hop circuit will be
- * requested. Return 0 if the circuit was successfully launched and tagged
+ * extend info ei. If the service is a single onion, and direct_conn is true,
+ * a one-hop circuit will be requested.
+ *
+ * Return 0 if the circuit was successfully launched and tagged
  * with the correct identifier. On error, a negative value is returned. */
 int
 hs_circ_launch_intro_point(hs_service_t *service,
const hs_service_intro_point_t *ip,
-   extend_info_t *ei)
+   extend_info_t *ei,
+   bool direct_conn)
 {
   /* Standard flags for introduction circuit. */
   int ret = -1, circ_flags = CIRCLAUNCH_NEED_UPTIME | CIRCLAUNCH_IS_INTERNAL;
@@ -775,15 +778,17 @@ hs_circ_launch_intro_point(hs_service_t *service,
   tor_assert(ei);
 
   /* Update circuit flags in case of a single onion service that requires a
-   * direct connection.
-   *
-   * We only use a one-hop path on the first attempt. If the first attempt
+   * direct connection. */
+  tor_assert_nonfatal(ip->circuit_retries > 0);
+  /* Only single onion services can make direct conns */
+  if (BUG(!service->config.is_single_onion && direct_conn)) {
+goto end;
+  }
+  /* We only use a one-hop path on the first attempt. If the first attempt
* fails, we use a 3-hop path for reachability / reliability.
* (Unlike v2, retries is incremented by the caller before it calls this
-   * function.)
-   */
-  tor_assert_nonfatal(ip->circuit_retries > 0);
-  if (service->config.is_single_onion && ip->circuit_retries == 1) {
+   * function.) */
+  if (direct_conn && ip->circuit_retries == 1) {
 circ_flags |= CIRCLAUNCH_ONEHOP_TUNNEL;
   }
 
diff --git a/src/feature/hs/hs_circuit.h b/src/feature/hs/hs_circuit.h
index b8d8b25ad..e168b301f 100644
--- a/src/feature/hs/hs_circuit.h
+++ b/src/feature/hs/hs_circuit.h
@@ -26,7 +26,8 @@ void hs_circ_service_rp_has_opened(const hs_service_t 
*service,
origin_circuit_t *circ);
 int hs_circ_launch_intro_point(hs_service_t *service,
const hs_service_intro_point_t *ip,
-   extend_info_t *ei);
+   extend_info_t *ei,
+   bool direct_conn);
 int hs_circ_launch_rendezvous_point(const hs_service_t *service,
 const curve25519_public_key_t *onion_key,
 const uint8_t *rendezvous_cookie);
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 402929036..b05f20366 100644
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -2105,6 +2105,7 @@ build_all_descriptors(time_t now)
 static hs_service_intro_point_t *
 pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes)
 {
+  const or_options_t *options = get_options();
   const node_t *node;
   extend_info_t *info = NULL;
   hs_service_intro_point_t *ip = NULL;
@@ -2113,11 +2114,19 @@ pick_intro_point(unsigned int direct_conn, smartlist_t 
*exclude_nodes)
   /* Single onion flags. */
   router_crn_flags_t direct_flags = flags | CRN_PREF_ADDR | CRN_DIRECT_CONN;
 
-  node = router_choose_random_node(exclude_nodes, get_options()->ExcludeNodes,
+  node = router_choose_random_node(exclude_nodes, options->ExcludeNodes,
direct_conn ? direct_flags : flags);
-  /* Unable to find a node. When looking for a node for a direct connection,
-   * we could try a 3-hop path instead. We'll add support for this in a later
-   * release. */
+
+  /* If we are in single onion mode, retry node selection for a 3-hop
+   * path */
+  if (direct_conn && !node) {
+log_info(LD_REND,
+ "Unable to find an intro point that we can connect to "
+ "directly, falling back to a 3-hop path.");
+node =

[tor-commits] [tor/release-0.4.1] rendservice: Always use a 3-hop path when a v2 single onion intro fails

2019-08-29 Thread dgoulet

commit 144084d6facc3d688c7d423a8b5b8da5e26de84c
Author: teor 
Date:   Fri Aug 23 14:54:15 2019 +1000

rendservice: Always use a 3-hop path when a v2 single onion intro fails

Previously, we always used a 1-hop path, no matter how many times a v2
single onion intro failed.

Fixes bug 23818; bugfix on 0.2.9.3-alpha.
---
 src/or/rendservice.c | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index f145e9d69..ca1be5e5d 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3041,8 +3041,15 @@ rend_service_launch_establish_intro(rend_service_t 
*service,
   extend_info_t *launch_ei = intro->extend_info;
   extend_info_t *direct_ei = NULL;
 
-  /* Are we in single onion mode? */
-  if (rend_service_allow_non_anonymous_connection(options)) {
+  /* Are we in single onion mode?
+   *
+   * We only use a one-hop path on the first attempt. If the first attempt
+   * fails, we use a 3-hop path for reachability / reliability.
+   * (Unlike v3, retries is incremented by the caller after it calls this
+   * function.)
+   */
+  if (rend_service_allow_non_anonymous_connection(options) &&
+  intro->circuit_retries == 0) {
 /* Do we have a descriptor for the node?
  * We've either just chosen it from the consensus, or we've just reviewed
  * our intro points to see which ones are still valid, and deleted the ones



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

[tor-commits] [tor/master] changes: file for 23507, v3 onion service fix

2019-08-29 Thread dgoulet

commit 41bc1fac8e77e399572e020c5ba59462afd75f4b
Author: teor 
Date:   Fri Aug 23 16:25:33 2019 +1000

changes: file for 23507, v3 onion service fix
---
 changes/bug23507 | 5 +
 1 file changed, 5 insertions(+)

diff --git a/changes/bug23507 b/changes/bug23507
new file mode 100644
index 0..de18273fd
--- /dev/null
+++ b/changes/bug23507
@@ -0,0 +1,5 @@
+  o Minor bugfixes (v3 single onion services):
+- Make v3 single onion services fall back to a 3-hop intro, when there
+  all intro points are unreachable via a 1-hop path. Previously, v3
+  single onion services failed when all intro nodes were unreachable
+  via a 1-hop path. Fixes bug 23507; bugfix on 0.3.2.1-alpha.



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

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1257'

2019-08-29 Thread dgoulet

commit 960d9894159ebd830e41db7ed9ae4e166235e331
Merge: 7c99a4ddd 55580d063
Author: David Goulet 
Date:   Thu Aug 29 08:56:04 2019 -0400

Merge branch 'tor-github/pr/1257'

 src/feature/hs/hs_circuit.c | 5 +
 1 file changed, 1 insertion(+), 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] rendservice: Always use a 3-hop path when a v2 single onion rend fails

2019-08-29 Thread dgoulet

commit dc08f8ac70e95b9a76f86a5e15dfcabd7ada25b9
Author: teor 
Date:   Fri Aug 23 14:38:54 2019 +1000

rendservice: Always use a 3-hop path when a v2 single onion rend fails

Previously, we used a 1-hop path when a single onion rend failed
immediately, and a 3-hop path when it failed after trying to build
a circuit.

Fixes bug 23818; bugfix on 0.2.9.3-alpha.
---
 src/or/rendservice.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 32b856452..f145e9d69 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -2073,8 +2073,12 @@ rend_service_receive_introduction(origin_circuit_t 
*circuit,
 int flags = CIRCLAUNCH_NEED_CAPACITY | CIRCLAUNCH_IS_INTERNAL;
 if (circ_needs_uptime) flags |= CIRCLAUNCH_NEED_UPTIME;
 /* A Single Onion Service only uses a direct connection if its
- * firewall rules permit direct connections to the address. */
-if (rend_service_use_direct_connection(options, rp)) {
+ * firewall rules permit direct connections to the address.
+ *
+ * We only use a one-hop path on the first attempt. If the first attempt
+ * fails, we use a 3-hop path for reachability / reliability.
+ * See the comment in rend_service_relauch_rendezvous() for details. */
+if (rend_service_use_direct_connection(options, rp) && i == 0) {
   flags = flags | CIRCLAUNCH_ONEHOP_TUNNEL;
 }
 launched = circuit_launch_by_extend_info(



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

[tor-commits] [tor/master] hs: Always use a 3-hop path when a v3 single onion intro fails

2019-08-29 Thread dgoulet

commit 229a982405e0fd2f9980d3c1a41c34e0cf26ae26
Author: teor 
Date:   Fri Aug 23 14:56:01 2019 +1000

hs: Always use a 3-hop path when a v3 single onion intro fails

Previously, we always used a 1-hop path, no matter how many times a v3
single onion intro failed.

Fixes bug 23818; bugfix on 0.3.2.1-alpha.
---
 src/feature/hs/hs_circuit.c | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index f7996a24f..d74b088f0 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -775,8 +775,15 @@ hs_circ_launch_intro_point(hs_service_t *service,
   tor_assert(ei);
 
   /* Update circuit flags in case of a single onion service that requires a
-   * direct connection. */
-  if (service->config.is_single_onion) {
+   * direct connection.
+   *
+   * We only use a one-hop path on the first attempt. If the first attempt
+   * fails, we use a 3-hop path for reachability / reliability.
+   * (Unlike v2, retries is incremented by the caller before it calls this
+   * function.)
+   */
+  tor_assert_nonfatal(ip->circuit_retries > 0);
+  if (service->config.is_single_onion && ip->circuit_retries == 1) {
 circ_flags |= CIRCLAUNCH_ONEHOP_TUNNEL;
   }
 



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

[tor-commits] [tor/master] rendservice: Always use a 3-hop path when a v2 single onion intro fails

2019-08-29 Thread dgoulet

commit 144084d6facc3d688c7d423a8b5b8da5e26de84c
Author: teor 
Date:   Fri Aug 23 14:54:15 2019 +1000

rendservice: Always use a 3-hop path when a v2 single onion intro fails

Previously, we always used a 1-hop path, no matter how many times a v2
single onion intro failed.

Fixes bug 23818; bugfix on 0.2.9.3-alpha.
---
 src/or/rendservice.c | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index f145e9d69..ca1be5e5d 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3041,8 +3041,15 @@ rend_service_launch_establish_intro(rend_service_t 
*service,
   extend_info_t *launch_ei = intro->extend_info;
   extend_info_t *direct_ei = NULL;
 
-  /* Are we in single onion mode? */
-  if (rend_service_allow_non_anonymous_connection(options)) {
+  /* Are we in single onion mode?
+   *
+   * We only use a one-hop path on the first attempt. If the first attempt
+   * fails, we use a 3-hop path for reachability / reliability.
+   * (Unlike v3, retries is incremented by the caller after it calls this
+   * function.)
+   */
+  if (rend_service_allow_non_anonymous_connection(options) &&
+  intro->circuit_retries == 0) {
 /* Do we have a descriptor for the node?
  * We've either just chosen it from the consensus, or we've just reviewed
  * our intro points to see which ones are still valid, and deleted the ones



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

[tor-commits] [tor/master] changes: file for 23818, v3 onion service fix

2019-08-29 Thread dgoulet

commit 084245134b022aa983c45aa3fc0ace9fd7ae21a9
Author: teor 
Date:   Fri Aug 23 15:10:45 2019 +1000

changes: file for 23818, v3 onion service fix
---
 changes/bug23818_v3 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/bug23818_v3 b/changes/bug23818_v3
new file mode 100644
index 0..c430144d8
--- /dev/null
+++ b/changes/bug23818_v3
@@ -0,0 +1,6 @@
+  o Minor bugfixes (v3 single onion services):
+- Always retry v3 single onion service intro and rend circuits with a
+  3-hop path. Previously, v3 single onion services used a 3-hop path
+  when rend circuits were retried after a remote or delayed failure,
+  but a 1-hop path for immediate retries. Fixes bug 23818;
+  bugfix on 0.3.2.1-alpha.



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

[tor-commits] [tor/master] changes: file for 23818, v2 onion service fix

2019-08-29 Thread dgoulet

commit 231a74363fa9ccd1769b61229dc70a72e1e5807b
Author: teor 
Date:   Fri Aug 23 15:08:43 2019 +1000

changes: file for 23818, v2 onion service fix
---
 changes/bug23818_v2 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/bug23818_v2 b/changes/bug23818_v2
new file mode 100644
index 0..0219a20f4
--- /dev/null
+++ b/changes/bug23818_v2
@@ -0,0 +1,6 @@
+  o Minor bugfixes (v2 single onion services):
+- Always retry v2 single onion service intro and rend circuits with a
+  3-hop path. Previously, v2 single onion services used a 3-hop path
+  when rend circuits were retried after a remote or delayed failure,
+  but a 1-hop path for immediate retries. Fixes bug 23818;
+  bugfix on 0.2.9.3-alpha.



___
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.1] changes: file for 23507, v3 onion service fix

2019-08-29 Thread dgoulet

commit 41bc1fac8e77e399572e020c5ba59462afd75f4b
Author: teor 
Date:   Fri Aug 23 16:25:33 2019 +1000

changes: file for 23507, v3 onion service fix
---
 changes/bug23507 | 5 +
 1 file changed, 5 insertions(+)

diff --git a/changes/bug23507 b/changes/bug23507
new file mode 100644
index 0..de18273fd
--- /dev/null
+++ b/changes/bug23507
@@ -0,0 +1,5 @@
+  o Minor bugfixes (v3 single onion services):
+- Make v3 single onion services fall back to a 3-hop intro, when there
+  all intro points are unreachable via a 1-hop path. Previously, v3
+  single onion services failed when all intro nodes were unreachable
+  via a 1-hop path. Fixes bug 23507; bugfix on 0.3.2.1-alpha.



___
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.1] hs: v3 single onion services fall back to 3-hop intro for unreachable nodes

2019-08-29 Thread dgoulet

commit e2e1c07fd25c96a83b38f5d84d2c063b98ed8f46
Author: teor 
Date:   Fri Aug 23 16:17:47 2019 +1000

hs: v3 single onion services fall back to 3-hop intro for unreachable nodes

Previously, v3 single onion services failed when all intro nodes were
unreachable via a 1-hop path. Now, we select intros that are only available
via a 3-hop path, and use a 3-hop path to connect to them.

Fixes bug 23507; bugfix on 0.3.2.1-alpha.
---
 src/feature/hs/hs_circuit.c | 25 +++--
 src/feature/hs/hs_circuit.h |  3 ++-
 src/feature/hs/hs_service.c | 30 +++---
 3 files changed, 40 insertions(+), 18 deletions(-)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index d74b088f0..8acfcbd65 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -758,13 +758,16 @@ hs_circ_retry_service_rendezvous_point(origin_circuit_t 
*circ)
 }
 
 /* For a given service and a service intro point, launch a circuit to the
- * extend info ei. If the service is a single onion, a one-hop circuit will be
- * requested. Return 0 if the circuit was successfully launched and tagged
+ * extend info ei. If the service is a single onion, and direct_conn is true,
+ * a one-hop circuit will be requested.
+ *
+ * Return 0 if the circuit was successfully launched and tagged
  * with the correct identifier. On error, a negative value is returned. */
 int
 hs_circ_launch_intro_point(hs_service_t *service,
const hs_service_intro_point_t *ip,
-   extend_info_t *ei)
+   extend_info_t *ei,
+   bool direct_conn)
 {
   /* Standard flags for introduction circuit. */
   int ret = -1, circ_flags = CIRCLAUNCH_NEED_UPTIME | CIRCLAUNCH_IS_INTERNAL;
@@ -775,15 +778,17 @@ hs_circ_launch_intro_point(hs_service_t *service,
   tor_assert(ei);
 
   /* Update circuit flags in case of a single onion service that requires a
-   * direct connection.
-   *
-   * We only use a one-hop path on the first attempt. If the first attempt
+   * direct connection. */
+  tor_assert_nonfatal(ip->circuit_retries > 0);
+  /* Only single onion services can make direct conns */
+  if (BUG(!service->config.is_single_onion && direct_conn)) {
+goto end;
+  }
+  /* We only use a one-hop path on the first attempt. If the first attempt
* fails, we use a 3-hop path for reachability / reliability.
* (Unlike v2, retries is incremented by the caller before it calls this
-   * function.)
-   */
-  tor_assert_nonfatal(ip->circuit_retries > 0);
-  if (service->config.is_single_onion && ip->circuit_retries == 1) {
+   * function.) */
+  if (direct_conn && ip->circuit_retries == 1) {
 circ_flags |= CIRCLAUNCH_ONEHOP_TUNNEL;
   }
 
diff --git a/src/feature/hs/hs_circuit.h b/src/feature/hs/hs_circuit.h
index b8d8b25ad..e168b301f 100644
--- a/src/feature/hs/hs_circuit.h
+++ b/src/feature/hs/hs_circuit.h
@@ -26,7 +26,8 @@ void hs_circ_service_rp_has_opened(const hs_service_t 
*service,
origin_circuit_t *circ);
 int hs_circ_launch_intro_point(hs_service_t *service,
const hs_service_intro_point_t *ip,
-   extend_info_t *ei);
+   extend_info_t *ei,
+   bool direct_conn);
 int hs_circ_launch_rendezvous_point(const hs_service_t *service,
 const curve25519_public_key_t *onion_key,
 const uint8_t *rendezvous_cookie);
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 402929036..b05f20366 100644
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -2105,6 +2105,7 @@ build_all_descriptors(time_t now)
 static hs_service_intro_point_t *
 pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes)
 {
+  const or_options_t *options = get_options();
   const node_t *node;
   extend_info_t *info = NULL;
   hs_service_intro_point_t *ip = NULL;
@@ -2113,11 +2114,19 @@ pick_intro_point(unsigned int direct_conn, smartlist_t 
*exclude_nodes)
   /* Single onion flags. */
   router_crn_flags_t direct_flags = flags | CRN_PREF_ADDR | CRN_DIRECT_CONN;
 
-  node = router_choose_random_node(exclude_nodes, get_options()->ExcludeNodes,
+  node = router_choose_random_node(exclude_nodes, options->ExcludeNodes,
direct_conn ? direct_flags : flags);
-  /* Unable to find a node. When looking for a node for a direct connection,
-   * we could try a 3-hop path instead. We'll add support for this in a later
-   * release. */
+
+  /* If we are in single onion mode, retry node selection for a 3-hop
+   * path */
+  if (direct_conn && !node) {
+log_info(LD_REND,
+ "Unable to find an intro point that we can connect to "
+ "directly, falling back to a 3-hop path.");
+node =

[tor-commits] [tor/maint-0.4.1] hs: Always use a 3-hop path when a v3 single onion rend fails

2019-08-29 Thread dgoulet

commit c94904b35982a73a652d9bed8b195ce625bbb962
Author: teor 
Date:   Fri Aug 23 14:41:24 2019 +1000

hs: Always use a 3-hop path when a v3 single onion rend fails

Previously, we used a 1-hop path when a single onion rend failed
immediately, and a 3-hop path when it failed after trying to build
a circuit.

Fixes bug 23818; bugfix on 0.3.2.1-alpha.
---
 src/feature/hs/hs_circuit.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index e3873d2f1..f7996a24f 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -405,8 +405,12 @@ launch_rendezvous_point_circuit(const hs_service_t 
*service,
 if (circ_needs_uptime) {
   circ_flags |= CIRCLAUNCH_NEED_UPTIME;
 }
-/* Firewall and policies are checked when getting the extend info. */
-if (service->config.is_single_onion) {
+/* Firewall and policies are checked when getting the extend info.
+ *
+ * We only use a one-hop path on the first attempt. If the first attempt
+ * fails, we use a 3-hop path for reachability / reliability.
+ * See the comment in retry_service_rendezvous_point() for details. */
+if (service->config.is_single_onion && i == 0) {
   circ_flags |= CIRCLAUNCH_ONEHOP_TUNNEL;
 }
 



___
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.1] changes: file for 23818, v3 onion service fix

2019-08-29 Thread dgoulet

commit 084245134b022aa983c45aa3fc0ace9fd7ae21a9
Author: teor 
Date:   Fri Aug 23 15:10:45 2019 +1000

changes: file for 23818, v3 onion service fix
---
 changes/bug23818_v3 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/bug23818_v3 b/changes/bug23818_v3
new file mode 100644
index 0..c430144d8
--- /dev/null
+++ b/changes/bug23818_v3
@@ -0,0 +1,6 @@
+  o Minor bugfixes (v3 single onion services):
+- Always retry v3 single onion service intro and rend circuits with a
+  3-hop path. Previously, v3 single onion services used a 3-hop path
+  when rend circuits were retried after a remote or delayed failure,
+  but a 1-hop path for immediate retries. Fixes bug 23818;
+  bugfix on 0.3.2.1-alpha.



___
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.1] hs: Always use a 3-hop path when a v3 single onion intro fails

2019-08-29 Thread dgoulet

commit 229a982405e0fd2f9980d3c1a41c34e0cf26ae26
Author: teor 
Date:   Fri Aug 23 14:56:01 2019 +1000

hs: Always use a 3-hop path when a v3 single onion intro fails

Previously, we always used a 1-hop path, no matter how many times a v3
single onion intro failed.

Fixes bug 23818; bugfix on 0.3.2.1-alpha.
---
 src/feature/hs/hs_circuit.c | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/feature/hs/hs_circuit.c b/src/feature/hs/hs_circuit.c
index f7996a24f..d74b088f0 100644
--- a/src/feature/hs/hs_circuit.c
+++ b/src/feature/hs/hs_circuit.c
@@ -775,8 +775,15 @@ hs_circ_launch_intro_point(hs_service_t *service,
   tor_assert(ei);
 
   /* Update circuit flags in case of a single onion service that requires a
-   * direct connection. */
-  if (service->config.is_single_onion) {
+   * direct connection.
+   *
+   * We only use a one-hop path on the first attempt. If the first attempt
+   * fails, we use a 3-hop path for reachability / reliability.
+   * (Unlike v2, retries is incremented by the caller before it calls this
+   * function.)
+   */
+  tor_assert_nonfatal(ip->circuit_retries > 0);
+  if (service->config.is_single_onion && ip->circuit_retries == 1) {
 circ_flags |= CIRCLAUNCH_ONEHOP_TUNNEL;
   }
 



___
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.1] Merge branch 'tor-github/pr/1256' into maint-0.4.1

2019-08-29 Thread dgoulet

commit ff905f8e1e3a9df9349a82cfa2724cc50b1523f4
Merge: 337b733cf 41bc1fac8
Author: David Goulet 
Date:   Thu Aug 29 08:55:31 2019 -0400

Merge branch 'tor-github/pr/1256' into maint-0.4.1

 changes/bug23507|  5 +
 changes/bug23818_v3 |  6 ++
 src/feature/hs/hs_circuit.c | 28 ++--
 src/feature/hs/hs_circuit.h |  3 ++-
 src/feature/hs/hs_service.c | 30 +++---
 5 files changed, 58 insertions(+), 14 deletions(-)

diff --cc src/feature/hs/hs_service.c
index 8a4f1efb1,b05f20366..283591274
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@@ -2071,7 -2105,9 +2071,8 @@@ build_all_descriptors(time_t now
  static hs_service_intro_point_t *
  pick_intro_point(unsigned int direct_conn, smartlist_t *exclude_nodes)
  {
+   const or_options_t *options = get_options();
const node_t *node;
 -  extend_info_t *info = NULL;
hs_service_intro_point_t *ip = NULL;
/* Normal 3-hop introduction point flags. */
router_crn_flags_t flags = CRN_NEED_UPTIME | CRN_NEED_DESC;

___
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.1] changes: file for 23818, v2 onion service fix

2019-08-29 Thread dgoulet

commit 231a74363fa9ccd1769b61229dc70a72e1e5807b
Author: teor 
Date:   Fri Aug 23 15:08:43 2019 +1000

changes: file for 23818, v2 onion service fix
---
 changes/bug23818_v2 | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/changes/bug23818_v2 b/changes/bug23818_v2
new file mode 100644
index 0..0219a20f4
--- /dev/null
+++ b/changes/bug23818_v2
@@ -0,0 +1,6 @@
+  o Minor bugfixes (v2 single onion services):
+- Always retry v2 single onion service intro and rend circuits with a
+  3-hop path. Previously, v2 single onion services used a 3-hop path
+  when rend circuits were retried after a remote or delayed failure,
+  but a 1-hop path for immediate retries. Fixes bug 23818;
+  bugfix on 0.2.9.3-alpha.



___
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.1] rendservice: Always use a 3-hop path when a v2 single onion intro fails

2019-08-29 Thread dgoulet

commit 144084d6facc3d688c7d423a8b5b8da5e26de84c
Author: teor 
Date:   Fri Aug 23 14:54:15 2019 +1000

rendservice: Always use a 3-hop path when a v2 single onion intro fails

Previously, we always used a 1-hop path, no matter how many times a v2
single onion intro failed.

Fixes bug 23818; bugfix on 0.2.9.3-alpha.
---
 src/or/rendservice.c | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index f145e9d69..ca1be5e5d 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -3041,8 +3041,15 @@ rend_service_launch_establish_intro(rend_service_t 
*service,
   extend_info_t *launch_ei = intro->extend_info;
   extend_info_t *direct_ei = NULL;
 
-  /* Are we in single onion mode? */
-  if (rend_service_allow_non_anonymous_connection(options)) {
+  /* Are we in single onion mode?
+   *
+   * We only use a one-hop path on the first attempt. If the first attempt
+   * fails, we use a 3-hop path for reachability / reliability.
+   * (Unlike v3, retries is incremented by the caller after it calls this
+   * function.)
+   */
+  if (rend_service_allow_non_anonymous_connection(options) &&
+  intro->circuit_retries == 0) {
 /* Do we have a descriptor for the node?
  * We've either just chosen it from the consensus, or we've just reviewed
  * our intro points to see which ones are still valid, and deleted the ones



___
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.1] rendservice: Always use a 3-hop path when a v2 single onion rend fails

2019-08-29 Thread dgoulet

commit dc08f8ac70e95b9a76f86a5e15dfcabd7ada25b9
Author: teor 
Date:   Fri Aug 23 14:38:54 2019 +1000

rendservice: Always use a 3-hop path when a v2 single onion rend fails

Previously, we used a 1-hop path when a single onion rend failed
immediately, and a 3-hop path when it failed after trying to build
a circuit.

Fixes bug 23818; bugfix on 0.2.9.3-alpha.
---
 src/or/rendservice.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 32b856452..f145e9d69 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -2073,8 +2073,12 @@ rend_service_receive_introduction(origin_circuit_t 
*circuit,
 int flags = CIRCLAUNCH_NEED_CAPACITY | CIRCLAUNCH_IS_INTERNAL;
 if (circ_needs_uptime) flags |= CIRCLAUNCH_NEED_UPTIME;
 /* A Single Onion Service only uses a direct connection if its
- * firewall rules permit direct connections to the address. */
-if (rend_service_use_direct_connection(options, rp)) {
+ * firewall rules permit direct connections to the address.
+ *
+ * We only use a one-hop path on the first attempt. If the first attempt
+ * fails, we use a 3-hop path for reachability / reliability.
+ * See the comment in rend_service_relauch_rendezvous() for details. */
+if (rend_service_use_direct_connection(options, rp) && i == 0) {
   flags = flags | CIRCLAUNCH_ONEHOP_TUNNEL;
 }
 launched = circuit_launch_by_extend_info(



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

[tor-commits] [community/master] Hiding Fedora updates page

2019-08-29 Thread emmapeel

commit cd56a88f1c9a122243888b53c15fcd8051fe27a7
Author: gus 
Date:   Thu Aug 29 07:32:30 2019 -0400

Hiding Fedora updates page
---
 .../relay-operations/technical-setup/guard/fedora/updates/contents.lr   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr 
b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr
index f8ee3f7..03ad164 100644
--- a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr
+++ b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr
@@ -30,4 +30,4 @@ _hidden: yes
 ---
 _slug: updates
 ---
-_discoverable: yes
+_discoverable: no



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

[tor-commits] [community/master] Add RPM based distros instructions to automatically update, link to post-install

2019-08-29 Thread emmapeel

commit aeb0731cc1b6d9e7c70724312c529646a020bc46
Author: gus 
Date:   Thu Aug 29 06:53:32 2019 -0400

Add RPM based distros instructions to automatically update, link to 
post-install
---
 .../technical-setup/guard/centosrhel/contents.lr   | 16 +++--
 .../guard/centosrhel/updates/contents.lr   | 68 ++
 2 files changed, 80 insertions(+), 4 deletions(-)

diff --git 
a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr 
b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr
index 27b6031..9ab6048 100644
--- a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr
+++ b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr
@@ -4,19 +4,23 @@ title: CentOS/RHEL
 ---
 body:
 
-# 1. Enable the EPEL repository
+# 1. Enable Automatic Software Updates
+
+One of the most imported things to keeps your relay secure is to install 
security updates timely and ideally automatically so you can not forget about 
it. Follow the instructions to enable [automatic software updates](updates) for 
your operating system.
+
+# 2. Enable the EPEL repository
 
 To install `tor` package on CentOS/RHEL, you need to install the 
[EPEL](https://fedoraproject.org/wiki/EPEL) repository first:
 
 `yum install epel-release`
 
-# 2. Install the tor package and verify the EPEL signing key
+# 3. Install the tor package and verify the EPEL signing key
 
 `yum install tor`
 
 When you install the first package from the EPEL repository you will be asked 
about verifying the EPEL GPG signing key. Please ensure the key matches with 
the one available on the [Fedora Project website](https://getfedora.org/keys/).
 
-# 3. Put the tor configuration file `/etc/tor/torrc` in place
+# 4. Put the tor configuration file `/etc/tor/torrc` in place
 
 ```
 #change the nickname "myNiceRelay" to a name that you like
@@ -28,7 +32,7 @@ ExitRelay 0
 ContactInfo tor-operator@your-emailaddress-domain
 ```
 
-# 4. Enable and start your Tor relay
+# 5. Enable and start your Tor relay
 
 CentOS 7 / RHEL 7:
 
@@ -44,6 +48,10 @@ service tor enable
 service tor start
 ```
 
+# 6. Final notes
+
+If you are having troubles setting up your relay, have a look at our [help 
section](FIXME). If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+
 ---
 html: two-columns-page.html
 ---
diff --git 
a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr 
b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr
new file mode 100644
index 000..c452749
--- /dev/null
+++ 
b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr
@@ -0,0 +1,68 @@
+_model: page
+---
+title: Automatic Updates on RPM Distributions
+---
+_hidden: yes
+---
+body:
+
+# CentOS and RHEL
+
+For CentOS and RHEL the yum-cron package is the preferred approach:
+
+```
+yum install yum-cron
+```
+
+In /etc/yum/yum-cron.conf set:
+
+```
+download_updates = yes
+apply_updates = yes
+```
+
+Enable and start automatic updates via:
+
+```
+systemctl start yum-cron.service
+```
+
+# openSUSE
+
+First, you need to install the automatic update package
+
+```
+zypper install  yast2-online-update-configuration
+```
+
+Then start the configuration tool (ncurses based) with:
+
+```
+yast2 online_update_configuration
+```
+
+Enable the following settings:
+
+```
+Automatic Online Update
+Interval: Daily
+Skip Interactive Patches
+Agree with Licenses
+Use delta rpms 
+```
+
+Confirm your configuration with OK.
+
+The official openSUSE documentation can be found 
[here](https://doc.opensuse.org/documentation/leap/startup/html/book.opensuse.startup/cha.onlineupdate.you.html#sec.onlineupdate.you.automatically).
+---
+html: two-columns-page.html
+---
+key: 1
+---
+section: Relay Operations
+---
+section_id: relay-operations
+---
+_slug: updates
+---
+_discoverable: yes



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

[tor-commits] [community/master] Replace node to relay so our documentation stay more consistent

2019-08-29 Thread emmapeel

commit 3b9712ce9bcedef350c4c51581b37c3012a0e2ae
Author: gus 
Date:   Thu Aug 29 07:16:41 2019 -0400

Replace node to relay so our documentation stay more consistent
---
 content/relay-operations/technical-setup/guard/centosrhel/contents.lr   | 2 +-
 content/relay-operations/technical-setup/guard/debianubuntu/contents.lr | 2 +-
 content/relay-operations/technical-setup/guard/fedora/contents.lr   | 2 +-
 content/relay-operations/technical-setup/guard/freebsd/contents.lr  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr 
b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr
index 9ab6048..47ee38c 100644
--- a/content/relay-operations/technical-setup/guard/centosrhel/contents.lr
+++ b/content/relay-operations/technical-setup/guard/centosrhel/contents.lr
@@ -61,4 +61,4 @@ section: relay operations
 ---
 section_id: relay-operations
 ---
-subtitle: How to deploy a middle/Guard node on CentOS/RHEL
+subtitle: How to deploy a middle/Guard relay on CentOS/RHEL
diff --git 
a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr 
b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr
index 2a8bedb..c3e1f15 100644
--- a/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr
+++ b/content/relay-operations/technical-setup/guard/debianubuntu/contents.lr
@@ -51,4 +51,4 @@ section: relay operations
 ---
 section_id: relay-operations
 ---
-subtitle: How to deploy a middle/Guard node on Debian/Ubuntu
+subtitle: How to deploy a middle/Guard relay on Debian/Ubuntu
diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr 
b/content/relay-operations/technical-setup/guard/fedora/contents.lr
index 5cfcf23..b89a8ce 100644
--- a/content/relay-operations/technical-setup/guard/fedora/contents.lr
+++ b/content/relay-operations/technical-setup/guard/fedora/contents.lr
@@ -42,4 +42,4 @@ section: relay operations
 ---
 section_id: relay-operations
 ---
-subtitle: How to deploy a middle/Guard node on Fedora
+subtitle: How to deploy a middle/Guard relay on Fedora
diff --git a/content/relay-operations/technical-setup/guard/freebsd/contents.lr 
b/content/relay-operations/technical-setup/guard/freebsd/contents.lr
index 01504ac..c86be07 100644
--- a/content/relay-operations/technical-setup/guard/freebsd/contents.lr
+++ b/content/relay-operations/technical-setup/guard/freebsd/contents.lr
@@ -77,4 +77,4 @@ section: relay operations
 ---
 section_id: relay-operations
 ---
-subtitle: How to deploy a middle/Guard node on FreeBSD
+subtitle: How to deploy a middle/Guard relay on FreeBSD



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

[tor-commits] [community/master] Create child page with BSD auto update instructions

2019-08-29 Thread emmapeel

commit 3fc8f0efe60b71920863fe9d6ced516c2940110b
Author: gus 
Date:   Thu Aug 29 07:12:44 2019 -0400

Create child page with BSD auto update instructions
---
 .../guard/freebsd/updates/contents.lr  | 45 ++
 1 file changed, 45 insertions(+)

diff --git 
a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr 
b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr
new file mode 100644
index 000..bc1dd05
--- /dev/null
+++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr
@@ -0,0 +1,45 @@
+_model: page
+---
+title: Automatic Updates on BSD*
+---
+_hidden: no
+---
+_slug: updates
+---
+body:
+
+# DragonFlyBSD / FreeBSD / HardenedBSD
+
+**NOTE:** _all steps documented on this page are considering that your 
machine/server/system only provides Tor relay services. please be aware that 
other services running might stop/restart during the upgrade._
+
+#1. Create the script to perform the updates. 
+
+Let's use `/root/pkg_upgrade.sh` 
+
+```
+#!/usr/bin/env sh
+PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+RAND=$(jot -r 1 300)
+sleep ${RAND}
+env AUTOCLEAN=YES ASSUME_ALWAYS_YES=YES HANDLE_RC_SCRIPTS=YES pkg upgrade
+```
+
+#2. Schedule the job to run. 
+
+```
+# echo "0 0 * * * root /bin/sh /root/pkg_upgrade.sh >/dev/null" >> /etc/crontab
+```
+
+#3. Restart cron's service. 
+
+```
+# service cron restart
+```
+---
+html: two-columns-page.html
+---
+section: relay operations
+---
+section_id: relay-operations
+---
+key: 1



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

[tor-commits] [community/master] Hiding BSD updates page

2019-08-29 Thread emmapeel

commit 7762dde9c04f55e9b9006ebeea74f549eaa01e23
Author: gus 
Date:   Thu Aug 29 07:33:28 2019 -0400

Hiding BSD updates page
will-fix: https://dip.torproject.org/web/community/issues/80
---
 .../relay-operations/technical-setup/guard/freebsd/updates/contents.lr  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr 
b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr
index bc1dd05..6746558 100644
--- a/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr
+++ b/content/relay-operations/technical-setup/guard/freebsd/updates/contents.lr
@@ -2,7 +2,7 @@ _model: page
 ---
 title: Automatic Updates on BSD*
 ---
-_hidden: no
+_hidden: yes
 ---
 _slug: updates
 ---

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

[tor-commits] [community/master] Include BSD auto update instructions, link to post-install

2019-08-29 Thread emmapeel

commit f5d506dcbb4451110225b8926255b3644cce4556
Author: gus 
Date:   Thu Aug 29 07:05:06 2019 -0400

Include BSD auto update instructions, link to post-install
---
 .../technical-setup/guard/freebsd/contents.lr | 15 +++
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/content/relay-operations/technical-setup/guard/freebsd/contents.lr 
b/content/relay-operations/technical-setup/guard/freebsd/contents.lr
index a47dfc8..01504ac 100644
--- a/content/relay-operations/technical-setup/guard/freebsd/contents.lr
+++ b/content/relay-operations/technical-setup/guard/freebsd/contents.lr
@@ -4,7 +4,11 @@ title: FreeBSD
 ---
 body:
 
-## 1. Install the tor package
+# 1. Enable Automatic Software Updates
+
+One of the most imported things to keeps your relay secure is to install 
security updates timely and ideally automatically so you can not forget about 
it. Follow the instructions to enable [automatic software updates](updates) for 
your operating system.
+
+# 2. Install the tor package
 
 `pkg install tor ca_root_nss`
 
@@ -12,7 +16,7 @@ or for alpha releases:
 
 `pkg install tor-devel ca_root_nss`
 
-## 2. Put the configuration file `/usr/local/etc/tor/torrc` in place
+# 3. Put the configuration file `/usr/local/etc/tor/torrc` in place
 
 ```
 #change the nickname "myNiceRelay" to a name that you like
@@ -25,14 +29,14 @@ ContactInfo tor-operator@your-emailaddress-domain
 Log notice syslog
 ```
 
-## 3. Ensure that the `random_id` sysctl setting is enabled:
+# 4. Ensure that the `random_id` sysctl setting is enabled:
 
 ```
 echo "net.inet.ip.random_id=1" >> /etc/sysctl.conf
 sysctl net.inet.ip.random_id=1
 ```
 
-## 4. Start the tor daemon and make sure it starts at boot:
+# 5. Start the tor daemon and make sure it starts at boot:
 
 ```
 sysrc tor_enable=YES
@@ -61,6 +65,9 @@ FreeBSDlatest: {
 }
 ```
 
+# 6. Final notes
+
+If you are having troubles setting up your relay, have a look at our [help 
section](FIXME). If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
 ---
 html: two-columns-page.html
 ---



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

[tor-commits] [community/master] Hiding Debian updates page

2019-08-29 Thread emmapeel

commit c9e99c114feceefe29a15567a9f5397aa2cb8858
Author: gus 
Date:   Thu Aug 29 07:32:00 2019 -0400

Hiding Debian updates page
---
 .../technical-setup/guard/debianubuntu/updates/contents.lr  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr
 
b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr
index 39c6547..7d9645f 100644
--- 
a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr
+++ 
b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr
@@ -2,7 +2,7 @@ _model: page
 ---
 title: Automatic updates on Debian and Ubuntu
 ---
-_discoverable: yes
+_discoverable: no
 ---
 _hidden: yes
 ---



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

[tor-commits] [community/master] Changed the page title to be consistent

2019-08-29 Thread emmapeel

commit 56f0ae2f1c3a8fd6db1320f8fb0341db01b2c41a
Author: gus 
Date:   Thu Aug 29 06:28:38 2019 -0400

Changed the page title to be consistent
---
 .../technical-setup/guard/debianubuntu/updates/contents.lr  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr
 
b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr
index 05da34b..39c6547 100644
--- 
a/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr
+++ 
b/content/relay-operations/technical-setup/guard/debianubuntu/updates/contents.lr
@@ -1,6 +1,6 @@
 _model: page
 ---
-title: Debian Ubuntu Updates
+title: Automatic updates on Debian and Ubuntu
 ---
 _discoverable: yes
 ---



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

[tor-commits] [community/master] Hiding updates page

2019-08-29 Thread emmapeel

commit 944ce86f1b4b5f2ec42cdc10021fa7314f04ba27
Author: gus 
Date:   Thu Aug 29 07:31:24 2019 -0400

Hiding updates page
---
 .../technical-setup/guard/centosrhel/updates/contents.lr| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr 
b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr
index c452749..fb1db91 100644
--- 
a/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr
+++ 
b/content/relay-operations/technical-setup/guard/centosrhel/updates/contents.lr
@@ -65,4 +65,4 @@ section_id: relay-operations
 ---
 _slug: updates
 ---
-_discoverable: yes
+_discoverable: no



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

[tor-commits] [community/master] Make the updates page discoverable

2019-08-29 Thread emmapeel

commit e81de09e3e590cb0f35a7ae99fa586a9bbf11823
Author: gus 
Date:   Thu Aug 29 06:59:29 2019 -0400

Make the updates page discoverable
---
 .../relay-operations/technical-setup/guard/fedora/updates/contents.lr   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr 
b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr
index 03ad164..f8ee3f7 100644
--- a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr
+++ b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr
@@ -30,4 +30,4 @@ _hidden: yes
 ---
 _slug: updates
 ---
-_discoverable: no
+_discoverable: yes



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

[tor-commits] [community/master] Add Fedora instructions to automatically update relay, link to post-install instructions

2019-08-29 Thread emmapeel

commit cb3d88120d5c520a07fb9d41ca94f4488fcd2fe8
Author: gus 
Date:   Thu Aug 29 06:27:44 2019 -0400

Add Fedora instructions to automatically update relay, link to post-install 
instructions
---
 .../technical-setup/guard/fedora/contents.lr   | 14 +++--
 .../guard/fedora/updates/contents.lr   | 33 ++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/content/relay-operations/technical-setup/guard/fedora/contents.lr 
b/content/relay-operations/technical-setup/guard/fedora/contents.lr
index cc984cc..5cfcf23 100644
--- a/content/relay-operations/technical-setup/guard/fedora/contents.lr
+++ b/content/relay-operations/technical-setup/guard/fedora/contents.lr
@@ -4,11 +4,15 @@ title: Fedora
 ---
 body:
 
-# 1.  Install the tor package:
+# 1. Enable Automatic Software Updates
+
+One of the most imported things to keeps your relay secure is to install 
security updates timely and ideally automatically so you can not forget about 
it. Follow the instructions to enable [automatic software updates](updates) for 
your operating system.
+
+# 2.  Install the tor package
 
 `dnf install tor`
 
-# 2. Put the tor configuration file `/etc/tor/torrc` in place:
+# 3. Put the tor configuration file `/etc/tor/torrc` in place
 
 ```
 #change the nickname "myNiceRelay" to a name that you like
@@ -19,12 +23,16 @@ ExitRelay 0
 ContactInfo tor-operator@your-emailaddress-domain
 ```
 
-# 3. Start the tor daemon and make sure it starts at boot:
+# 4. Start the tor daemon and make sure it starts at boot
 
 ```
 systemctl enable tor
 systemctl start tor
 ```
+
+# 5. Final notes
+
+If you are having troubles setting up your relay, have a look at our [help 
section](FIXME). If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git 
a/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr 
b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr
new file mode 100644
index 000..03ad164
--- /dev/null
+++ b/content/relay-operations/technical-setup/guard/fedora/updates/contents.lr
@@ -0,0 +1,33 @@
+_model: page
+---
+title: Automatic Updates on Fedora
+---
+body:
+
+On Fedora you enable automatic updates via:
+
+```
+dnf install dnf-automatic
+```
+
+Now enable and start automatic updates via:
+
+```
+systemctl enable --now dnf-automatic-install.timer
+```
+---
+html: two-columns-page.html
+---
+key: 1
+---
+section: Relay operations
+---
+section_id: relay-operations
+---
+subtitle: 
+---
+_hidden: yes
+---
+_slug: updates
+---
+_discoverable: no



___
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-68.1.0esr-9.0-1] Bug 1561322 - Allow spoofing strings in HTML forms r=baku, Pike

2019-08-29 Thread gk

commit 1ad6ff94d72b99a72ac66459230755502acccd8d
Author: Alex Catarineu 
Date:   Wed Jul 24 13:22:22 2019 +

Bug 1561322 - Allow spoofing strings in HTML forms r=baku,Pike

When privacy.spoof_english = 2, we should hide the user's
locale in content. So we use en-US default strings for HTML
form elements, such as a Submit button.

We also force GetLocalizedEllipsis() to always return the
ellipsis used by en-US.

Differential Revision: https://phabricator.services.mozilla.com/D35815

--HG--
extra : moz-landing-system : lando
---
 browser/installer/package-manifest.in|  1 +
 dom/base/nsContentUtils.cpp  | 35 --
 dom/base/nsContentUtils.h|  2 ++
 dom/html/HTMLInputElement.cpp| 37 +++-
 dom/locales/moz.build|  4 +++
 layout/base/nsCSSFrameConstructor.cpp|  8 +++---
 layout/forms/nsFileControlFrame.cpp  |  4 +--
 layout/forms/nsGfxButtonControlFrame.cpp |  4 +--
 layout/generic/DetailsFrame.cpp  |  5 ++--
 mobile/android/installer/package-manifest.in |  1 +
 10 files changed, 67 insertions(+), 34 deletions(-)

diff --git a/browser/installer/package-manifest.in 
b/browser/installer/package-manifest.in
index a160f316a56d..1a2a24f9b5b9 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -344,6 +344,7 @@
 @RESPATH@/res/fonts/*
 @RESPATH@/res/dtd/*
 @RESPATH@/res/language.properties
+@RESPATH@/res/locale/layout/HtmlForm.properties
 #ifdef XP_MACOSX
 @RESPATH@/res/MainMenu.nib/
 #endif
diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index ca8ad1d26b26..d7ab544f7274 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -3507,7 +3507,7 @@ void nsContentUtils::GetEventArgNames(int32_t 
aNameSpaceID, nsAtom* aEventName,
 
 // Note: The list of content bundles in nsStringBundle.cpp should be updated
 // whenever entries are added or removed from this list.
-static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = 
{
+static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = {
 // Must line up with the enum values in |PropertiesFile| enum.
 "chrome://global/locale/css.properties",
 "chrome://global/locale/xbl.properties",
@@ -3522,7 +3522,9 @@ static const char 
gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = {
 "chrome://global/locale/commonDialogs.properties",
 "chrome://global/locale/mathml/mathml.properties",
 "chrome://global/locale/security/security.properties",
-"chrome://necko/locale/necko.properties"};
+"chrome://necko/locale/necko.properties",
+"chrome://global/locale/layout/HtmlForm.properties",
+"resource://gre/res/locale/layout/HtmlForm.properties"};
 
 /* static */
 nsresult nsContentUtils::EnsureStringBundle(PropertiesFile aFile) {
@@ -3571,10 +3573,22 @@ void nsContentUtils::AsyncPrecreateStringBundles() {
   }
 }
 
+static bool SpoofLocaleEnglish() {
+  // 0 - will prompt
+  // 1 - don't spoof
+  // 2 - spoof
+  return StaticPrefs::privacy_spoof_english() == 2;
+}
+
 /* static */
 nsresult nsContentUtils::GetLocalizedString(PropertiesFile aFile,
 const char* aKey,
 nsAString& aResult) {
+  // When we spoof English, use en-US default strings in HTML forms.
+  if (aFile == eFORMS_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) {
+aFile = eFORMS_PROPERTIES_en_US;
+  }
+
   nsresult rv = EnsureStringBundle(aFile);
   NS_ENSURE_SUCCESS(rv, rv);
   nsIStringBundle* bundle = sStringBundles[aFile];
@@ -3587,6 +3601,11 @@ nsresult 
nsContentUtils::FormatLocalizedString(PropertiesFile aFile,
const char16_t** aParams,
uint32_t aParamsLength,
nsAString& aResult) {
+  // When we spoof English, use en-US default strings in HTML forms.
+  if (aFile == eFORMS_PROPERTIES_MAYBESPOOF && SpoofLocaleEnglish()) {
+aFile = eFORMS_PROPERTIES_en_US;
+  }
+
   nsresult rv = EnsureStringBundle(aFile);
   NS_ENSURE_SUCCESS(rv, rv);
   nsIStringBundle* bundle = sStringBundles[aFile];
@@ -5120,11 +5139,13 @@ nsIWidget* nsContentUtils::GetTopLevelWidget(nsIWidget* 
aWidget) {
 const nsDependentString nsContentUtils::GetLocalizedEllipsis() {
   static char16_t sBuf[4] = {0, 0, 0, 0};
   if (!sBuf[0]) {
-nsAutoString tmp;
-Preferences::GetLocalizedString("intl.ellipsis", tmp);
-uint32_t len =
-std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1));
-CopyUnicodeTo(tmp, 0, sBuf, len);
+if (!SpoofLocaleEnglish()) {
+  nsAutoString tmp;
+  Preferences::GetLocalizedString("intl.ellipsis", tmp);
+  uint32_t len =
+  std::min(uint32_t(tmp.Length()),

[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-1] Revert "Bug 24056: Use en-US strings in HTML forms"

2019-08-29 Thread gk

commit 69bf59ac52f26317e93e2325a8e8c1d797f56c0c
Author: Alex Catarineu 
Date:   Mon Aug 19 13:13:36 2019 +0200

Revert "Bug 24056: Use en-US strings in HTML forms"

This reverts commit 243a68926e148a2590707ee9b3cb2364e2f42083.
---
 dom/base/nsContentUtils.cpp | 32 +++-
 dom/base/nsContentUtils.h   |  3 ---
 2 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp
index a7ff89977a95..ca8ad1d26b26 100644
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -317,8 +317,6 @@ bool nsContentUtils::sBypassCSSOMOriginCheck = false;
 
 nsCString* nsContentUtils::sJSBytecodeMimeType = nullptr;
 
-int32_t nsContentUtils::sSpoofEnglish = 0;
-
 nsContentUtils::UserInteractionObserver*
 nsContentUtils::sUserInteractionObserver = nullptr;
 
@@ -607,8 +605,6 @@ nsresult nsContentUtils::Init() {
   Preferences::AddBoolVarCache(_for_file,
"dom.allow_XUL_XBL_for_file");
 
-  Preferences::AddIntVarCache(, "privacy.spoof_english", 0);
-
 #ifndef RELEASE_OR_BETA
   sBypassCSSOMOriginCheck = getenv("MOZ_BYPASS_CSSOM_ORIGIN_CHECK");
 #endif
@@ -3511,7 +3507,7 @@ void nsContentUtils::GetEventArgNames(int32_t 
aNameSpaceID, nsAtom* aEventName,
 
 // Note: The list of content bundles in nsStringBundle.cpp should be updated
 // whenever entries are added or removed from this list.
-static const char* gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = {
+static const char gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT][56] = 
{
 // Must line up with the enum values in |PropertiesFile| enum.
 "chrome://global/locale/css.properties",
 "chrome://global/locale/xbl.properties",
@@ -3526,9 +3522,7 @@ static const char* 
gPropertiesFiles[nsContentUtils::PropertiesFile_COUNT] = {
 "chrome://global/locale/commonDialogs.properties",
 "chrome://global/locale/mathml/mathml.properties",
 "chrome://global/locale/security/security.properties",
-"chrome://necko/locale/necko.properties",
-"resource://gre/chrome/en-US/locale/en-US/global/layout/"
-"HtmlForm.properties"};
+"chrome://necko/locale/necko.properties"};
 
 /* static */
 nsresult nsContentUtils::EnsureStringBundle(PropertiesFile aFile) {
@@ -3581,11 +3575,6 @@ void nsContentUtils::AsyncPrecreateStringBundles() {
 nsresult nsContentUtils::GetLocalizedString(PropertiesFile aFile,
 const char* aKey,
 nsAString& aResult) {
-  // When we spoof English, use en-US default strings in HTML forms.
-  if (aFile == eFORMS_PROPERTIES && sSpoofEnglish == 2) {
-aFile = eFORMS_PROPERTIES_en_US;
-  }
-
   nsresult rv = EnsureStringBundle(aFile);
   NS_ENSURE_SUCCESS(rv, rv);
   nsIStringBundle* bundle = sStringBundles[aFile];
@@ -3598,11 +3587,6 @@ nsresult 
nsContentUtils::FormatLocalizedString(PropertiesFile aFile,
const char16_t** aParams,
uint32_t aParamsLength,
nsAString& aResult) {
-  // When we spoof English, use en-US default strings in HTML forms.
-  if (aFile == eFORMS_PROPERTIES && sSpoofEnglish == 2) {
-aFile = eFORMS_PROPERTIES_en_US;
-  }
-
   nsresult rv = EnsureStringBundle(aFile);
   NS_ENSURE_SUCCESS(rv, rv);
   nsIStringBundle* bundle = sStringBundles[aFile];
@@ -5136,13 +5120,11 @@ nsIWidget* nsContentUtils::GetTopLevelWidget(nsIWidget* 
aWidget) {
 const nsDependentString nsContentUtils::GetLocalizedEllipsis() {
   static char16_t sBuf[4] = {0, 0, 0, 0};
   if (!sBuf[0]) {
-if (sSpoofEnglish != 2) {
-  nsAutoString tmp;
-  Preferences::GetLocalizedString("intl.ellipsis", tmp);
-  uint32_t len =
-  std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1));
-  CopyUnicodeTo(tmp, 0, sBuf, len);
-}
+nsAutoString tmp;
+Preferences::GetLocalizedString("intl.ellipsis", tmp);
+uint32_t len =
+std::min(uint32_t(tmp.Length()), uint32_t(ArrayLength(sBuf) - 1));
+CopyUnicodeTo(tmp, 0, sBuf, len);
 if (!sBuf[0]) sBuf[0] = char16_t(0x2026);
   }
   return nsDependentString(sBuf);
diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h
index 4ea35a42f029..de450090e9db 100644
--- a/dom/base/nsContentUtils.h
+++ b/dom/base/nsContentUtils.h
@@ -1117,7 +1117,6 @@ class nsContentUtils {
 eMATHML_PROPERTIES,
 eSECURITY_PROPERTIES,
 eNECKO_PROPERTIES,
-eFORMS_PROPERTIES_en_US,
 PropertiesFile_COUNT
   };
   static nsresult ReportToConsole(
@@ -3421,8 +3420,6 @@ class nsContentUtils {
 
   static int32_t sInnerOrOuterWindowCount;
   static uint32_t sInnerOrOuterWindowSerialCounter;
-
-  static int32_t sSpoofEnglish;
 };
 
 /* static */ inline nsContentPolicyType



___
tor-commits mailing list
tor-commits@lists.torproject.org

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2019-08-29 Thread translation

commit f50afc2f723aa87b1f11fbcc156266021b797a99
Author: Translation commit bot 
Date:   Thu Aug 29 10:53:30 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+mk.po | 48 +++-
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/contents+mk.po b/contents+mk.po
index bdb6af5ac..e007bf1dd 100644
--- a/contents+mk.po
+++ b/contents+mk.po
@@ -21,11 +21,11 @@ msgstr ""
 
 #: https//support.torproject.org/ (content/contents+en.lrshowcase.title)
 msgid "How can we help?"
-msgstr ""
+msgstr "ÐÐ°ÐºÐ¾ Ð¼Ð¾Ð¶ÐµÐ¼Ðµ Ð´Ð° Ð¿Ð¾Ð¼Ð¾Ð³Ð½ÐµÐ¼Ðµ?"
 
 #: https//support.torproject.org/faq/ (content/faq/contents+en.lrtopic.title)
 msgid "Most Frequently Asked Questions"
-msgstr ""
+msgstr "Ð§ÐµÑÑÐ¾ Ð¿Ð¾ÑÑÐ°Ð²ÑÐ²Ð°Ð½Ð¸ Ð¿ÑÐ°ÑÐ°ÑÐ°"
 
 #: https//support.torproject.org/tbb/ (content/tbb/contents+en.lrtopic.title)
 msgid "Tor Browser"
@@ -49,22 +49,22 @@ msgstr "GetTor"
 #: https//support.torproject.org/connecting/
 #: (content/connecting/contents+en.lrtopic.title)
 msgid "Connecting To Tor"
-msgstr ""
+msgstr "ÐÐ¾Ð²ÑÐ·ÑÐ²Ð°ÑÐµ Ð½Ð° Tor"
 
 #: https//support.torproject.org/censorship/
 #: (content/censorship/contents+en.lrtopic.title)
 msgid "Censorship"
-msgstr ""
+msgstr "Ð¦ÐµÐ½Ð·ÑÑÐ°"
 
 #: https//support.torproject.org/https/
 #: (content/https/contents+en.lrtopic.title)
 msgid "HTTPS"
-msgstr ""
+msgstr "HTTPS"
 
 #: https//support.torproject.org/operators/
 #: (content/operators/contents+en.lrtopic.title)
 msgid "Operators"
-msgstr ""
+msgstr "ÐÐ¿ÐµÑÐ°ÑÐ¾ÑÐ¸"
 
 #: https//support.torproject.org/onionservices/
 #: (content/onionservices/contents+en.lrtopic.title)
@@ -83,6 +83,8 @@ msgstr ""
 msgid ""
 "When I use Tor Browser, will anyone be able to tell which websites I visit?"
 msgstr ""
+"ÐÐ¾Ð³Ð° Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÐ°Ð¼ Tor Ð¿ÑÐµÐ»Ð¸ÑÑÑÐ²Ð°ÑÐ¾Ñ, ÑÐµ Ð¼Ð¾Ð¶Ðµ 
Ð»Ð¸ ÑÐµÐºÐ¾Ñ Ð´Ð° Ð²Ð¸Ð´Ð¸ ÐºÐ¾Ñ Ð²ÐµÐ±âÑÐ°ÑÑÐ¾Ð²Ð¸"
+" Ð³Ð¸ Ð¿Ð¾ÑÐµÑÑÐ²Ð°Ð¼?"
 
 #: https//support.torproject.org/faq/faq-1/
 #: (content/faq/faq-1/contents+en.lrquestion.description)
@@ -337,7 +339,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid " For Windows users:"
-msgstr ""
+msgstr " ÐÐ° Windows ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸:"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -356,7 +358,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid " For macOS users:"
-msgstr ""
+msgstr " ÐÐ° macOS ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸:"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -375,7 +377,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
 msgid " For GNU/Linux users:"
-msgstr ""
+msgstr " ÐÐ° GNU/Linux ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸:"
 
 #: https//support.torproject.org/tbb/how-to-verify-signature/
 #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)
@@ -1120,6 +1122,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//support.torproject.org/tbb/tbb-27/
 #: (content/tbb/tbb-27/contents+en.lrquestion.description)
@@ -1131,7 +1135,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-27/
 #: (content/tbb/tbb-27/contents+en.lrquestion.description)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-27/
 #: (content/tbb/tbb-27/contents+en.lrquestion.description)
@@ -1141,7 +1145,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-27/
 #: (content/tbb/tbb-27/contents+en.lrquestion.description)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//support.torproject.org/tbb/tbb-28/
 #: (content/tbb/tbb-28/contents+en.lrquestion.title)
@@ -1284,6 +1288,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//support.torproject.org/tbb/tbb-30/
 #: (content/tbb/tbb-30/contents+en.lrquestion.title)
@@ -1983,21 +1989,21 @@ msgstr ""
 #: https//support.torproject.org/gettor/gettor-4/
 #: (content/gettor/gettor-4/contents+en.lrquestion.description)
 msgid "* Linux"
-msgstr ""
+msgstr "* Linux"
 
 #: https//support.torproject.org/gettor/gettor-3/
 #: (content/gettor/gettor-3/contents+en.lrquestion.description)
 #: https//support.torproject.org/gettor/gettor-4/
 #: (content/gettor/gettor-4/contents+en.lrquestion.description)
 msgid "* macOS (OS X)"
-msgstr ""
+msgstr "* macOS (OS X)"
 
 #: https//support.torproject.org/gettor/gettor-3/
 #: (content/gettor/gettor-3/contents+en.lrquestion.description)
 #: https//support.torproject.org/gettor/gettor-4/
 #: (content/gettor/gettor-4/contents+en.lrquestion.description)
 msgid "* Windows"
-msgstr ""
+msgstr "* Windows"
 
 #: https//support.torproject.org/gettor/gettor-4/

[tor-commits] [translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md

2019-08-29 Thread translation

commit 72901312d5bcc6f139f038b99b58f41541911fe4
Author: Translation commit bot 
Date:   Thu Aug 29 10:52:53 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
---
 tor-outreach2019-2020-mk.md | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tor-outreach2019-2020-mk.md b/tor-outreach2019-2020-mk.md
index 828962bc9..63e6366fe 100644
--- a/tor-outreach2019-2020-mk.md
+++ b/tor-outreach2019-2020-mk.md
@@ -38,7 +38,7 @@ She also uses a Tor-powered app called **OnionShare** to send 
files to other act
 
 # 3. TOR ÐÐ Ð§ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ
 
-### Water is life 
+### ÐÐ¾Ð´Ð°ÑÐ° Ðµ Ð¶Ð¸Ð²Ð¾Ñ
 
 Jelani lives in a small village  which a wide river runs through.
 
@@ -58,9 +58,9 @@ All of this software uses Tor to help protect Jelaniâs 
privacy.
 
 ---
 
-# 4. TOR FOR ANTI-CENSORSHIP
+# 4. TOR ÐÐ ÐÐ ÐÐ¢ÐÐ Ð¦ÐÐÐÐ£Ð ÐÐ¢Ð
 
-### Build bridges not walls
+### ÐÑÐ°Ð´ÐµÑÐµ Ð¼Ð¾ÑÑÐ¾Ð²Ð¸ Ð½Ðµ ÑÐ¸Ð´Ð¾Ð²Ð¸
 
 Jean was traveling for the first time to a country far from his family.
 
@@ -92,7 +92,7 @@ With Tor Browser, Jean can browse freely and privately and 
contact his family.
 
 # 5. Shared Sections
 
-## What is Tor?
+## Ð¨ÑÐ¾ Ðµ Tor?
 
 Tor is free software and an open network that helps protect you from tracking, 
surveillance, and censorship online.
 Tor is created for free by a 501(c)3 U.S.-based nonprofit called the Tor 
Project. 
@@ -103,7 +103,7 @@ When you use Tor Browser, no one can see what websites you 
visit or where in the
 Other applications, like SecureDrop and OnionShare, use Tor to protect their 
users against surveillance and censorship.
 
 
-## 6. How does Tor work?
+## 6. ÐÐ°ÐºÐ¾ Tor ÑÐ°Ð±Ð¾ÑÐ¸?
 
 Amal wants to visit Bekeleâs website privately, so she opens Tor Browser.
 
@@ -121,13 +121,13 @@ The third relay removes the last encryption layer and 
forwards the web page requ
 
 Bekele doesn't know that the website request came from Amal unless she tells 
him so.
 
-## 7. Who uses Tor? 
+## 7. ÐÐ¾Ñ ÐºÐ¾ÑÐ¸ÑÑÐ¸ Tor? 
 
-People all over the world use Tor to protect their privacy and access the web 
freely.
+ÐÑÑÐµ Ð½Ð¸Ð· ÑÐµÐ»Ð¸Ð¾Ñ ÑÐ²ÐµÑ Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÐ°Ñ Tor Ð·Ð° Ð´Ð° ÑÐ° 
Ð·Ð°ÑÑÐ¸ÑÐ°Ñ Ð½Ð¸Ð²Ð½Ð°ÑÐ° Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð¾ÑÑ Ð¸ Ð´Ð° Ð¿ÑÐ¸ÑÑÐ°Ð¿Ð°Ñ 
ÐºÐ¾Ð½ Ð²ÐµÐ±Ð¾Ñ ÑÐ»Ð¾Ð±Ð¾Ð´Ð½Ð¾
 
 Tor helps protect journalists, human rights defenders, domestic violence 
victims, academic researchers, and anyone experiencing tracking, censorship, or 
surveillance. 
 
-## 6. Why trust Tor?
+## 6. ÐÐ¾ÑÑÐ¾ Ð´Ð° Ð¼Ñ Ð²ÐµÑÑÐ²Ð°Ñ Ð½Ð° Tor?
 
 Tor is designed for privacy. We donât know who our users are, and we don't 
keep logs of user activity.
 
@@ -135,7 +135,7 @@ Tor relay operators cannot reveal the true identity of Tor 
users.
 
 Continual peer review of Tor's source code by academic and open source 
communities ensures that there are no backdoors in Tor, and our social contract 
promises that we will never backdoor Tor. 
 
-## 7. Join the Tor community
+## 7. ÐÑÐ¸ÐºÐ»ÑÑÐ¸ ÑÐµ Ð½Ð° Tor Ð·Ð°ÐµÐ´Ð½Ð¸ÑÐ°ÑÐ°
 
 Tor is made possible by a diverse set of users, developers, relay operators, 
and advocates from around the world.
 
@@ -148,9 +148,9 @@ The Tor community is governed by a code of conduct, and we 
outline our set of pr
 Learn more about Tor by visiting our website, our wiki, finding us on IRC, 
joining one of our mailing lists, or signing up for Tor News at 
newsletter.torproject.org.
 
 
-## 8. Download Tor
+## 8. ÐÑÐµÐ·ÐµÐ¼Ð¸ Tor
 
-Tor for Desktop
+Tor Ð·Ð° ÐÐµÑÐºÑÐ¾Ð¿
 torproject.org/download
 
 TOR ON MOBILE

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

[tor-commits] [translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md

2019-08-29 Thread translation

commit 9aeb94034737c88533fe852354d147826c1cb74e
Author: Translation commit bot 
Date:   Thu Aug 29 10:23:14 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
---
 tor-outreach2019-2020-mk.md | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tor-outreach2019-2020-mk.md b/tor-outreach2019-2020-mk.md
index 6c8fce0dc..828962bc9 100644
--- a/tor-outreach2019-2020-mk.md
+++ b/tor-outreach2019-2020-mk.md
@@ -1,8 +1,8 @@
 # Tor Outreach Material 2019-2020
 
-# 1. TOR FOR PRIVACY 
+# 1. TOR ÐÐ ÐÐ ÐÐÐÐ¢ÐÐÐ¡Ð¢
 
-### Privacy is a human right
+### ÐÑÐ¸Ð²Ð°ÑÐ½Ð¾ÑÑÐ° Ðµ ÑÐ¾Ð²ÐµÐºÐ¾Ð²Ð¾ Ð¿ÑÐ°Ð²Ð¾
 
 Like many of us, Aleisha spends most of her time online--connecting with 
friends, posting on social media, and browsing the web.
 
@@ -16,7 +16,7 @@ She goes to a privacy training at a local hackerspace and 
learns about **Tor Bro
 
 ---
 
-# 2.TOR FOR FEMINISTS 
+# 2.TOR ÐÐ Ð¤ÐÐÐÐÐÐ¡Ð¢Ð
 
 ### The future is cyberfeminist
 
@@ -36,7 +36,7 @@ She also uses a Tor-powered app called **OnionShare** to send 
files to other act
 
 ---
 
-# 3. TOR FOR HUMAN RIGHTS
+# 3. TOR ÐÐ Ð§ÐÐÐÐÐÐÐ ÐÐ ÐÐÐ
 
 ### Water is life 
 

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

[tor-commits] [translation/snowflakeaddon-messages.json_completed] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed

2019-08-29 Thread translation

commit ccfae931a157a3d0a063e48bf7733900bde70ccf
Author: Translation commit bot 
Date:   Thu Aug 29 09:17:20 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json_completed
---
 da/messages.json | 22 ++
 fr/messages.json |  2 +-
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/da/messages.json b/da/messages.json
index b9b47426f..f6ed740cf 100644
--- a/da/messages.json
+++ b/da/messages.json
@@ -1,26 +1,32 @@
 {
   "appDesc": {
-"message": "Snowflake er en WebRTC-udskiftelig transport til Tor."
+"message": "Snowflake is a WebRTC pluggable transport for Tor."
   },
   "popupTurnOn": {
-"message": "TÃ¦nd"
+"message": "Turn On"
   },
   "popupTurnOff": {
-"message": "Sluk"
+"message": "Turn Off"
   },
   "popupLearnMore": {
-"message": "LÃ¦r mere"
+"message": "Learn more"
   },
   "popupStatusOff": {
-"message": "Snowflake er slukket"
+"message": "Snowflake is off"
   },
   "popupStatusOn": {
-"message": "$1 klienter tilsluttet."
+"message": "Number of users currently connected: $1"
+  },
+  "popupStatusReady": {
+"message": "Your Snowflake is ready to help users circumvent censorship"
   },
   "popupWebRTCOff": {
-"message": "WebRTC-funktionalitet ikke registreret."
+"message": "WebRTC feature is not detected."
   },
   "popupDescOn": {
-"message": "Din snowflake har hjulpet $1 brugere med at omgÃ¥ censur 
indenfor de sidste 24 timer."
+"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+  },
+  "badgeCookiesOff": {
+"message": "Cookies are not enabled."
   }
 }
diff --git a/fr/messages.json b/fr/messages.json
index 9cd88b15e..529295894 100644
--- a/fr/messages.json
+++ b/fr/messages.json
@@ -18,7 +18,7 @@
 "message": "Nombre dâutilisateurs connectÃ©s actuellementÂ : $1"
   },
   "popupStatusReady": {
-"message": "Votre Snowflake est prÃªt Ã  aider des utilisateurs Ã  
contourner la censure."
+"message": "Your Snowflake is ready to help users circumvent censorship"
   },
   "popupWebRTCOff": {
 "message": "La fonction WebRTC nâest pas dÃ©tectÃ©e."

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

[tor-commits] [translation/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-08-29 Thread translation

commit a83587b550d645a9db50d709f5d60666c0ec47c0
Author: Translation commit bot 
Date:   Thu Aug 29 09:17:14 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 da/messages.json | 8 
 fr/messages.json | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/da/messages.json b/da/messages.json
index f66771986..22d8607c2 100644
--- a/da/messages.json
+++ b/da/messages.json
@@ -15,18 +15,18 @@
 "message": "Snowflake er slukket"
   },
   "popupStatusOn": {
-"message": "Number of users currently connected: $1"
+"message": "Antal tilsluttede brugere i Ã¸jeblikket: $1"
   },
   "popupStatusReady": {
-"message": "Your Snowflake is ready to help users circumvent censorship"
+"message": "Din Snowflake er klar til at hjÃ¦lpe brugere med at omgÃ¥ 
censur"
   },
   "popupWebRTCOff": {
 "message": "WebRTC-funktionalitet ikke registreret."
   },
   "popupDescOn": {
-"message": "Number of users your Snowflake has helped circumvent 
censorship in the last 24 hours: $1"
+"message": "Antal brugere som din Snowflake har hjulpet med at omgÃ¥ 
censur indenfor de sidste 24 timer: $1"
   },
   "badgeCookiesOff": {
-"message": "Cookies are not enabled."
+"message": "Cookies er ikke aktiveret."
   }
 }
diff --git a/fr/messages.json b/fr/messages.json
index 529295894..9cd88b15e 100644
--- a/fr/messages.json
+++ b/fr/messages.json
@@ -18,7 +18,7 @@
 "message": "Nombre dâutilisateurs connectÃ©s actuellementÂ : $1"
   },
   "popupStatusReady": {
-"message": "Your Snowflake is ready to help users circumvent censorship"
+"message": "Votre Snowflake est prÃªt Ã  aider des utilisateurs Ã  
contourner la censure."
   },
   "popupWebRTCOff": {
 "message": "La fonction WebRTC nâest pas dÃ©tectÃ©e."

___
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 31173: Update android-toolchain project to match firefox

2019-08-29 Thread gk

commit 576c12b5e461df957731a7d4583d84a8e716ddaf
Author: sisbell 
Date:   Wed Jul 17 01:48:43 2019 -0700

Bug 31173: Update android-toolchain project to match firefox
---
 projects/android-toolchain/build  | 21 +++--
 projects/android-toolchain/config | 28 ++--
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/projects/android-toolchain/build b/projects/android-toolchain/build
index e0f59a9..42e961c 100644
--- a/projects/android-toolchain/build
+++ b/projects/android-toolchain/build
@@ -15,28 +15,29 @@ unzip -qq [% c("input_files_by_name/gradle_bin") %] -d 
$GRADLE_HOME
 
 # NDK Archive
 cd $NDK_HOME
-mv android-ndk-r15c/* .
-rm -fR android-ndk-r15c
+mv android-ndk-r17b/* .
+rm -fR android-ndk-r17b
 
+# The architectures we support
 ./build/tools/make_standalone_toolchain.py --api [% 
c("var/android_min_api_armv7") %] --arch arm --install-dir=./arm
 ./build/tools/make_standalone_toolchain.py --api [% 
c("var/android_min_api_x86") %] --arch x86 --install-dir=./x86
 ./build/tools/make_standalone_toolchain.py --api [% 
c("var/android_min_api_aarch64") %] --arch arm64 --install-dir=./arm64
 
 # Tool Archives
 cd $SDK_HOME
-unzip -qq $HOME/[% c("input_files_by_name/build_tools_26") %] -d $SDK_HOME
-mkdir -p build-tools/26.0.2
-mv android-8.1.0/* build-tools/26.0.2
+unzip -qq $HOME/[% c("input_files_by_name/build_tools") %] -d $SDK_HOME
+mkdir -p build-tools/27.0.3
+mv android-8.1.0/* build-tools/27.0.3
 
-unzip -qq $HOME/[% c("input_files_by_name/platform_26") %] -d $SDK_HOME
-mkdir -p platforms/android-26
-mv android-8.0.0/* platforms/android-26
+unzip -qq $HOME/[% c("input_files_by_name/platform") %] -d $SDK_HOME
+mkdir -p platforms/android-28
+mv android-9/* platforms/android-28
 
-unzip -qq $HOME/[% c("input_files_by_name/platform_tools_26") %] -d $SDK_HOME
+unzip -qq $HOME/[% c("input_files_by_name/platform_tools") %] -d $SDK_HOME
 
 # Cleanup
 rm -fR android-8.1.0
-rm -fR android-8.0.0
+rm -fR android-9
 
 # Archive dist directory
 cd /var/tmp/dist
diff --git a/projects/android-toolchain/config 
b/projects/android-toolchain/config
index 8a4c413..8c9c822 100644
--- a/projects/android-toolchain/config
+++ b/projects/android-toolchain/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-version: 26.0.2
+version: 27.0.3
 var:
   container:
 use_container: 1
@@ -18,21 +18,21 @@ var:
   google_repo: https://dl.google.com/android/repository
 input_files:
   - project: container-image
-  - URL: '[% c("var/google_repo") %]/build-tools_r26.0.2-linux.zip'
-name: build_tools_26
-sha256sum: a752849fac85c4a7f9ea165ec8f367b0ebe8bbf6a1f33fc8605342be004231ce
-  - URL: '[% c("var/google_repo") %]/platform-26_r02.zip'
-name: platform_26
-sha256sum: 2aafa7d19c5e9c4b643ee6ade3d85ef89dc2f79e8383efdb9baf7fddad74b52a
-  - URL: '[% c("var/google_repo") %]/platform-tools_r26.0.2-linux.zip'
-name: platform_tools_26
-sha256sum: 63b15a38c2b64e6ec8b54febe9f69fce5fe6c898c554c73b826b49daf7b52519
+  - URL: '[% c("var/google_repo") %]/build-tools_r27.0.3-linux.zip'
+name: build_tools
+sha256sum: 5e1f4fc5203f13de120c56f9cc103bb2e57d940959547506196ab10ddc9e6b97
+  - URL: '[% c("var/google_repo") %]/platform-28_r04.zip'
+name: platform
+sha256sum: 967f8ca99b71d337aa9c7781f9d65dd8110bf5c4746f44304047bf71b20d0ded
+  - URL: '[% c("var/google_repo") %]/platform-tools_r28.0.3-linux.zip'
+name: platform_tools
+sha256sum: 38fccfe8d2646dd12bdd7cad22fedba0493425b98ebd6d620e4c670b9af4c53f
   - URL: '[% c("var/google_repo") %]/sdk-tools-linux-4333796.zip'
 name: android_sdk_tools
 sha256sum: 92ffee5a1d98d856634e8b71132e8a95d96c83a63fde1099be3d86df3106def9
-  - URL: '[% c("var/google_repo") %]/android-ndk-r15c-linux-x86_64.zip'
+  - URL: '[% c("var/google_repo") %]/android-ndk-r17b-linux-x86_64.zip'
 name: android_ndk_compiler
-sha256sum: f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c
-  - URL: https://services.gradle.org/distributions/gradle-4.1-bin.zip
+sha256sum: 5dfbbdc2d3ba859fed90d0e978af87c71a91a5be1f6e1c40ba697503d48ccecd
+  - URL: https://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 name: gradle_bin
-sha256sum: d55dfa9cfb5a3da86a1c9e75bb0b9507f9a8c8c100793ccec7beb6e259f9ed43
+sha256sum: b49c6da1b2cb67a0caf6c7480630b51c70a11ca2016ff2f555eaeda863143a29

___
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-68.1.0esr-9.0-1] fixup! TB4: Tor Browser's Firefox preference overrides.

2019-08-29 Thread gk

commit bd3c6c4beaf4c0ee004c841d8474e26b32925692
Author: Georg Koppen 
Date:   Mon Aug 19 07:38:56 2019 +

fixup! TB4: Tor Browser's Firefox preference overrides.

Fixes bug 31141.
---
 browser/app/profile/000-tor-browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 08fe0e8d301e..f9114b7a892e 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -371,7 +371,7 @@ pref("font.name.sans-serif.ar", "Arial");
 #endif
 
 #ifdef XP_WIN
-pref("font.system.whitelist", "Arial, Batang, ë°í, Cambria Math, Courier 
New, Euphemia, Gautami, Georgia, Gulim, êµ´ë¦¼, GulimChe, êµ´ë¦¼ì²´, Iskoola 
Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ï¼ï¼³ ã´ã·ãã¯, 
MS Mincho, ï¼ï¼³ ææ, MS PGothic, ï¼ï¼³ ï¼°ã´ã·ãã¯, MS PMincho, 
ï¼ï¼³ ï¼°ææ, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft 
Himalaya, Microsoft JhengHei, Microsoft JengHei UI, Microsoft YaHei, å¾®è½¯é
é», Microsoft YaHei UI, MingLiU, ç´°æé«, Noto Sans Buginese, Noto Sans 
Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 
æ°ç´°æé«, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, å®ä½, 
Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI");
+pref("font.system.whitelist", "Arial, Batang, ë°í, Cambria Math, Courier 
New, Euphemia, Gautami, Georgia, Gulim, êµ´ë¦¼, GulimChe, êµ´ë¦¼ì²´, Iskoola 
Pota, Kalinga, Kartika, Latha, Lucida Console, MS Gothic, ï¼ï¼³ ã´ã·ãã¯, 
MS Mincho, ï¼ï¼³ ææ, MS PGothic, ï¼ï¼³ ï¼°ã´ã·ãã¯, MS PMincho, 
ï¼ï¼³ ï¼°ææ, MV Boli, Malgun Gothic, Mangal, Meiryo, Meiryo UI, Microsoft 
Himalaya, Microsoft JhengHei, Microsoft JhengHei UI, Microsoft YaHei, å¾®è½¯é
é», Microsoft YaHei UI, MingLiU, ç´°æé«, Noto Sans Buginese, Noto Sans 
Khmer, Noto Sans Lao, Noto Sans Myanmar, Noto Sans Yi, Nyala, PMingLiU, 
æ°ç´°æé«, Plantagenet Cherokee, Raavi, Segoe UI, Shruti, SimSun, å®ä½, 
Sylfaen, Tahoma, Times New Roman, Tunga, Verdana, Vrinda, Yu Gothic UI");
 #endif
 
 #ifdef XP_LINUX

___
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-68.1.0esr-9.0-1] squash! TB4: Tor Browser's Firefox preference overrides.

2019-08-29 Thread gk

commit 1d8ad2218d07aa58e1887cb238499d08b70c190d
Author: Alex Catarineu 
Date:   Wed Aug 28 18:51:12 2019 +0200

squash! TB4: Tor Browser's Firefox preference overrides.

Bug 31396: Disable indexedDB WebExtension storage backend.
---
 browser/app/profile/000-tor-browser.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/browser/app/profile/000-tor-browser.js 
b/browser/app/profile/000-tor-browser.js
index 8a83eac60400..08fe0e8d301e 100644
--- a/browser/app/profile/000-tor-browser.js
+++ b/browser/app/profile/000-tor-browser.js
@@ -277,6 +277,8 @@ pref("extensions.getAddons.showPane", false);
 pref("extensions.legacy.exceptions", 
"{972ce4c6-7e08-4474-a285-3208198ce6fd},torbut...@torproject.org");
 // Bug 26114: Allow NoScript to access addons.mozilla.org etc.
 pref("extensions.webextensions.restrictedDomains", "");
+// Bug 31396: Disable indexedDB WebExtension storage backend.
+pref("extensions.webextensions.ExtensionStorageIDB.enabled", false);
 
 // Toolbar layout
 pref("browser.uiCustomization.state", 
"{\"placements\":{\"widget-overflow-fixed-list\":[],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"urlbar-container\",\"torbutton-button\",\"security-level-button\",\"downloads-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"],\"PanelUI-contents\":[\"home-button\",\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"save-page-button\",\"print-button\",\"bookmarks-menu-button\",\"history-panelmenu\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"]},\"seen\":[\"developer-button\",\"https-everywhere-eff_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\"],\"currentVersion\":14,\"newElementCount
 \":1}");

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

81 matches

Mail list logo