date:20211028

[tor-commits] [tor-browser/tor-browser-91.2.0esr-11.0-1] Bug 40483: Temporarily redirect DW's v2 address to their new v3 address

2021-10-28 Thread sysrqb

commit 4928a95242dcd3e617cc1abc3231fab7c0015e0a
Author: Matthew Finkel 
Date:   Mon Oct 4 22:45:56 2021 +

Bug 40483: Temporarily redirect DW's v2 address to their new v3 address
---
 docshell/base/nsDocShell.cpp | 13 +
 1 file changed, 13 insertions(+)

diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp
index c86fed307be6..080754c938b8 100644
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -5990,6 +5990,7 @@ already_AddRefed nsDocShell::AttemptURIFixup(
 bool aNotifyKeywordSearchLoading, nsIInputStream** aNewPostData) {
   if (aStatus != NS_ERROR_UNKNOWN_HOST && aStatus != NS_ERROR_NET_RESET &&
   aStatus != NS_ERROR_CONNECTION_REFUSED &&
+  aStatus != NS_ERROR_TOR_ONION_SVC_BAD_ADDRESS &&
   aStatus !=
   mozilla::psm::GetXPCOMFromNSSError(SSL_ERROR_BAD_CERT_DOMAIN)) {
 return nullptr;
@@ -6137,6 +6138,18 @@ already_AddRefed nsDocShell::AttemptURIFixup(
 }
   }
 }
+  } else if (aStatus == NS_ERROR_TOR_ONION_SVC_BAD_ADDRESS) {
+// Bug 40483: Temporarily redirect DW's v2 address to their new v3 address
+constexpr auto kV2DW = "dwnewsvdyyiamwnp.onion"_ns;
+constexpr auto kV3DW = 
"dwnewsgngmhlplxy6o2twtfgjnrnjxbegbwqx6wnotdhkzt562tszfid.onion"_ns;
+nsAutoCString host;
+newURI = nullptr;
+Unused << url->GetHost(host);
+if (StringEndsWith(host, kV2DW)) {
+  auto& subdomains = Substring(host, 0, host.Length() - kV2DW.Length());
+  Unused << NS_MutateURI(url).SetHost(subdomains + kV3DW).Finalize(
+getter_AddRefs(newURI));
+}
   } else if (aStatus == NS_ERROR_CONNECTION_REFUSED &&
  Preferences::GetBool("browser.fixup.fallback-to-https", false)) {
 // Try HTTPS, since http didn't work

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

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

2021-10-28 Thread translation

commit a32aea79e9b1db254ebd323ff3cff3be12d87b9b
Author: Translation commit bot 
Date:   Thu Oct 28 20:15:03 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 lt/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lt/aboutTor.dtd b/lt/aboutTor.dtd
index c9702032db..790e5bbf5a 100644
--- a/lt/aboutTor.dtd
+++ b/lt/aboutTor.dtd
@@ -47,7 +47,7 @@
 
   Thank you!
 -->
-
+

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

2021-10-28 Thread translation

commit ac6508e0b91c23a10365604b47ec0aca7d5e6bc2
Author: Translation commit bot 
Date:   Thu Oct 28 20:15:06 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
---
 lt/aboutTor.dtd | 28 
 1 file changed, 28 insertions(+)

diff --git a/lt/aboutTor.dtd b/lt/aboutTor.dtd
index fac64c2880..bca9714846 100644
--- a/lt/aboutTor.dtd
+++ b/lt/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+

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

[tor-commits] [lego/master] Add comment explaining z-index change

2021-10-28 Thread kez

commit 796f47cab97c1b574411006bc1c832ba205c3acd
Author: HackerNCoder 
Date:   Thu Oct 28 18:31:02 2021 +

Add comment explaining z-index change
---
 assets/scss/_dropdown.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/scss/_dropdown.scss b/assets/scss/_dropdown.scss
index 170a316..6a778f4 100644
--- a/assets/scss/_dropdown.scss
+++ b/assets/scss/_dropdown.scss
@@ -14,7 +14,7 @@
   position: absolute;
   top: 100%;
   left: 0;
-  z-index: 1030; //$zindex-dropdown;
+  z-index: 1030; // Replaced $zindex-dropdown because it put it under the 
about/ menu, see #246;
   display: none; // none by default, but block on "open" of the menu
   float: left;
   min-width: $dropdown-min-width;

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

[tor-commits] [lego/master] Make lang selection dropdown stay over submenu

2021-10-28 Thread kez

commit b0fad5b0a85e428e8b9aabf62638e1a54b0c0999
Author: HackerNCoder 
Date:   Wed Oct 27 17:14:02 2021 +

Make lang selection dropdown stay over submenu

They say it's supposed to work together in _variables, but it isn't.

Closes #246
---
 assets/scss/_dropdown.scss  | 2 +-
 assets/static/css/bootstrap.css | 3 +--
 assets/static/css/bootstrap.css.map | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/assets/scss/_dropdown.scss b/assets/scss/_dropdown.scss
index daa867a..170a316 100644
--- a/assets/scss/_dropdown.scss
+++ b/assets/scss/_dropdown.scss
@@ -14,7 +14,7 @@
   position: absolute;
   top: 100%;
   left: 0;
-  z-index: $zindex-dropdown;
+  z-index: 1030; //$zindex-dropdown;
   display: none; // none by default, but block on "open" of the menu
   float: left;
   min-width: $dropdown-min-width;
diff --git a/assets/static/css/bootstrap.css b/assets/static/css/bootstrap.css
index 12f731f..6c45de8 100644
--- a/assets/static/css/bootstrap.css
+++ b/assets/static/css/bootstrap.css
@@ -2965,7 +2965,7 @@ tbody.collapse.show {
   position: absolute;
   top: 100%;
   left: 0;
-  z-index: 1000;
+  z-index: 1030;
   display: none;
   float: left;
   min-width: 10rem;
@@ -10089,7 +10089,6 @@ size .no {
 position: static !important;
   }
 }
-
 @media (max-width: 767px) {
   .mobile {
 display: block !important;
diff --git a/assets/static/css/bootstrap.css.map 
b/assets/static/css/bootstrap.css.map
index bbfd4ff..c72ddc3 100644
--- a/assets/static/css/bootstrap.css.map
+++ b/assets/static/css/bootstrap.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../../scss/bootstrap.scss","../../scss/_icons.scss","../../scss/_illos.scss","../../scss/_root.scss","../../scss/_print.scss","../../scss/_reboot.scss","../../scss/_tor-variables.scss","../../scss/_variables.scss","../../scss/mixins/_hover.scss","../../scss/_type.scss","../../scss/mixins/_lists.scss","../../scss/_images.scss","../../scss/mixins/_image.scss","../../scss/mixins/_border-radius.scss","../../scss/mixins/_transition.scss","../../scss/_code.scss","../../scss/_grid.scss","../../scss/mixins/_grid.scss","../../scss/mixins/_breakpoints.scss","../../scss/mixins/_grid-framework.scss","../../scss/_tables.scss","../../scss/mixins/_table-row.scss","../../scss/_forms.scss","../../scss/mixins/_forms.scss","../../scss/_buttons.scss","../../scss/mixins/_buttons.scss","../../scss/mixins/_gradients.scss","../../scss/_transitions.scss","../../scss/_dropdown.scss","../../scss/mixins/_caret.scss","../../scss/mixins/_nav-divider.scss","../../scss/_but
 
ton-group.scss","../../scss/_input-group.scss","../../scss/_custom-forms.scss","../../scss/_nav.scss","../../scss/_navbar.scss","../../scss/_card.scss","../../scss/_breadcrumb.scss","../../scss/_pagination.scss","../../scss/mixins/_pagination.scss","../../scss/_badge.scss","../../scss/mixins/_badge.scss","../../scss/_jumbotron.scss","../../scss/_alert.scss","../../scss/mixins/_alert.scss","../../scss/_progress.scss","../../scss/_media.scss","../../scss/_list-group.scss","../../scss/mixins/_list-group.scss","../../scss/_close.scss","../../scss/_modal.scss","../../scss/_tooltip.scss","../../scss/mixins/_reset-text.scss","../../scss/_popover.scss","../../scss/_carousel.scss","../../scss/utilities/_align.scss","../../scss/mixins/_background-variant.scss","../../scss/utilities/_background.scss","../../scss/utilities/_borders.scss","../../scss/mixins/_clearfix.scss","../../scss/utilities/_display.scss","../../scss/utilities/_embed.scss","../../scss/utilities/_flex.scss","../../scss/utilit
 
ies/_float.scss","../../scss/mixins/_float.scss","../../scss/utilities/_position.scss","../../scss/utilities/_screenreaders.scss","../../scss/mixins/_screen-reader.scss","../../scss/utilities/_sizing.scss","../../scss/utilities/_spacing.scss","../../scss/utilities/_text.scss","../../scss/mixins/_text-truncate.scss","../../scss/mixins/_text-emphasis.scss","../../scss/mixins/_text-hide.scss","../../scss/utilities/_visibility.scss","../../scss/mixins/_visibility.scss","../../scss/_sidebar.scss","../../scss/_component-examples.scss","../../scss/_newsletter.scss","../../scss/_portal.scss","../../scss/_tpo.scss","../../scss/_tor.scss","../../scss/_eoy.scss","../../scss/_donate.scss","../../scss/_cryptocurrency.scss"],"names":[],"mappings":";;;;;;;ACAA;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;;;AAIF;EACE;EACA;EACA;EACA;EACA;;;AAIF;EACE;EACA;EACA;E

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

2021-10-28 Thread dgoulet

commit 74599cdb318c3fd845d115caffb96e1b903e5850
Merge: 676381940e 5363d9b118
Author: David Goulet 
Date:   Thu Oct 28 14:27:09 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

___
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.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-28 Thread dgoulet

commit 5363d9b118def1a6c2d2bf431fbcdcf3f588b0db
Merge: 89073bda5f a80868c118
Author: David Goulet 
Date:   Thu Oct 28 14:26:35 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/ticket40410 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



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

[tor-commits] [tor/release-0.4.6] changes: Typo in file, wrong version was used

2021-10-28 Thread dgoulet

commit a80868c1180bd2882ae3e8d2f5de56930706a22c
Author: David Goulet 
Date:   Thu Oct 28 14:22:14 2021 -0400

changes: Typo in file, wrong version was used

Signed-off-by: David Goulet 
---
 changes/ticket40410 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ticket40410 b/changes/ticket40410
index 90d6f4be63..658e0683c7 100644
--- a/changes/ticket40410
+++ b/changes/ticket40410
@@ -1,4 +1,4 @@
   o Minor bugfixes (compilation):
 - Fix a compilation error when trying to build Tor with a compiler that
   does not support expanding statitically initialized const values in
-  macro's. Fixes bug 40410; bugfix on 0.4.6.5.
+  macro's. Fixes bug 40410; bugfix on 0.4.5.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.5] Merge branch 'maint-0.4.5' into release-0.4.5

2021-10-28 Thread dgoulet

commit 27738a9cbae6c55f4f9c9ae7cdee7a0586be43fd
Merge: f0678b37ed a80868c118
Author: David Goulet 
Date:   Thu Oct 28 14:22:21 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40410 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/release-0.4.5] changes: Typo in file, wrong version was used

2021-10-28 Thread dgoulet

commit a80868c1180bd2882ae3e8d2f5de56930706a22c
Author: David Goulet 
Date:   Thu Oct 28 14:22:14 2021 -0400

changes: Typo in file, wrong version was used

Signed-off-by: David Goulet 
---
 changes/ticket40410 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ticket40410 b/changes/ticket40410
index 90d6f4be63..658e0683c7 100644
--- a/changes/ticket40410
+++ b/changes/ticket40410
@@ -1,4 +1,4 @@
   o Minor bugfixes (compilation):
 - Fix a compilation error when trying to build Tor with a compiler that
   does not support expanding statitically initialized const values in
-  macro's. Fixes bug 40410; bugfix on 0.4.6.5.
+  macro's. Fixes bug 40410; bugfix on 0.4.5.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.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-28 Thread dgoulet

commit 5363d9b118def1a6c2d2bf431fbcdcf3f588b0db
Merge: 89073bda5f a80868c118
Author: David Goulet 
Date:   Thu Oct 28 14:26:35 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/ticket40410 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

[tor-commits] [tor/maint-0.4.5] changes: Typo in file, wrong version was used

2021-10-28 Thread dgoulet

commit a80868c1180bd2882ae3e8d2f5de56930706a22c
Author: David Goulet 
Date:   Thu Oct 28 14:22:14 2021 -0400

changes: Typo in file, wrong version was used

Signed-off-by: David Goulet 
---
 changes/ticket40410 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ticket40410 b/changes/ticket40410
index 90d6f4be63..658e0683c7 100644
--- a/changes/ticket40410
+++ b/changes/ticket40410
@@ -1,4 +1,4 @@
   o Minor bugfixes (compilation):
 - Fix a compilation error when trying to build Tor with a compiler that
   does not support expanding statitically initialized const values in
-  macro's. Fixes bug 40410; bugfix on 0.4.6.5.
+  macro's. Fixes bug 40410; bugfix on 0.4.5.1-alpha

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

[tor-commits] [tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-28 Thread dgoulet

commit 5363d9b118def1a6c2d2bf431fbcdcf3f588b0db
Merge: 89073bda5f a80868c118
Author: David Goulet 
Date:   Thu Oct 28 14:26:35 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

 changes/ticket40410 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



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

[tor-commits] [tor/main] changes: Typo in file, wrong version was used

2021-10-28 Thread dgoulet

commit a80868c1180bd2882ae3e8d2f5de56930706a22c
Author: David Goulet 
Date:   Thu Oct 28 14:22:14 2021 -0400

changes: Typo in file, wrong version was used

Signed-off-by: David Goulet 
---
 changes/ticket40410 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ticket40410 b/changes/ticket40410
index 90d6f4be63..658e0683c7 100644
--- a/changes/ticket40410
+++ b/changes/ticket40410
@@ -1,4 +1,4 @@
   o Minor bugfixes (compilation):
 - Fix a compilation error when trying to build Tor with a compiler that
   does not support expanding statitically initialized const values in
-  macro's. Fixes bug 40410; bugfix on 0.4.6.5.
+  macro's. Fixes bug 40410; bugfix on 0.4.5.1-alpha



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

[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

2021-10-28 Thread dgoulet

commit 02d86bc21bb998e0a522e4058b2e6443a52e1b10
Merge: 489c852da0 5363d9b118
Author: David Goulet 
Date:   Thu Oct 28 14:27:17 2021 -0400

Merge branch 'maint-0.4.6'

___
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.6] changes: Typo in file, wrong version was used

2021-10-28 Thread dgoulet

commit a80868c1180bd2882ae3e8d2f5de56930706a22c
Author: David Goulet 
Date:   Thu Oct 28 14:22:14 2021 -0400

changes: Typo in file, wrong version was used

Signed-off-by: David Goulet 
---
 changes/ticket40410 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ticket40410 b/changes/ticket40410
index 90d6f4be63..658e0683c7 100644
--- a/changes/ticket40410
+++ b/changes/ticket40410
@@ -1,4 +1,4 @@
   o Minor bugfixes (compilation):
 - Fix a compilation error when trying to build Tor with a compiler that
   does not support expanding statitically initialized const values in
-  macro's. Fixes bug 40410; bugfix on 0.4.6.5.
+  macro's. Fixes bug 40410; bugfix on 0.4.5.1-alpha



___
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

2021-10-28 Thread translation

commit 2ad64bd3bbf9d49d8ff60f314717670c3e76c4f8
Author: Translation commit bot 
Date:   Thu Oct 28 15:47:04 2021 +

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

diff --git a/contents+de.po b/contents+de.po
index 344b44c9a9..eff3e15b12 100644
--- a/contents+de.po
+++ b/contents+de.po
@@ -11,11 +11,11 @@
 # Leon T. , 2020
 # Sebastian , 2021
 # Vormrodo , 2021
-# Not AName , 2021
 # erinm, 2021
 # Emma Peel, 2021
 # Ettore Atalan , 2021
 # Curtis Baltimore , 2021
+# Not AName , 2021
 # 
 msgid ""
 msgstr ""
@@ -23,7 +23,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-28 11:50+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Curtis Baltimore , 2021\n"
+"Last-Translator: Not AName , 2021\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/1519/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -781,6 +781,8 @@ msgid ""
 "Some additional flags that can be used with `start-tor-browser.desktop` from"
 " the command-line:"
 msgstr ""
+"Einige zusÃ¤tzliche Optionen, die mit `start-tor-browser.desktop` von der "
+"Kommandozeile aus verwendet werden kÃ¶nnen:"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -834,7 +836,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
 msgid "See here on how to [update Tor Browser](../updating/)."
-msgstr ""
+msgstr "Siehe hier fÃ¼r [Wie aktualisiert man Tor Browser](../updating/)."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.title)

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

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

2021-10-28 Thread translation

commit c400c9a57ad30b54b563da8d29fedf613ddc86af
Author: Translation commit bot 
Date:   Thu Oct 28 15:45:12 2021 +


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

diff --git a/contents+ar.po b/contents+ar.po
index 277c92210c..7d1b4bd617 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -17589,7 +17589,7 @@ msgstr ""
 #: https//community.torproject.org/relay/setup/snowflake/standalone/
 #: (content/relay/setup/snowflake/standalone/contents+en.lrpage.title)
 msgid "Standalone Snowflake proxy"
-msgstr ""
+msgstr "ÙÙÙÙ Snowflake Ø§ÙÙØ³ØªÙÙØ©"
 
 #: https//community.torproject.org/relay/setup/snowflake/standalone/
 #: (content/relay/setup/snowflake/standalone/contents+en.lrpage.subtitle)
@@ -17613,6 +17613,10 @@ msgid ""
 "servers and offer a higher bandwidth and more reliable option for users "
 "behind restrictive NATs and firewalls."
 msgstr ""
+"Ø§ÙÙØªØ·ÙØ¨Ø§Øª Ø§ÙÙØÙØ¯Ø© ÙÙ Ø§ÙØ§ØªØµØ§Ù Ø¨Ø§ÙØ¥ÙØªØ±ÙØªØ 
ÙÙØ¹ Ø°ÙÙ ÙØ¥Ù Ø¥ØØ¯Ù Ø§ÙÙØ²Ø§ÙØ§ Ø§ÙØ±Ø¦ÙØ³ÙØ© "
+"ÙØ¨Ø±ÙÙØ³ÙØ§Øª Snowflake Ø§ÙÙØ³ØªÙÙØ© ÙÙ Ø£ÙÙ ÙÙÙÙ 
ØªØ«Ø¨ÙØªÙØ§ Ø¹ÙÙ Ø§ÙØ®ÙØ§Ø¯Ù ÙØªÙÙØ± ÙØ·Ø§ÙÙØ§ "
+"ØªØ±Ø¯Ø¯ÙÙØ§ Ø£Ø¹ÙÙ ÙØ®ÙØ§Ø±ÙØ§ Ø£ÙØ«Ø± ÙÙØ«ÙÙÙØ© ÙÙÙ
Ø³ØªØ®Ø¯ÙÙÙ Ø§ÙØ°ÙÙ ÙÙÙÙÙ ÙØ±Ø§Ø¡ Ø£ÙØ¸ÙØ© NAT "
+"ÙØ¬Ø¯Ø±Ø§Ù Ø§ÙØÙØ§ÙØ© Ø§ÙÙÙÙØ¯Ø©."
 
 #: https//community.torproject.org/relay/setup/snowflake/standalone/
 #: (content/relay/setup/snowflake/standalone/contents+en.lrpage.body)
@@ -20069,7 +20073,7 @@ msgstr ""
 #: https//community.torproject.org/relay/setup/guard/freebsd/
 #: (content/relay/setup/guard/freebsd/contents+en.lrpage.body)
 msgid "### 3. Package installation"
-msgstr ""
+msgstr "### 3. ØªØ±ÙÙØ¨ Ø§ÙØØ²ÙØ©"
 
 #: https//community.torproject.org/relay/setup/guard/netbsd/
 #: (content/relay/setup/guard/netbsd/contents+en.lrpage.body)
@@ -20087,7 +20091,7 @@ msgstr ""
 #: https//community.torproject.org/relay/setup/guard/freebsd/
 #: (content/relay/setup/guard/freebsd/contents+en.lrpage.body)
 msgid "### 4. Configuration file"
-msgstr ""
+msgstr "### 4. ÙÙÙ Ø§ÙØ¶Ø¨Ø·"
 
 #: https//community.torproject.org/relay/setup/guard/netbsd/
 #: (content/relay/setup/guard/netbsd/contents+en.lrpage.body)
@@ -21293,22 +21297,23 @@ msgstr ""
 #: https//community.torproject.org/relay/setup/guard/centos-rhel/
 #: (content/relay/setup/guard/centos-rhel/contents+en.lrpage.body)
 msgid "### 5. Configuration file"
-msgstr ""
+msgstr "### 5. ÙÙÙ Ø§ÙØ¶Ø¨Ø·"
 
 #: https//community.torproject.org/relay/setup/guard/centos-rhel/
 #: (content/relay/setup/guard/centos-rhel/contents+en.lrpage.body)
 msgid "### 6. Enable and Start `tor`"
-msgstr ""
+msgstr "### 6. ØªÙÙÙÙ ÙØ¨Ø¯Ø¡ `tor`"
 
 #: https//community.torproject.org/relay/setup/guard/centos-rhel/
 #: (content/relay/setup/guard/centos-rhel/contents+en.lrpage.body)
 msgid "Recent versions os CentOS/RHEL which ship with systemd:"
 msgstr ""
+"Ø§ÙØ¥ØµØ¯Ø§Ø±Ø§Øª Ø§ÙØØ¯ÙØ«Ø© ÙÙ ÙØ¸Ø§Ù Ø§ÙØªØ´ØºÙÙ OS CentOS/RHEL 
ÙØ§ÙØªÙ ÙØªÙ Ø´ØÙÙØ§ ÙØ¹ systemd:"
 
 #: https//community.torproject.org/relay/setup/guard/centos-rhel/
 #: (content/relay/setup/guard/centos-rhel/contents+en.lrpage.body)
 msgid "Should you use an older release like CentOS/RHEL 6, that will be:"
-msgstr ""
+msgstr "Ø¥Ø°Ø§ ÙÙØª ØªØ³ØªØ®Ø¯Ù Ø¥ØµØ¯Ø§Ø±ÙØ§ ÙØ¯ÙÙÙØ§ ÙØ«Ù 
CentOS/RHEL 6, ÙØ³ÙÙÙÙ ÙØ°Ø§:"
 
 #: https//community.torproject.org/relay/setup/guard/centos-rhel/
 #: (content/relay/setup/guard/centos-rhel/contents+en.lrpage.body)
@@ -21323,7 +21328,7 @@ msgstr "ÙÙÙÙØ© ÙØ´Ø± ÙØ±ØÙ ÙØªÙØ³Ø· / 
ØØ§Ø±Ø³ Ø¹ÙÙ OpenBSD"
 #: https//community.torproject.org/relay/setup/guard/openbsd/
 #: (content/relay/setup/guard/openbsd/contents+en.lrpage.body)
 msgid "### 2. Package installation"
-msgstr ""
+msgstr "### 2. ØªØ±ÙÙØ¨ Ø§ÙØØ²ÙØ©"
 
 #: https//community.torproject.org/relay/setup/guard/openbsd/
 #: (content/relay/setup/guard/openbsd/contents+en.lrpage.body)
@@ -21391,7 +21396,7 @@ msgstr "# ./openup"
 #: https//community.torproject.org/relay/setup/guard/openbsd/
 #: (content/relay/setup/guard/openbsd/contents+en.lrpage.body)
 msgid "### 3. Configuration file"
-msgstr ""
+msgstr "### 3. ÙÙÙ Ø§ÙØ¶Ø¨Ø·"
 
 #: https//community.torproject.org/relay/setup/guard/openbsd/
 #: (content/relay/setup/guard/openbsd/contents+en.lrpage.body)
@@ -21469,7 +21474,7 @@ msgstr "tor:\\"
 #: https//community.torproject.org/relay/setup/guard/openbsd/
 #: (content/relay/setup/guard/openbsd/contents+en.lrpage.body)
 msgid ":openfiles-max=13500:\\"
-msgstr ""
+msgstr ":openfiles-max=13500:\\"
 
 #: https//community.torproject.org/relay/setup/guard/openbsd/
 #: (content/relay/setup/guard/openbsd/contents+en.lrpage.body)
@@ -22278,7 +22283,7 @@ msgstr ""
 
 #: templates/localization.html:32
 msgid "Join Tor Translators mailing list"
-msgstr ""
+msgstr "Ø§ÙØ¶Ù Ø¥ÙÙ

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

2021-10-28 Thread translation

commit abe882e8669b61d4957d2ea75ac319f83d1ba9a2
Author: Translation commit bot 
Date:   Thu Oct 28 15:16:56 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 de.po | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/de.po b/de.po
index 4b80906067..c67437eb57 100644
--- a/de.po
+++ b/de.po
@@ -17,6 +17,7 @@
 # gerhard , 2013
 # Jonas KrÃ¶ber , 2020
 # jugendhacker , 2018
+# Kevin Kandlbinder , 2021
 # Konstantin BB, 2015
 # Larson MÃ¤rz , 2013
 # Mario Baier , 2013
@@ -41,8 +42,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-04 16:34+0200\n"
-"PO-Revision-Date: 2021-10-28 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-28 14:48+\n"
+"Last-Translator: Kevin Kandlbinder \n"
 "Language-Team: German 
(http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2021-10-28 Thread translation

commit 8a750af0049cf2f1b8f299b9526bdd2bbfe807a0
Author: Translation commit bot 
Date:   Thu Oct 28 15:16:02 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 de.po | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/de.po b/de.po
index 15f0fd2cba..7ae2b9fc98 100644
--- a/de.po
+++ b/de.po
@@ -17,6 +17,7 @@
 # gerhard , 2013
 # Jonas KrÃ¶ber , 2020
 # jugendhacker , 2018
+# Kevin Kandlbinder , 2021
 # Konstantin BB, 2015
 # Larson MÃ¤rz , 2013
 # Mario Baier , 2013
@@ -41,8 +42,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-04 16:34+0200\n"
-"PO-Revision-Date: 2021-10-28 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-28 14:48+\n"
+"Last-Translator: Kevin Kandlbinder \n"
 "Language-Team: German 
(http://www.transifex.com/otf/torproject/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1178,11 +1179,11 @@ msgstr "Sprache, Administrationspasswort, und 
zusÃ¤tzliche Einstellungen"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
 msgid "Tor Bridge"
-msgstr ""
+msgstr "Tor-BrÃ¼cke"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Save the last bridge that you used to connect to Tor"
-msgstr ""
+msgstr "Die letzte BrÃ¼cke speichern, die verwendet wurde um eine Verbindung 
zu Tor herzustellen"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "Browser Bookmarks"

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

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

2021-10-28 Thread translation

commit 0246cfb960dad753601099cec499da10f3fa3545
Author: Translation commit bot 
Date:   Thu Oct 28 15:15:17 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ar.po | 52 ++--
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index dc7b1f6ab3..277c92210c 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -15,8 +15,8 @@
 # Layla Taha , 2021
 # erinm, 2021
 # Ahmed A., 2021
-# NASIâ¿ , 2021
 # Emma Peel, 2021
+# NASIâ¿ , 2021
 # 
 msgid ""
 msgstr ""
@@ -24,7 +24,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-26 18:39+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: NASIâ¿ , 2021\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -13166,6 +13166,7 @@ msgstr ""
 #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body)
 msgid "These hosts already have many tor nodes being hosted there."
 msgstr ""
+"ÙØ¤ÙØ§Ø¡ Ø§ÙÙØ¶ÙÙÙÙ ÙØ¯ÙÙÙ Ø¨Ø§ÙÙØ¹Ù Ø§ÙØ¹Ø¯ÙØ¯ ÙÙ Ø¹ÙØ¯ 
Tor Ø§ÙØªÙ ÙØªÙ Ø§Ø³ØªØ¶Ø§ÙØªÙØ§ ÙÙØ§Ù."
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -13371,6 +13372,10 @@ msgid ""
 "suspension and even termination of your server and account.\" Locations: "
 "FR,CA | 09/27/2021 |"
 msgstr ""
+"| [OVH Kimsufi](http://www.kimsufi.com/) | AS16276 | Yes | Yes | No | Ø¹Ø±Ø¶ "
+"Ø§ÙÙØ·Ø§Ù Ø§ÙØªØ±Ø¯Ø¯Ù ØºÙØ± Ø§ÙÙØØ³ÙØ¨ @ 100 ÙÙØ¬Ø§Ø¨Øª ÙÙ 
Ø§ÙØ«Ø§ÙÙØ© - \"Ø³Ø£Ø´Ø±Ø ÙÙ Ø¨ÙÙ Ø³Ø±ÙØ± ÙØ°Ø§"
+" Ø§ÙÙÙÙÙ. ÙÙØØ¸Ø± ØªÙØ§ÙÙØ§ ØªØ´ØºÙÙ Ø¹ÙØ¯Ø© Ø®Ø±ÙØ¬ Tor ÙÙÙ
ÙÙ Ø£Ù ÙØ¤Ø¯Ù Ø¥ÙÙ ØªØ¹ÙÙÙ ÙØØªÙ Ø¥ÙÙØ§Ø¡"
+" Ø§ÙØ®Ø§Ø¯Ù ÙØ§ÙØØ³Ø§Ø¨ Ø§ÙØ®Ø§ØµÙÙ Ø¨Ù.\" Ø§ÙÙÙØ§ÙØ¹: 
ÙØ±ÙØ³Ø§Ø ÙØ§ÙÙÙÙØ±ÙÙØ§ | 09/27/2021 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -13511,6 +13516,10 @@ msgid ""
 "servers, 20tb on vps. \"It is not a Problem, however, abuse reports can lead"
 " to a server lock\" Locations: DE,FI | 09/27/2021 |"
 msgstr ""
+"| [Hetzner](http://hetzner.de) | AS24940 | Yes | Yes | Yes | Ø§ÙØ¬Ø°Ø±ÙØ© 
Ø§ÙÙØ®ØµØµØ©"
+" Ø¬ÙØ¯Ø© ÙØ³Ø¹Ø± Ø¬ÙØ¯. Ø¹Ø±Ø¶ Ø§ÙÙØ·Ø§Ù Ø§ÙØªØ±Ø¯Ø¯Ù ØºÙØ± Ø§ÙÙ
ÙÙØ§Ø³ Ø¹ÙÙ Ø®ÙØ§Ø¯Ù ÙØ®ØµØµØ©Ø 20 ØªÙØ±Ø§Ø¨Ø§ÙØª "
+"Ø¹ÙÙ vps. \"Ø¥ÙÙØ§ ÙÙØ³Øª ÙØ´ÙÙØ©Ø ÙÙØ¹ Ø°ÙÙØ ÙÙÙÙ Ø£Ù 
ØªØ¤Ø¯Ù ØªÙØ§Ø±ÙØ± Ø¥Ø³Ø§Ø¡Ø© Ø§ÙØ§Ø³ØªØ®Ø¯Ø§Ù Ø¥ÙÙ"
+" ÙÙÙ Ø§ÙØ®Ø§Ø¯Ù\" Ø§ÙÙÙØ§ÙØ¹: DE ,FI | 09/27/2021 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -13518,6 +13527,8 @@ msgid ""
 "| [Contabo](https://contabo.de) | AS51167 | No | No | No | Tor prohibited "
 "due to terms of service | 03/2021 |"
 msgstr ""
+"| [ÙÙÙØªØ§Ø¨Ù](https://contabo.de) | AS51167 | No | No | No | Tor Ù
ØØ¸ÙØ± Ø¨Ø³Ø¨Ø¨ "
+"Ø´Ø±ÙØ· Ø§ÙØ®Ø¯ÙØ© | 03/2021 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -13569,6 +13580,9 @@ msgid ""
 "bandwidth - Tor exit nodes allowed on VPS and rootservers - \"Yes, it is. "
 "Everything is allowed that the T do not exclude.\" | 09/27/2021 |"
 msgstr ""
+"| [ÙØªÙÙØ¨](https://www.netcup.de) | AS197540 | Yes | Yes | Yes | 40-120TB 
Ø¹Ø±Ø¶"
+" Ø§ÙÙØ·Ø§Ù Ø§ÙØªØ±Ø¯Ø¯Ù - Ø¹ÙÙØ¯ Ø®Ø±ÙØ¬ Tor Ø§ÙÙØ³ÙÙØ Ø¨ÙØ§ 
Ø¹ÙÙ VPS ÙØ®ÙØ§Ø¯Ù Ø§ÙØ¬Ø°Ø± - \"ÙØ¹ÙØ "
+"Ø¥ÙÙ ÙØ³ÙÙØ. ÙÙ Ø´ÙØ¡ ÙØ³ÙÙØ Ø¨Ù ÙÙØ§ ØªØ³ØªØ¨Ø¹Ø¯Ù 
Ø§ÙØ´Ø±ÙØ· ÙØ§ÙØ£ØÙØ§Ù.\" | 09/27/2021 |"
 
 #: https//community.torproject.org/relay/community-resources/good-bad-isps/
 #: (content/relay/community-resources/good-bad-isps/contents+en.lrpage.body)
@@ -20371,6 +20385,8 @@ msgid ""
 "ensure you follow them very carefully, and make any of the necessary "
 "modifications outlined along the way."
 msgstr ""
+"ÙÙÙØ§ ÙÙÙ Ø¥Ø±Ø´Ø§Ø¯Ø§Øª ÙÙØµÙØ© ØÙÙ ÙÙÙÙØ© ØªÙÙÙØ° ÙØ°Ù 
Ø§ÙØ®Ø·ÙØ§Øª - ÙØ±Ø¬Ù Ø§ÙØªØ£ÙØ¯ ÙÙ Ø§ØªØ¨Ø§Ø¹ÙØ§ "
+"Ø¨Ø¹ÙØ§ÙØ© ÙØ§Ø¦ÙØ© ÙØ¥Ø¬Ø±Ø§Ø¡ Ø£Ù ÙÙ Ø§ÙØªØ¹Ø¯ÙÙØ§Øª Ø§ÙÙØ§Ø²Ù
Ø© Ø§ÙÙÙØ¶ØØ© Ø¹ÙÙ Ø·ÙÙ Ø§ÙØ·Ø±ÙÙ."
 
 #: https//community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lrpage.body)
@@ -20529,7 +20545,7 @@ msgstr "# ØªØºÙÙØ± Ø§ÙÙÙØ¨ \"myNiceRelay\" Ø¥ÙÙ 
Ø§ÙØ§Ø³Ù Ø§ÙØ°Ù ÙØ¹
 #: https//community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lrpage.body)
 msgid "#Paths assume you extracted to C:\\Users\\torrelay\\tor -

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

2021-10-28 Thread translation

commit c6fc14c60a5823d217de08323537c302634860ba
Author: Translation commit bot 
Date:   Thu Oct 28 14:47:52 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+fr.po | 16 ++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index 82f1531d3d..0509461a1c 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -647,6 +647,9 @@ msgid ""
 "We found that organically, developers have approached this problem in "
 "different ways, mostly with solutions tailored for their service."
 msgstr ""
+"Nous avons trouvÃ© qu'organiquement, les dÃ©veloppeurs ont rÃ©solu ce 
problÃ¨me "
+"de diffÃ©rentes maniÃ¨res, gÃ©nÃ©ralement avec des solutions adaptÃ©es Ã  
leur "
+"service."
 
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.body)
@@ -666,6 +669,11 @@ msgid ""
 "first proof-of-concept human-memorizable names for SecureDrop onion services"
 " addresses:"
 msgstr ""
+"Pour cette version, nous nous sommes associÃ©s avec la Freedom of the Press "
+"Foundation (FPF) et l'HTTPS partout de la Fondation FrontiÃ¨re Ãlectronique "
+"pour dÃ©velopper la premiÃ¨re dÃ©monstration de faisabilitÃ© des noms "
+"mÃ©morisables par des Ãªtres humains pour les adresses des services oignon "
+"SecureDrop :"
 
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.body)
@@ -705,6 +713,10 @@ msgid ""
 "jointly consider next steps based on feedback on this initial proof-of-"
 "concept."
 msgstr ""
+"La Freedom of the Press Foundation a contactÃ© un petit nombre "
+"d'organisations mÃ©diatiques supplÃ©mentaires pour la participation, et Tor 
et"
+" FPF considÃ©reront conjointement les prochaines Ã©tapes en se basant sur les 
"
+"retours de ce premier essai."
 
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.body)
@@ -914,7 +926,7 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid " Known Issues"
-msgstr ""
+msgstr " ProblÃ¨mes connus"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
@@ -1000,7 +1012,7 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid " Give Feedback"
-msgstr ""
+msgstr " Donnez vos retours"
 
 #: https//www.torproject.org/releases/tor-browser-10-0/
 #: (content/releases/tor-browser-10-0/contents+en.lrpage.title)

___
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.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-28 Thread dgoulet

commit 89073bda5f6eb372e571e229e8864bff723d8350
Merge: fa405ca27f 31fa3cc1a0
Author: David Goulet 
Date:   Thu Oct 28 10:38:20 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6




___
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.6] Merge branch 'maint-0.4.6' into release-0.4.6

2021-10-28 Thread dgoulet

commit 676381940e340f284488efc43c8c3e63e006ea37
Merge: d4f68f1c69 89073bda5f
Author: David Goulet 
Date:   Thu Oct 28 10:38:20 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

___
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.5] Merge branch 'maint-0.4.5' into release-0.4.5

2021-10-28 Thread dgoulet

commit f0678b37ed55b34c513d719387bdcea6c8ee958d
Merge: fb2b8339cb 31fa3cc1a0
Author: David Goulet 
Date:   Thu Oct 28 10:38:20 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40410   | 4 
 src/feature/dirclient/dirclient.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

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

[tor-commits] [tor/maint-0.4.6] Fix compilation on systems with older compilers.

2021-10-28 Thread dgoulet

commit 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Jun 10 20:04:13 2021 +

Fix compilation on systems with older compilers.

This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.

See: tpo/core/tor#40410
---
 changes/ticket40410   | 4 
 src/feature/dirclient/dirclient.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/ticket40410 b/changes/ticket40410
new file mode 100644
index 00..90d6f4be63
--- /dev/null
+++ b/changes/ticket40410
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation error when trying to build Tor with a compiler that
+  does not support expanding statitically initialized const values in
+  macro's. Fixes bug 40410; bugfix on 0.4.6.5.
diff --git a/src/feature/dirclient/dirclient.c 
b/src/feature/dirclient/dirclient.c
index 30b47232ca..cc6c5e04f4 100644
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -1959,8 +1959,7 @@ dir_client_decompress_response_body(char **bodyp, size_t 
*bodylenp,
   /* If we're pretty sure that we have a compressed directory, and
* we didn't manage to uncompress it, then warn and bail. */
   if (!plausible && !new_body) {
-const int LOG_INTERVAL = 3600;
-static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL);
+static ratelim_t warning_limit = RATELIM_INIT(60 * 60);
 log_fn_ratelim(_limit, LOG_WARN, LD_HTTP,
"Unable to decompress HTTP body (tried %s%s%s, on %s).",
description1,



___
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.5] Fix compilation on systems with older compilers.

2021-10-28 Thread dgoulet

commit 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Jun 10 20:04:13 2021 +

Fix compilation on systems with older compilers.

This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.

See: tpo/core/tor#40410
---
 changes/ticket40410   | 4 
 src/feature/dirclient/dirclient.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/ticket40410 b/changes/ticket40410
new file mode 100644
index 00..90d6f4be63
--- /dev/null
+++ b/changes/ticket40410
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation error when trying to build Tor with a compiler that
+  does not support expanding statitically initialized const values in
+  macro's. Fixes bug 40410; bugfix on 0.4.6.5.
diff --git a/src/feature/dirclient/dirclient.c 
b/src/feature/dirclient/dirclient.c
index 30b47232ca..cc6c5e04f4 100644
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -1959,8 +1959,7 @@ dir_client_decompress_response_body(char **bodyp, size_t 
*bodylenp,
   /* If we're pretty sure that we have a compressed directory, and
* we didn't manage to uncompress it, then warn and bail. */
   if (!plausible && !new_body) {
-const int LOG_INTERVAL = 3600;
-static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL);
+static ratelim_t warning_limit = RATELIM_INIT(60 * 60);
 log_fn_ratelim(_limit, LOG_WARN, LD_HTTP,
"Unable to decompress HTTP body (tried %s%s%s, on %s).",
description1,



___
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.6] Fix compilation on systems with older compilers.

2021-10-28 Thread dgoulet

commit 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Jun 10 20:04:13 2021 +

Fix compilation on systems with older compilers.

This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.

See: tpo/core/tor#40410
---
 changes/ticket40410   | 4 
 src/feature/dirclient/dirclient.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/ticket40410 b/changes/ticket40410
new file mode 100644
index 00..90d6f4be63
--- /dev/null
+++ b/changes/ticket40410
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation error when trying to build Tor with a compiler that
+  does not support expanding statitically initialized const values in
+  macro's. Fixes bug 40410; bugfix on 0.4.6.5.
diff --git a/src/feature/dirclient/dirclient.c 
b/src/feature/dirclient/dirclient.c
index 30b47232ca..cc6c5e04f4 100644
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -1959,8 +1959,7 @@ dir_client_decompress_response_body(char **bodyp, size_t 
*bodylenp,
   /* If we're pretty sure that we have a compressed directory, and
* we didn't manage to uncompress it, then warn and bail. */
   if (!plausible && !new_body) {
-const int LOG_INTERVAL = 3600;
-static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL);
+static ratelim_t warning_limit = RATELIM_INIT(60 * 60);
 log_fn_ratelim(_limit, LOG_WARN, LD_HTTP,
"Unable to decompress HTTP body (tried %s%s%s, on %s).",
description1,



___
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.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-28 Thread dgoulet

commit 89073bda5f6eb372e571e229e8864bff723d8350
Merge: fa405ca27f 31fa3cc1a0
Author: David Goulet 
Date:   Thu Oct 28 10:38:20 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

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

[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

2021-10-28 Thread dgoulet

commit 489c852da07a1e0c3071e24d4f62f4a4d2e8a749
Merge: a543657f34 89073bda5f
Author: David Goulet 
Date:   Thu Oct 28 10:38:20 2021 -0400

Merge branch 'maint-0.4.6'

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

[tor-commits] [tor/main] Fix compilation on systems with older compilers.

2021-10-28 Thread dgoulet

commit 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Jun 10 20:04:13 2021 +

Fix compilation on systems with older compilers.

This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.

See: tpo/core/tor#40410
---
 changes/ticket40410   | 4 
 src/feature/dirclient/dirclient.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/ticket40410 b/changes/ticket40410
new file mode 100644
index 00..90d6f4be63
--- /dev/null
+++ b/changes/ticket40410
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation error when trying to build Tor with a compiler that
+  does not support expanding statitically initialized const values in
+  macro's. Fixes bug 40410; bugfix on 0.4.6.5.
diff --git a/src/feature/dirclient/dirclient.c 
b/src/feature/dirclient/dirclient.c
index 30b47232ca..cc6c5e04f4 100644
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -1959,8 +1959,7 @@ dir_client_decompress_response_body(char **bodyp, size_t 
*bodylenp,
   /* If we're pretty sure that we have a compressed directory, and
* we didn't manage to uncompress it, then warn and bail. */
   if (!plausible && !new_body) {
-const int LOG_INTERVAL = 3600;
-static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL);
+static ratelim_t warning_limit = RATELIM_INIT(60 * 60);
 log_fn_ratelim(_limit, LOG_WARN, LD_HTTP,
"Unable to decompress HTTP body (tried %s%s%s, on %s).",
description1,



___
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.5] Fix compilation on systems with older compilers.

2021-10-28 Thread dgoulet

commit 31fa3cc1a0021ff6ad7e1048b56ccab54e908fdc
Author: Alexander FÃ¦rÃ¸y 
Date:   Thu Jun 10 20:04:13 2021 +

Fix compilation on systems with older compilers.

This patch fixes a build error with GCC 7.x which doesn't seem to accept
const int's as constants in macro initialization.

See: tpo/core/tor#40410
---
 changes/ticket40410   | 4 
 src/feature/dirclient/dirclient.c | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/ticket40410 b/changes/ticket40410
new file mode 100644
index 00..90d6f4be63
--- /dev/null
+++ b/changes/ticket40410
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+- Fix a compilation error when trying to build Tor with a compiler that
+  does not support expanding statitically initialized const values in
+  macro's. Fixes bug 40410; bugfix on 0.4.6.5.
diff --git a/src/feature/dirclient/dirclient.c 
b/src/feature/dirclient/dirclient.c
index 30b47232ca..cc6c5e04f4 100644
--- a/src/feature/dirclient/dirclient.c
+++ b/src/feature/dirclient/dirclient.c
@@ -1959,8 +1959,7 @@ dir_client_decompress_response_body(char **bodyp, size_t 
*bodylenp,
   /* If we're pretty sure that we have a compressed directory, and
* we didn't manage to uncompress it, then warn and bail. */
   if (!plausible && !new_body) {
-const int LOG_INTERVAL = 3600;
-static ratelim_t warning_limit = RATELIM_INIT(LOG_INTERVAL);
+static ratelim_t warning_limit = RATELIM_INIT(60 * 60);
 log_fn_ratelim(_limit, LOG_WARN, LD_HTTP,
"Unable to decompress HTTP body (tried %s%s%s, on %s).",
description1,

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

[tor-commits] [tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-28 Thread dgoulet

commit 89073bda5f6eb372e571e229e8864bff723d8350
Merge: fa405ca27f 31fa3cc1a0
Author: David Goulet 
Date:   Thu Oct 28 10:38:20 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6




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

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

2021-10-28 Thread translation

commit 88e4af7be8f6e63d4a94f698c20274cd06ac2a67
Author: Translation commit bot 
Date:   Thu Oct 28 14:18:17 2021 +

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

diff --git a/contents+id.po b/contents+id.po
index bc4d81020b..7b60a08da3 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -12,8 +12,8 @@
 # raz , 2021
 # Khairul Agasta , 2021
 # ical, 2021
-# hadymaggot <9...@tuta.io>, 2021
 # Emma Peel, 2021
+# hadymaggot <9...@tuta.io>, 2021
 # 
 msgid ""
 msgstr ""
@@ -21,7 +21,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-26 15:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: hadymaggot <9...@tuta.io>, 2021\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15023,7 +15023,7 @@ msgstr "Donasi Anda akan dicocokkan oleh Friends of Tor 
hingga $100,000."
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Donasi Sekarang"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13

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

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

2021-10-28 Thread translation

commit e54ebacaa94730c45290d947b47435ef7a533956
Author: Translation commit bot 
Date:   Thu Oct 28 14:18:10 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+fr.po | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index b38a714675..82f1531d3d 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -5,11 +5,11 @@
 # Curtis Baltimore , 2019
 # walking , 2021
 # erinm, 2021
-# Matburnx , 2021
 # Yann Forget , 2021
 # PoorPockets McNewHold , 2021
 # AO , 2021
 # Emma Peel, 2021
+# Matburnx , 2021
 # 
 msgid ""
 msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-28 13:28+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: Matburnx , 2021\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -753,12 +753,12 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.title)
 msgid "Tor Browser 10.5"
-msgstr ""
+msgstr "Navigateur Tor 10.5"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid "## New Release: Tor Browser 10.5"
-msgstr ""
+msgstr "## Nouvelle version : Navigateur Tor 10.5"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
@@ -796,12 +796,12 @@ msgstr ""
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid "### What's new?"
-msgstr ""
+msgstr "### Quelles sont les nouveautÃ©sâ?"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
 msgid " V2 Onion Services Deprecation"
-msgstr ""
+msgstr " L'abandon des services oignon V2"
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
@@ -810,6 +810,9 @@ msgid ""
 "timeline), v2 onion services will be completely unreachable once Tor Browser"
 " moves to Tor 0.4.6.x in October 2021."
 msgstr ""
+"Comme [annoncÃ© l'an dernier](https://blog.torproject.org/v2-deprecation-;
+"timeline), les services oignon v2 seront complÃ©tement inaccessibles une fois"
+" que le Navigateur Tor utilisera Tor 0.4.6.x en octobre 2021."
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)
@@ -817,6 +820,8 @@ msgid ""
 "From now until then, Tor Browser will warn you when visiting a v2 onion site"
 " of its upcoming deprecation."
 msgstr ""
+"D'ici lÃ , le Navigateur Tor vous avertira de son futur abandon lorsque vous "
+"visiterez un site oignon v2."
 
 #: https//www.torproject.org/releases/tor-browser-10-5/
 #: (content/releases/tor-browser-10-5/contents+en.lrpage.body)

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

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

2021-10-28 Thread translation

commit 79820111b6b0d6601506fe28541cea7665a8887e
Author: Translation commit bot 
Date:   Thu Oct 28 14:17:21 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
---
 contents+fr.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+fr.po b/contents+fr.po
index 4cf259a131..eece0071a1 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -827,7 +827,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
 msgid "See here on how to [update Tor Browser](../updating/)."
-msgstr ""
+msgstr "Voir ici comment [mettre Ã  jour le Navigateur Tor](../fr/updating/)."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.title)

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

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

2021-10-28 Thread translation

commit 85739e307950a32092d05af0549c42f61f8592ac
Author: Translation commit bot 
Date:   Thu Oct 28 14:15:02 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 pl/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pl/aboutTor.dtd b/pl/aboutTor.dtd
index af33f2e077..6750b26001 100644
--- a/pl/aboutTor.dtd
+++ b/pl/aboutTor.dtd
@@ -47,7 +47,7 @@
 
   Thank you!
 -->
-
+

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

2021-10-28 Thread translation

commit 7825853204019554f9342df593761099e6b8e98b
Author: Translation commit bot 
Date:   Thu Oct 28 14:15:17 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+id.po | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contents+id.po b/contents+id.po
index e6a8405fa1..3aa2677c9d 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -16,8 +16,8 @@
 # raz , 2021
 # erinm, 2021
 # ical, 2021
-# hadymaggot <9...@tuta.io>, 2021
 # Emma Peel, 2021
+# hadymaggot <9...@tuta.io>, 2021
 # 
 msgid ""
 msgstr ""
@@ -25,7 +25,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-26 18:39+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: hadymaggot <9...@tuta.io>, 2021\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/1519/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18898,7 +18898,7 @@ msgstr "Donasi Anda akan dicocokkan oleh Friends of Tor 
hingga $100,000."
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Donasi Sekarang"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13

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

[tor-commits] [snowflake/main] Export ability to change the URL of NAT probe

2021-10-28 Thread cohosh

commit 0a2598a1e854243b2f69dae05d713260b4816098
Author: Cecylia Bocovich 
Date:   Tue Oct 26 15:43:36 2021 -0400

Export ability to change the URL of NAT probe
---
 proxy/lib/snowflake.go | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go
index 734657a..5f7bfd4 100644
--- a/proxy/lib/snowflake.go
+++ b/proxy/lib/snowflake.go
@@ -49,7 +49,7 @@ import (
 
 const DefaultBrokerURL = "https://snowflake-broker.torproject.net/;
 
-const DefaultProbeURL = "https://snowflake-broker.torproject.net:8443/probe;
+const DefaultNATProbeURL = "https://snowflake-broker.torproject.net:8443/probe;
 
 const DefaultRelayURL = "wss://snowflake.bamsoftware.com/"
 
@@ -99,7 +99,9 @@ type SnowflakeProxy struct {
KeepLocalAddresses bool
// RelayURL is the URL of the Snowflake server that all traffic will be 
relayed to
RelayURL string
-   shutdown chan struct{}
+   // NATProbeURL is the URL of the probe service we use for NAT checks
+   NATProbeURL string
+   shutdownchan struct{}
 }
 
 // Checks whether an IP address is a remote address for the client
@@ -499,6 +501,9 @@ func (sf *SnowflakeProxy) Start() error {
if sf.STUNURL == "" {
sf.STUNURL = DefaultSTUNURL
}
+   if sf.NATProbeURL == "" {
+   sf.NATProbeURL = DefaultNATProbeURL
+   }
 
broker, err = newSignalingServer(sf.BrokerURL, sf.KeepLocalAddresses)
if err != nil {
@@ -524,7 +529,7 @@ func (sf *SnowflakeProxy) Start() error {
tokens = newTokens(sf.Capacity)
 
// use probetest to determine NAT compatability
-   sf.checkNATType(config, DefaultProbeURL)
+   sf.checkNATType(config, sf.NATProbeURL)
log.Printf("NAT type: %s", currentNATType)
 
ticker := time.NewTicker(pollInterval)

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

[tor-commits] [snowflake/main] Modify handling of misconfigurations and defaults

2021-10-28 Thread cohosh

commit 3caa83d84de681b3cd38f4c61cfef2e9bd091176
Author: Cecylia Bocovich 
Date:   Tue Oct 26 15:40:32 2021 -0400

Modify handling of misconfigurations and defaults
---
 proxy/lib/snowflake.go | 34 --
 proxy/main.go  |  8 ++--
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go
index bd50dc8..734657a 100644
--- a/proxy/lib/snowflake.go
+++ b/proxy/lib/snowflake.go
@@ -15,7 +15,8 @@ You may then start and stop the proxy. Stopping the proxy 
will close existing co
 the proxy will not poll for more clients.
 
go func() {
-   proxy.Start()
+   err := proxy.Start()
+   // handle error
}
 
// ...
@@ -46,16 +47,12 @@ import (
"github.com/pion/webrtc/v3"
 )
 
-// DefaultBrokerURL is the snowflake broker run at 
https://snowflake-broker.torproject.net
 const DefaultBrokerURL = "https://snowflake-broker.torproject.net/;
 
-// DefaultProbeURL is run at https://snowflake-broker.torproject.net:8443/probe
 const DefaultProbeURL = "https://snowflake-broker.torproject.net:8443/probe;
 
-// DefaultRelayURL is run at wss://snowflake.torproject.net
 const DefaultRelayURL = "wss://snowflake.bamsoftware.com/"
 
-// DefaultSTUNURL is run at stun:stun.stunprotocol.org:3478
 const DefaultSTUNURL = "stun:stun.stunprotocol.org:3478"
 const pollInterval = 5 * time.Second
 
@@ -486,27 +483,35 @@ func (sf *SnowflakeProxy) runSession(sid string) {
 
 // Start configures and starts a Snowflake, fully formed and special. 
Configuration
 // values that are unset will default to their corresponding default values.
-func (sf *SnowflakeProxy) Start() {
+func (sf *SnowflakeProxy) Start() error {
+   var err error
 
+   log.Println("starting")
sf.shutdown = make(chan struct{})
 
-   log.SetFlags(log.LstdFlags | log.LUTC)
-
-   log.Println("starting")
+   // blank configurations revert to default
+   if sf.BrokerURL == "" {
+   sf.BrokerURL = DefaultBrokerURL
+   }
+   if sf.RelayURL == "" {
+   sf.RelayURL = DefaultRelayURL
+   }
+   if sf.STUNURL == "" {
+   sf.STUNURL = DefaultSTUNURL
+   }
 
-   var err error
broker, err = newSignalingServer(sf.BrokerURL, sf.KeepLocalAddresses)
if err != nil {
-   log.Fatal(err)
+   return fmt.Errorf("error configuring broker: %s", err)
}
 
_, err = url.Parse(sf.STUNURL)
if err != nil {
-   log.Fatalf("invalid stun url: %s", err)
+   return fmt.Errorf("invalid stun url: %s", err)
}
_, err = url.Parse(sf.RelayURL)
if err != nil {
-   log.Fatalf("invalid relay url: %s", err)
+   return fmt.Errorf("invalid relay url: %s", err)
}
 
config = webrtc.Configuration{
@@ -528,13 +533,14 @@ func (sf *SnowflakeProxy) Start() {
for ; true; <-ticker.C {
select {
case <-sf.shutdown:
-   return
+   return nil
default:
tokens.get()
sessionID := genSessionID()
sf.runSession(sessionID)
}
}
+   return nil
 }
 
 // Stop closes all existing connections and shuts down the Snowflake.
diff --git a/proxy/main.go b/proxy/main.go
index aabac51..368589c 100644
--- a/proxy/main.go
+++ b/proxy/main.go
@@ -11,7 +11,7 @@ import (
 )
 
 func main() {
-   capacity := flag.Int("capacity", 10, "maximum concurrent clients")
+   capacity := flag.Uint("capacity", 0, "maximum concurrent clients")
stunURL := flag.String("stun", sf.DefaultSTUNURL, "broker URL")
logFilename := flag.String("log", "", "log filename")
rawBrokerURL := flag.String("broker", sf.DefaultBrokerURL, "broker URL")
@@ -32,6 +32,7 @@ func main() {
var logOutput io.Writer = os.Stderr
log.SetFlags(log.LstdFlags | log.LUTC)
 
+   log.SetFlags(log.LstdFlags | log.LUTC)
if *logFilename != "" {
f, err := os.OpenFile(*logFilename, 
os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
if err != nil {
@@ -46,5 +47,8 @@ func main() {
log.SetOutput({Output: logOutput})
}
 
-   proxy.Start()
+   err := proxy.Start()
+   if err != nil {
+   log.Fatal(err)
+   }
 }



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

[tor-commits] [snowflake/main] Remove BytesLoggers from exported functions

2021-10-28 Thread cohosh

commit b2edf948e21c2420d3b3696c680856f106dae9f4
Author: Cecylia Bocovich 
Date:   Tue Oct 26 14:52:17 2021 -0400

Remove BytesLoggers from exported functions
---
 proxy/lib/snowflake.go  |  2 +-
 proxy/lib/util.go   | 40 
 proxy/lib/webrtcconn.go |  2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go
index e35eabd..793fa2b 100644
--- a/proxy/lib/snowflake.go
+++ b/proxy/lib/snowflake.go
@@ -306,7 +306,7 @@ func (sf *SnowflakeProxy) makePeerConnectionFromOffer(sdp 
*webrtc.SessionDescrip
 
pr, pw := io.Pipe()
conn := {pc: pc, dc: dc, pr: pr}
-   conn.bytesLogger = NewBytesSyncLogger()
+   conn.bytesLogger = newBytesSyncLogger()
 
dc.OnOpen(func() {
log.Println("OnOpen channel")
diff --git a/proxy/lib/util.go b/proxy/lib/util.go
index c6613d9..2df23eb 100644
--- a/proxy/lib/util.go
+++ b/proxy/lib/util.go
@@ -5,37 +5,37 @@ import (
"time"
 )
 
-// BytesLogger is an interface which is used to allow logging the throughput
-// of the Snowflake. A default BytesLogger(BytesNullLogger) does nothing.
-type BytesLogger interface {
+// bytesLogger is an interface which is used to allow logging the throughput
+// of the Snowflake. A default bytesLogger(bytesNullLogger) does nothing.
+type bytesLogger interface {
AddOutbound(int)
AddInbound(int)
ThroughputSummary() string
 }
 
-// BytesNullLogger Default BytesLogger does nothing.
-type BytesNullLogger struct{}
+// bytesNullLogger Default bytesLogger does nothing.
+type bytesNullLogger struct{}
 
-// AddOutbound in BytesNullLogger does nothing
-func (b BytesNullLogger) AddOutbound(amount int) {}
+// AddOutbound in bytesNullLogger does nothing
+func (b bytesNullLogger) AddOutbound(amount int) {}
 
-// AddInbound in BytesNullLogger does nothing
-func (b BytesNullLogger) AddInbound(amount int) {}
+// AddInbound in bytesNullLogger does nothing
+func (b bytesNullLogger) AddInbound(amount int) {}
 
-// ThroughputSummary in BytesNullLogger does nothing
-func (b BytesNullLogger) ThroughputSummary() string { return "" }
+// ThroughputSummary in bytesNullLogger does nothing
+func (b bytesNullLogger) ThroughputSummary() string { return "" }
 
-// BytesSyncLogger uses channels to safely log from multiple sources with 
output
+// bytesSyncLogger uses channels to safely log from multiple sources with 
output
 // occuring at reasonable intervals.
-type BytesSyncLogger struct {
+type bytesSyncLogger struct {
outboundChan, inboundChan  chan int
outbound, inbound, outEvents, inEvents int
start  time.Time
 }
 
-// NewBytesSyncLogger returns a new BytesSyncLogger and starts it loggin.
-func NewBytesSyncLogger() *BytesSyncLogger {
-   b := {
+// newBytesSyncLogger returns a new bytesSyncLogger and starts it loggin.
+func newBytesSyncLogger() *bytesSyncLogger {
+   b := {
outboundChan: make(chan int, 5),
inboundChan:  make(chan int, 5),
}
@@ -44,7 +44,7 @@ func NewBytesSyncLogger() *BytesSyncLogger {
return b
 }
 
-func (b *BytesSyncLogger) log() {
+func (b *bytesSyncLogger) log() {
for {
select {
case amount := <-b.outboundChan:
@@ -58,17 +58,17 @@ func (b *BytesSyncLogger) log() {
 }
 
 // AddOutbound add a number of bytes to the outbound total reported by the 
logger
-func (b *BytesSyncLogger) AddOutbound(amount int) {
+func (b *bytesSyncLogger) AddOutbound(amount int) {
b.outboundChan <- amount
 }
 
 // AddInbound add a number of bytes to the inbound total reported by the logger
-func (b *BytesSyncLogger) AddInbound(amount int) {
+func (b *bytesSyncLogger) AddInbound(amount int) {
b.inboundChan <- amount
 }
 
 // ThroughputSummary view a formatted summary of the throughput totals
-func (b *BytesSyncLogger) ThroughputSummary() string {
+func (b *bytesSyncLogger) ThroughputSummary() string {
var inUnit, outUnit string
units := []string{"B", "KB", "MB", "GB"}
 
diff --git a/proxy/lib/webrtcconn.go b/proxy/lib/webrtcconn.go
index 5c6192b..20b1172 100644
--- a/proxy/lib/webrtcconn.go
+++ b/proxy/lib/webrtcconn.go
@@ -29,7 +29,7 @@ type webRTCConn struct {
lock sync.Mutex // Synchronization for DataChannel destruction
once sync.Once  // Synchronization for PeerConnection destruction
 
-   bytesLogger BytesLogger
+   bytesLogger bytesLogger
 }
 
 func (c *webRTCConn) Read(b []byte) (int, error) {



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

[tor-commits] [snowflake/main] Update comments for exported items

2021-10-28 Thread cohosh

commit 0e8d41ba4b694b334775fcd9f4330d9b5b31e85c
Author: Cecylia Bocovich 
Date:   Tue Oct 26 15:28:27 2021 -0400

Update comments for exported items
---
 proxy/lib/snowflake.go | 46 ++
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go
index 85f86b2..bd50dc8 100644
--- a/proxy/lib/snowflake.go
+++ b/proxy/lib/snowflake.go
@@ -2,7 +2,8 @@
 Package snowflake_proxy provides functionality for creating, starting, and 
stopping a snowflake
 proxy.
 
-To run a proxy, you must first create a proxy configuration
+To run a proxy, you must first create a proxy configuration. Unconfigured 
fields
+will be set to the defined defaults.
 
proxy := snowflake_proxy.SnowflakeProxy{
BrokerURL: "https://snowflake-broker.example.com;,
@@ -45,24 +46,16 @@ import (
"github.com/pion/webrtc/v3"
 )
 
-// DefaultBrokerURL is the bamsoftware.com broker, 
https://snowflake-broker.bamsoftware.com
-// Changing this will change the default broker. The recommended way of 
changing
-// the broker that gets used is by passing an argument to Main.
-const DefaultBrokerURL = "https://snowflake-broker.bamsoftware.com/;
+// DefaultBrokerURL is the snowflake broker run at 
https://snowflake-broker.torproject.net
+const DefaultBrokerURL = "https://snowflake-broker.torproject.net/;
 
-// DefaultProbeURL is the torproject.org  ProbeURL, 
https://snowflake-broker.torproject.net:8443/probe
-// Changing this will change the default Probe URL. The recommended way of 
changing
-// the probe that gets used is by passing an argument to Main.
+// DefaultProbeURL is run at https://snowflake-broker.torproject.net:8443/probe
 const DefaultProbeURL = "https://snowflake-broker.torproject.net:8443/probe;
 
-// DefaultRelayURL is the bamsoftware.com  Websocket Relay, 
wss://snowflake.bamsoftware.com/
-// Changing this will change the default Relay URL. The recommended way of 
changing
-// the relay that gets used is by passing an argument to Main.
+// DefaultRelayURL is run at wss://snowflake.torproject.net
 const DefaultRelayURL = "wss://snowflake.bamsoftware.com/"
 
-// DefaultSTUNURL is a stunprotocol.org STUN URL. 
stun:stun.stunprotocol.org:3478
-// Changing this will change the default STUN URL. The recommended way of 
changing
-// the STUN Server that gets used is by passing an argument to Main.
+// DefaultSTUNURL is run at stun:stun.stunprotocol.org:3478
 const DefaultSTUNURL = "stun:stun.stunprotocol.org:3478"
 const pollInterval = 5 * time.Second
 
@@ -95,15 +88,21 @@ var (
client http.Client
 )
 
-// SnowflakeProxy is a structure which is used to configure an embedded
+// SnowflakeProxy is used to configure an embedded
 // Snowflake in another Go application.
 type SnowflakeProxy struct {
-   Capacity   uint
-   STUNURLstring
-   BrokerURL  string
+   // Capacity is the maximum number of clients a Snowflake will serve.
+   // Proxies with a capacity of 0 will accept an unlimited number of 
clients.
+   Capacity uint
+   // STUNURL is the URL of the STUN server the proxy will use
+   STUNURL string
+   // BrokerURL is the URL of the Snowflake broker
+   BrokerURL string
+   // KeepLocalAddresses indicates whether local SDP candidates will be 
sent to the broker
KeepLocalAddresses bool
-   RelayURL   string
-   shutdown   chan struct{}
+   // RelayURL is the URL of the Snowflake server that all traffic will be 
relayed to
+   RelayURL string
+   shutdown chan struct{}
 }
 
 // Checks whether an IP address is a remote address for the client
@@ -485,9 +484,8 @@ func (sf *SnowflakeProxy) runSession(sid string) {
}
 }
 
-// Start configures and starts a Snowflake, fully formed and special. In the
-// case of an empty map, defaults are configured automatically and can be
-// found in the GoDoc and in main.go
+// Start configures and starts a Snowflake, fully formed and special. 
Configuration
+// values that are unset will default to their corresponding default values.
 func (sf *SnowflakeProxy) Start() {
 
sf.shutdown = make(chan struct{})
@@ -539,7 +537,7 @@ func (sf *SnowflakeProxy) Start() {
}
 }
 
-// Stop calls close on the sf.shutdown channel shutting down the Snowflake.
+// Stop closes all existing connections and shuts down the Snowflake.
 func (sf *SnowflakeProxy) Stop() {
close(sf.shutdown)
 }



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

[tor-commits] [snowflake/main] Comment package and minor changes exports

2021-10-28 Thread cohosh

commit 84e8a183e59d0e4cea3dd572e87a221379d968f9
Author: Cecylia Bocovich 
Date:   Tue Oct 26 15:10:59 2021 -0400

Comment package and minor changes exports
---
 proxy/lib/proxy-go_test.go |  2 +-
 proxy/lib/snowflake.go | 36 +---
 proxy/lib/tokens.go|  2 +-
 proxy/lib/tokens_test.go   |  2 +-
 proxy/lib/util.go  |  2 +-
 proxy/lib/webrtcconn.go|  2 +-
 proxy/main.go  | 26 ++
 7 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/proxy/lib/proxy-go_test.go b/proxy/lib/proxy-go_test.go
index af71648..3a81a1b 100644
--- a/proxy/lib/proxy-go_test.go
+++ b/proxy/lib/proxy-go_test.go
@@ -1,4 +1,4 @@
-package snowflake
+package snowflake_proxy
 
 import (
"bytes"
diff --git a/proxy/lib/snowflake.go b/proxy/lib/snowflake.go
index 793fa2b..85f86b2 100644
--- a/proxy/lib/snowflake.go
+++ b/proxy/lib/snowflake.go
@@ -1,4 +1,27 @@
-package snowflake
+/*
+Package snowflake_proxy provides functionality for creating, starting, and 
stopping a snowflake
+proxy.
+
+To run a proxy, you must first create a proxy configuration
+
+   proxy := snowflake_proxy.SnowflakeProxy{
+   BrokerURL: "https://snowflake-broker.example.com;,
+   STUNURL: "stun:stun.stunprotocol.org:3478",
+   // ...
+   }
+
+You may then start and stop the proxy. Stopping the proxy will close existing 
connections and
+the proxy will not poll for more clients.
+
+   go func() {
+   proxy.Start()
+   }
+
+   // ...
+
+   proxy.Stop()
+*/
+package snowflake_proxy
 
 import (
"bytes"
@@ -76,11 +99,10 @@ var (
 // Snowflake in another Go application.
 type SnowflakeProxy struct {
Capacity   uint
-   StunURLstring
-   RawBrokerURL   string
+   STUNURLstring
+   BrokerURL  string
KeepLocalAddresses bool
RelayURL   string
-   LogOutput  io.Writer
shutdown   chan struct{}
 }
 
@@ -475,12 +497,12 @@ func (sf *SnowflakeProxy) Start() {
log.Println("starting")
 
var err error
-   broker, err = newSignalingServer(sf.RawBrokerURL, sf.KeepLocalAddresses)
+   broker, err = newSignalingServer(sf.BrokerURL, sf.KeepLocalAddresses)
if err != nil {
log.Fatal(err)
}
 
-   _, err = url.Parse(sf.StunURL)
+   _, err = url.Parse(sf.STUNURL)
if err != nil {
log.Fatalf("invalid stun url: %s", err)
}
@@ -492,7 +514,7 @@ func (sf *SnowflakeProxy) Start() {
config = webrtc.Configuration{
ICEServers: []webrtc.ICEServer{
{
-   URLs: []string{sf.StunURL},
+   URLs: []string{sf.STUNURL},
},
},
}
diff --git a/proxy/lib/tokens.go b/proxy/lib/tokens.go
index 1331778..d312ecf 100644
--- a/proxy/lib/tokens.go
+++ b/proxy/lib/tokens.go
@@ -1,4 +1,4 @@
-package snowflake
+package snowflake_proxy
 
 import (
"sync/atomic"
diff --git a/proxy/lib/tokens_test.go b/proxy/lib/tokens_test.go
index 702a887..4393a21 100644
--- a/proxy/lib/tokens_test.go
+++ b/proxy/lib/tokens_test.go
@@ -1,4 +1,4 @@
-package snowflake
+package snowflake_proxy
 
 import (
"testing"
diff --git a/proxy/lib/util.go b/proxy/lib/util.go
index 2df23eb..5055187 100644
--- a/proxy/lib/util.go
+++ b/proxy/lib/util.go
@@ -1,4 +1,4 @@
-package snowflake
+package snowflake_proxy
 
 import (
"fmt"
diff --git a/proxy/lib/webrtcconn.go b/proxy/lib/webrtcconn.go
index 20b1172..6e16bec 100644
--- a/proxy/lib/webrtcconn.go
+++ b/proxy/lib/webrtcconn.go
@@ -1,4 +1,4 @@
-package snowflake
+package snowflake_proxy
 
 import (
"fmt"
diff --git a/proxy/main.go b/proxy/main.go
index 12b3752..aabac51 100644
--- a/proxy/main.go
+++ b/proxy/main.go
@@ -7,42 +7,44 @@ import (
"os"
 
"git.torproject.org/pluggable-transports/snowflake.git/common/safelog"
-   "git.torproject.org/pluggable-transports/snowflake.git/proxy/lib"
+   sf "git.torproject.org/pluggable-transports/snowflake.git/proxy/lib"
 )
 
 func main() {
capacity := flag.Int("capacity", 10, "maximum concurrent clients")
-   stunURL := flag.String("stun", snowflake.DefaultSTUNURL, "broker URL")
+   stunURL := flag.String("stun", sf.DefaultSTUNURL, "broker URL")
logFilename := flag.String("log", "", "log filename")
-   rawBrokerURL := flag.String("broker", snowflake.DefaultBrokerURL, 
"broker URL")
+   rawBrokerURL := flag.String("broker", sf.DefaultBrokerURL, "broker URL")
unsafeLogging := flag.Bool("unsafe-logging", false, "prevent logs from 
being scrubbed")
keepLocalAddresses := flag.Bool("keep-local-addresses", false, "keep 
local LAN address ICE candidates")
-   relayURL := flag.String("relay", snowflake.DefaultRelayURL,

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

2021-10-28 Thread translation

commit 27a2b9ef9617515dbc68b4d5dba4c691a77e6c75
Author: Translation commit bot 
Date:   Thu Oct 28 13:47:37 2021 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 45a30760d3..4cf259a131 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -5,11 +5,11 @@
 # 926782667597d71479677e8aab0ad4dc_106149a, 2020
 # Curtis Baltimore , 2021
 # Kingouin , 2021
-# Matburnx , 2021
 # Emeric Vallespi , 2021
 # AO , 2021
 # Emma Peel, 2021
 # PoorPockets McNewHold , 2021
+# Matburnx , 2021
 # 
 msgid ""
 msgstr ""
@@ -17,7 +17,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-28 11:50+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: PoorPockets McNewHold , 
2021\n"
+"Last-Translator: Matburnx , 2021\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -701,7 +701,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
 msgid "* Launch \"Files\" (GNOME Files/Nautilus)"
-msgstr ""
+msgstr "* Lancer des \"fichiers\" (fichiers GNOME/Nautilus)"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -748,6 +748,8 @@ msgid ""
 "* When the download is complete, extract the archive with the command `tar "
 "-xf [TB archive]`."
 msgstr ""
+"* Une fois le tÃ©lÃ©chargement terminÃ©, extrayez lâarchive avec la 
commande "
+"`tar -xf [archive du NT]`."
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -755,6 +757,8 @@ msgid ""
 "* From inside the Tor Browser directory, you can launch Tor Browser by "
 "running:"
 msgstr ""
+"* Depuis le rÃ©pertoire du Navigateur Tor, vous pouvez lancer le Navigateur "
+"Tor en exÃ©cutant :"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -768,6 +772,9 @@ msgid ""
 "executable. From within this directory run: `chmod +x start-tor-"
 "browser.desktop`"
 msgstr ""
+"**Note :** Si cette commande Ã©choue Ã  l'exÃ©cution, vous devez probablement 
"
+"rendre le fichier exÃ©cutable. Depuis ce rÃ©pertoire exÃ©cutez : `chmod +x "
+"start-tor-browser.desktop`"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -784,7 +791,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
 msgid "|--|-|"
-msgstr ""
+msgstr "|--|-|"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)

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

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

2021-10-28 Thread translation

commit 7fa18e28772f393c1cc4b9f24744c909d8246b53
Author: Translation commit bot 
Date:   Thu Oct 28 13:47:09 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 fr.po | 4 ++--
 pl.po | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fr.po b/fr.po
index e368c70b90..458abaea1c 100644
--- a/fr.po
+++ b/fr.po
@@ -44,8 +44,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-04 16:34+0200\n"
-"PO-Revision-Date: 2021-10-28 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-28 13:35+\n"
+"Last-Translator: Matburnx \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/pl.po b/pl.po
index cd0574e438..76535f3ff9 100644
--- a/pl.po
+++ b/pl.po
@@ -20,6 +20,7 @@
 # Konrad W <360...@gmail.com>, 2019
 # Marcin S , 2018,2021
 # Marek Adamski, 2021
+# Marek Adamski, 2021
 # oirpos , 2015
 # phla47 , 2013
 # sebx, 2013-2015
@@ -30,8 +31,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-04 16:34+0200\n"
-"PO-Revision-Date: 2021-10-28 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-28 13:22+\n"
+"Last-Translator: Marek Adamski\n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2021-10-28 Thread translation

commit 99b118225a9e80612aab90bcbae4ad3d9200b489
Author: Translation commit bot 
Date:   Thu Oct 28 13:46:13 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 fr.po | 8 
 pl.po | 9 +
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/fr.po b/fr.po
index f2f54059a9..dcb870ed40 100644
--- a/fr.po
+++ b/fr.po
@@ -44,8 +44,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-04 16:34+0200\n"
-"PO-Revision-Date: 2021-10-28 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-28 13:35+\n"
+"Last-Translator: Matburnx \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1181,11 +1181,11 @@ msgstr "Langue, mot de passe dâadministration et 
paramÃ¨tres supplÃ©mentaires"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
 msgid "Tor Bridge"
-msgstr ""
+msgstr "Pont Tor"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Save the last bridge that you used to connect to Tor"
-msgstr ""
+msgstr "Enregistrer le dernier pont que vous avez utilisÃ© pour vous connecter 
Ã  Tor"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "Browser Bookmarks"
diff --git a/pl.po b/pl.po
index 389d0d2e15..b92ef138bd 100644
--- a/pl.po
+++ b/pl.po
@@ -20,6 +20,7 @@
 # Konrad W <360...@gmail.com>, 2019
 # Marcin S , 2018,2021
 # Marek Adamski, 2021
+# Marek Adamski, 2021
 # oirpos , 2015
 # phla47 , 2013
 # sebx, 2013-2015
@@ -30,8 +31,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-04 16:34+0200\n"
-"PO-Revision-Date: 2021-10-28 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-28 13:22+\n"
+"Last-Translator: Marek Adamski\n"
 "Language-Team: Polish 
(http://www.transifex.com/otf/torproject/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1177,11 +1178,11 @@ msgstr "JÄzyk, hasÅo administracyjne i dodatkowe 
ustawienia"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
 msgid "Tor Bridge"
-msgstr ""
+msgstr "Mostek Tor"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Save the last bridge that you used to connect to Tor"
-msgstr ""
+msgstr "Zapisz ostatni mostek, ktÃ³rego uÅ¼yto do poÅÄczenia z sieciÄ Tor"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "Browser Bookmarks"

___
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.6] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit 27caad6f5c3229a9f1c126277c1b5b0051a32445
Author: David Goulet 
Date:   Thu Oct 28 09:41:56 2021 -0400

version: Missing version update in couple files

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

diff --git a/configure.ac b/configure.ac
index 387ad11ffd..1eb613f321 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], 
[Flags passed to config
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.6.8
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.6.8-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index c59769cdb8..be35cd0459 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.6.8"
+!define VERSION "0.4.6.8-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index ac4a8e31b2..4bbeced38d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.6.8"
+#define VERSION "0.4.6.8-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



___
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.6] Merge branch 'maint-0.4.6' into release-0.4.6

2021-10-28 Thread dgoulet

commit d4f68f1c69cf53d3be71a6111c8a13049dae2a36
Merge: c8872ca88a fa405ca27f
Author: David Goulet 
Date:   Thu Oct 28 09:42:43 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

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

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

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

2021-10-28 Thread dgoulet

commit fb2b8339cb6badc48b0956f1d93aeb818e21e52c
Merge: 19b6196f67 7c4fd150cd
Author: David Goulet 
Date:   Thu Oct 28 09:42:43 2021 -0400

Merge branch 'maint-0.4.5' into release-0.4.5

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

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

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

2021-10-28 Thread dgoulet

commit fa405ca27f1aa00d0319ce0bbc99aff99a96e093
Merge: 27caad6f5c 7c4fd150cd
Author: David Goulet 
Date:   Thu Oct 28 09:42:32 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6




___
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.6] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit 97c976778aa67f7bdb021904041bece17a8f58c5
Author: David Goulet 
Date:   Thu Oct 28 09:41:13 2021 -0400

version: Missing version update in couple files

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

diff --git a/configure.ac b/configure.ac
index c602d2c5c9..52ec019d01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.5.11-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index afcea51596..5e09f0045b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.11"
+!define VERSION "0.4.5.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5b8c9a635e..3d3b6ba03e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.11"
+#define VERSION "0.4.5.11-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



___
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.6] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-28 Thread dgoulet

commit 7c4fd150cd19ebdafe64b800282184014b43d9fb
Merge: 97c976778a fa438b6cf0
Author: David Goulet 
Date:   Thu Oct 28 09:42:25 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




___
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.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-28 Thread dgoulet

commit 7c4fd150cd19ebdafe64b800282184014b43d9fb
Merge: 97c976778a fa438b6cf0
Author: David Goulet 
Date:   Thu Oct 28 09:42:25 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




___
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.6] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit fa438b6cf023df22e78dc2640bcd00da7d08846c
Author: David Goulet 
Date:   Thu Oct 28 09:40:50 2021 -0400

version: Missing version update in couple files

Signed-off-by: David Goulet 
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7a6566a2c3..1815f65e98 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.17"
+!define VERSION "0.3.5.17-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index f32c725b07..8170b1bcb4 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.17"
+#define VERSION "0.3.5.17-dev"
 
 
 



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

[tor-commits] [tor/release-0.4.5] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit 97c976778aa67f7bdb021904041bece17a8f58c5
Author: David Goulet 
Date:   Thu Oct 28 09:41:13 2021 -0400

version: Missing version update in couple files

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

diff --git a/configure.ac b/configure.ac
index c602d2c5c9..52ec019d01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.5.11-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index afcea51596..5e09f0045b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.11"
+!define VERSION "0.4.5.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5b8c9a635e..3d3b6ba03e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.11"
+#define VERSION "0.4.5.11-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



___
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.5] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit fa438b6cf023df22e78dc2640bcd00da7d08846c
Author: David Goulet 
Date:   Thu Oct 28 09:40:50 2021 -0400

version: Missing version update in couple files

Signed-off-by: David Goulet 
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7a6566a2c3..1815f65e98 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.17"
+!define VERSION "0.3.5.17-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index f32c725b07..8170b1bcb4 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.17"
+#define VERSION "0.3.5.17-dev"
 
 
 



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

[tor-commits] [tor/release-0.3.5] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit fa438b6cf023df22e78dc2640bcd00da7d08846c
Author: David Goulet 
Date:   Thu Oct 28 09:40:50 2021 -0400

version: Missing version update in couple files

Signed-off-by: David Goulet 
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7a6566a2c3..1815f65e98 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.17"
+!define VERSION "0.3.5.17-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index f32c725b07..8170b1bcb4 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.17"
+#define VERSION "0.3.5.17-dev"
 
 
 



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

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

2021-10-28 Thread dgoulet

commit e0a96cf2b6d2c21e0c8db0a285c0a86286e47821
Merge: e51b25c02d fa438b6cf0
Author: David Goulet 
Date:   Thu Oct 28 09:42:43 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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

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

[tor-commits] [tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-28 Thread dgoulet

commit 7c4fd150cd19ebdafe64b800282184014b43d9fb
Merge: 97c976778a fa438b6cf0
Author: David Goulet 
Date:   Thu Oct 28 09:42:25 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




___
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.6] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-28 Thread dgoulet

commit fa405ca27f1aa00d0319ce0bbc99aff99a96e093
Merge: 27caad6f5c 7c4fd150cd
Author: David Goulet 
Date:   Thu Oct 28 09:42:32 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6

___
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.6] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit 97c976778aa67f7bdb021904041bece17a8f58c5
Author: David Goulet 
Date:   Thu Oct 28 09:41:13 2021 -0400

version: Missing version update in couple files

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

diff --git a/configure.ac b/configure.ac
index c602d2c5c9..52ec019d01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.5.11-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index afcea51596..5e09f0045b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.11"
+!define VERSION "0.4.5.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5b8c9a635e..3d3b6ba03e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.11"
+#define VERSION "0.4.5.11-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



___
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.6] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit 27caad6f5c3229a9f1c126277c1b5b0051a32445
Author: David Goulet 
Date:   Thu Oct 28 09:41:56 2021 -0400

version: Missing version update in couple files

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

diff --git a/configure.ac b/configure.ac
index 387ad11ffd..1eb613f321 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], 
[Flags passed to config
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.6.8
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.6.8-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index c59769cdb8..be35cd0459 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.6.8"
+!define VERSION "0.4.6.8-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index ac4a8e31b2..4bbeced38d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.6.8"
+#define VERSION "0.4.6.8-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



___
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.5] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-28 Thread dgoulet

commit 7c4fd150cd19ebdafe64b800282184014b43d9fb
Merge: 97c976778a fa438b6cf0
Author: David Goulet 
Date:   Thu Oct 28 09:42:25 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5

___
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.6] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit fa438b6cf023df22e78dc2640bcd00da7d08846c
Author: David Goulet 
Date:   Thu Oct 28 09:40:50 2021 -0400

version: Missing version update in couple files

Signed-off-by: David Goulet 
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7a6566a2c3..1815f65e98 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.17"
+!define VERSION "0.3.5.17-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index f32c725b07..8170b1bcb4 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.17"
+#define VERSION "0.3.5.17-dev"
 
 
 



___
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.5] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit fa438b6cf023df22e78dc2640bcd00da7d08846c
Author: David Goulet 
Date:   Thu Oct 28 09:40:50 2021 -0400

version: Missing version update in couple files

Signed-off-by: David Goulet 
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7a6566a2c3..1815f65e98 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.17"
+!define VERSION "0.3.5.17-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index f32c725b07..8170b1bcb4 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.17"
+#define VERSION "0.3.5.17-dev"
 
 
 



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

[tor-commits] [tor/maint-0.3.5] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit fa438b6cf023df22e78dc2640bcd00da7d08846c
Author: David Goulet 
Date:   Thu Oct 28 09:40:50 2021 -0400

version: Missing version update in couple files

Signed-off-by: David Goulet 
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7a6566a2c3..1815f65e98 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.17"
+!define VERSION "0.3.5.17-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index f32c725b07..8170b1bcb4 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.17"
+#define VERSION "0.3.5.17-dev"
 
 
 

___
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.5] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit 97c976778aa67f7bdb021904041bece17a8f58c5
Author: David Goulet 
Date:   Thu Oct 28 09:41:13 2021 -0400

version: Missing version update in couple files

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

diff --git a/configure.ac b/configure.ac
index c602d2c5c9..52ec019d01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.5.11-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index afcea51596..5e09f0045b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.11"
+!define VERSION "0.4.5.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5b8c9a635e..3d3b6ba03e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.11"
+#define VERSION "0.4.5.11-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

[tor-commits] [tor/main] Merge branch 'maint-0.4.6'

2021-10-28 Thread dgoulet

commit a543657f3430bcb695cd1d4109880e97388bff2b
Merge: 8c970963a9 fa405ca27f
Author: David Goulet 
Date:   Thu Oct 28 09:42:38 2021 -0400

Merge branch 'maint-0.4.6'

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

[tor-commits] [tor/main] Merge branch 'maint-0.4.5' into maint-0.4.6

2021-10-28 Thread dgoulet

commit fa405ca27f1aa00d0319ce0bbc99aff99a96e093
Merge: 27caad6f5c 7c4fd150cd
Author: David Goulet 
Date:   Thu Oct 28 09:42:32 2021 -0400

Merge branch 'maint-0.4.5' into maint-0.4.6




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

[tor-commits] [tor/main] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit 27caad6f5c3229a9f1c126277c1b5b0051a32445
Author: David Goulet 
Date:   Thu Oct 28 09:41:56 2021 -0400

version: Missing version update in couple files

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

diff --git a/configure.ac b/configure.ac
index 387ad11ffd..1eb613f321 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], 
[Flags passed to config
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.6.8
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.6.8-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index c59769cdb8..be35cd0459 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.6.8"
+!define VERSION "0.4.6.8-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index ac4a8e31b2..4bbeced38d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.6.8"
+#define VERSION "0.4.6.8-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

[tor-commits] [tor/main] Merge branch 'maint-0.3.5' into maint-0.4.5

2021-10-28 Thread dgoulet

commit 7c4fd150cd19ebdafe64b800282184014b43d9fb
Merge: 97c976778a fa438b6cf0
Author: David Goulet 
Date:   Thu Oct 28 09:42:25 2021 -0400

Merge branch 'maint-0.3.5' into maint-0.4.5




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

[tor-commits] [tor/main] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit fa438b6cf023df22e78dc2640bcd00da7d08846c
Author: David Goulet 
Date:   Thu Oct 28 09:40:50 2021 -0400

version: Missing version update in couple files

Signed-off-by: David Goulet 
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 7a6566a2c3..1815f65e98 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.5.17"
+!define VERSION "0.3.5.17-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index f32c725b07..8170b1bcb4 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.5.17"
+#define VERSION "0.3.5.17-dev"
 
 
 



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

[tor-commits] [tor/main] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit 97c976778aa67f7bdb021904041bece17a8f58c5
Author: David Goulet 
Date:   Thu Oct 28 09:41:13 2021 -0400

version: Missing version update in couple files

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

diff --git a/configure.ac b/configure.ac
index c602d2c5c9..52ec019d01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ configure_flags="$*"
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-26"], # for 0.4.5.11
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.5.11-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index afcea51596..5e09f0045b 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.5.11"
+!define VERSION "0.4.5.11-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5b8c9a635e..3d3b6ba03e 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.5.11"
+#define VERSION "0.4.5.11-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



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

[tor-commits] [tor/main] version: Missing version update in couple files

2021-10-28 Thread dgoulet

commit 8c970963a9fadd9b5fe3dbfe6835871dede54a3e
Author: David Goulet 
Date:   Thu Oct 28 09:42:08 2021 -0400

version: Missing version update in couple files

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

diff --git a/configure.ac b/configure.ac
index 17ac739b74..366df64609 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], 
[Flags passed to config
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2021-09-17"], # for 0.4.7.1-alpha
+AC_DEFINE(APPROX_RELEASE_DATE, ["2021-10-28"], # for 0.4.7.2-alpha-dev
   [Approximate date when this software was released. (Updated when the 
version changes.)])
 
 # "foreign" means we don't follow GNU package layout standards
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 5b285a5ca9..51ec48835a 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.7.1-alpha"
+!define VERSION "0.4.7.2-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 2d97ea858a..7c9b01ac34 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -217,7 +217,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.7.1-alpha"
+#define VERSION "0.4.7.2-alpha-dev"
 
 #define HAVE_STRUCT_SOCKADDR_IN6
 #define HAVE_STRUCT_IN6_ADDR



___
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.6] changes: Clean leftovers after releasing 0.4.6.8

2021-10-28 Thread dgoulet

commit c8872ca88a9742ce714e55240196be0b9f91c9ae
Author: David Goulet 
Date:   Thu Oct 28 09:18:29 2021 -0400

changes: Clean leftovers after releasing 0.4.6.8

Signed-off-by: David Goulet 
---
 changes/bug40371|  6 --
 changes/ticket30477 |  4 
 changes/ticket40337 | 16 
 changes/ticket40434 |  6 --
 changes/ticket40474 |  5 -
 changes/ticket40476 |  3 ---
 changes/ticket40491 |  7 ---
 changes/ticket40493 |  2 --
 8 files changed, 49 deletions(-)

diff --git a/changes/bug40371 b/changes/bug40371
deleted file mode 100644
index 8cc7117f9f..00
--- a/changes/bug40371
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfixes (compatibility):
-- Fix compatibility with the most recent Libevent versions, which
-  no longer have an evdns_set_random_bytes() function.  Because
-  this function has been a no-op since Libevent 2.0.4-alpha,
-  it is safe for us to just stop calling it.  Fixes bug 40371;
-  bugfix on 0.2.1.7-alpha.
diff --git a/changes/ticket30477 b/changes/ticket30477
deleted file mode 100644
index 379fc4e7eb..00
--- a/changes/ticket30477
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (bridge):
-- We now announce the URL to Tor's new bridge status at
-  https://bridges.torproject.org/ when Tor is configured to run as a bridge
-  relay. Closes ticket 30477.
diff --git a/changes/ticket40337 b/changes/ticket40337
deleted file mode 100644
index 1c86fc4c99..00
--- a/changes/ticket40337
+++ /dev/null
@@ -1,16 +0,0 @@
-  o Minor features (testing):
-- On a testing network, relays can now use the
-  TestingMinTimeToReportBandwidth option to change
-  the smallest amount of time over which they're willing to report
-  their observed maximum bandwidth.  Previously, this was fixed
-  at 1 day.  For safety, values under 2 hours are only supported on
-  testing networks. Part of a fix for ticket 40337.
-
-  o Minor features (testing):
-- Relays on testing networks now report their observed bandwidths
-  immediately from startup.  Previously, they waited
-  until they had been running for a full day.   Closes ticket
-  40337.
-- Relays on testing networks no longer rate-limit how frequently
-  they are willing to report new bandwidth measurements. Part of a fix
-  for ticket 40337.
diff --git a/changes/ticket40434 b/changes/ticket40434
deleted file mode 100644
index 988bb416be..00
--- a/changes/ticket40434
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor bugfix (onion service):
-- Do not flag an HSDir as non-running in case the descriptor upload or
-  fetch fails. An onion service closes pending directory connections
-  before uploading a new descriptor which can thus lead to wrongly
-  flagging many relays and thus affecting circuit building path selection.
-  Fixes bug 40434; bugfix on 0.2.0.13-alpha.
diff --git a/changes/ticket40474 b/changes/ticket40474
deleted file mode 100644
index d2a7231106..00
--- a/changes/ticket40474
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (onion service, TROVE-2021-008):
-- Only log once any v2 access attempts in order to not pollute the logs
-  with warnings and avoid recording the times on disk when v2 access was
-  attempted. Important to note that the onion address was _never_ logged.
-  That is a Low security issue. Fixes bug 40474; bugfix on 0.4.5.8.
diff --git a/changes/ticket40476 b/changes/ticket40476
deleted file mode 100644
index 86e4377a1c..00
--- a/changes/ticket40476
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfix (onion service):
-- Improve logging when a bad HS version is given. Fixes bug 40476; bugfix 
on
-  0.4.6.1-alpha.
diff --git a/changes/ticket40491 b/changes/ticket40491
deleted file mode 100644
index 01c6c7d748..00
--- a/changes/ticket40491
+++ /dev/null
@@ -1,7 +0,0 @@
-  o Major bugfixes (relay, overload state):
-- Report the general overload state for DNS timeout errors only if X% of 
all
-  DNS queries over Y seconds are errors. Before that, it only took 1 
timeout
-  to report the overload state which was just too low of a threshold. The X
-  and Y values are 1% and 10 minutes respectively but they are also
-  controlled by consensus parameters. Fixes bug 40491; bugfix on
-  0.4.6.1-alpha.
diff --git a/changes/ticket40493 b/changes/ticket40493
deleted file mode 100644
index eb9baf916b..00
--- a/changes/ticket40493
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Minor features (fallbackdir):
-- Regenerate fallback directories for October 2021. Close ticket 40493.

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

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

2021-10-28 Thread translation

commit cbb3af384d8a9e75809efc22dcb332c0c70d5784
Author: Translation commit bot 
Date:   Thu Oct 28 13:18:00 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+id.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+id.po b/contents+id.po
index 052d50e94d..ed0289b5a2 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -1613,7 +1613,7 @@ msgstr "Donasi Anda akan dicocokkan oleh Friends of Tor 
hingga $100,000."
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Donasi Sekarang"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13

___
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

2021-10-28 Thread translation

commit 863983e46065b91ca5876575e817b978d1227141
Author: Translation commit bot 
Date:   Thu Oct 28 13:17:10 2021 +

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

diff --git a/contents+id.po b/contents+id.po
index 499ae0d559..5e0d4ccec8 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -54,7 +54,7 @@ msgstr "Donasi Anda akan dicocokkan oleh Friends of Tor 
hingga $100,000."
 
 #: (dynamic)
 msgid "Donate now"
-msgstr ""
+msgstr "Donasi Sekarang"
 
 #: (dynamic)
 msgid "Donate"
@@ -772,6 +772,8 @@ msgid ""
 "Some additional flags that can be used with `start-tor-browser.desktop` from"
 " the command-line:"
 msgstr ""
+"Beberapa flag tambahan yang dapat digunakan dengan `start-tor-"
+"browser.desktop` dari baris perintah:"
 
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
@@ -826,7 +828,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/installation/
 #: (content/installation/contents+en.lrtopic.body)
 msgid "See here on how to [update Tor Browser](../updating/)."
-msgstr ""
+msgstr "Lihat di sini tentang cara [memperbarui Tor Browser](../updating/)."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.title)

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

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

2021-10-28 Thread translation

commit 0f3627027787fe0912733880dc491eabaa5304a6
Author: Translation commit bot 
Date:   Thu Oct 28 13:16:50 2021 +

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

diff --git a/es.po b/es.po
index e8396e40dd..17f0b9cbf2 100644
--- a/es.po
+++ b/es.po
@@ -22,8 +22,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-04 16:34+0200\n"
-"PO-Revision-Date: 2021-10-28 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-28 13:09+\n"
+"Last-Translator: eulalio barbero espinosa \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2021-10-28 Thread translation

commit 040dcd33bfd3706696665549224cf58def46715e
Author: Translation commit bot 
Date:   Thu Oct 28 13:15:59 2021 +

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

diff --git a/es.po b/es.po
index a72ca9cc90..b901dc1764 100644
--- a/es.po
+++ b/es.po
@@ -22,8 +22,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-04 16:34+0200\n"
-"PO-Revision-Date: 2021-10-28 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-28 13:09+\n"
+"Last-Translator: eulalio barbero espinosa \n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1159,11 +1159,11 @@ msgstr "Idioma, contraseÃ±a de administraciÃ³n y 
configuraciÃ³n adicional"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
 msgid "Tor Bridge"
-msgstr ""
+msgstr "Puente de Tor"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Save the last bridge that you used to connect to Tor"
-msgstr ""
+msgstr "Guarda el Ãºltimo puente que has usado para conectarte a Tor"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "Browser Bookmarks"

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

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

2021-10-28 Thread translation

commit 98c9342dc7e1313eb74e5aa25b61848ff24d04e1
Author: Translation commit bot 
Date:   Thu Oct 28 13:15:30 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
---
 contents+id.po | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/contents+id.po b/contents+id.po
index d2ee00e409..5ffe3653d5 100644
--- a/contents+id.po
+++ b/contents+id.po
@@ -72,6 +72,8 @@ msgid ""
 "- Step 3: Download Tor Browser from one of the providers. When done, check "
 "the integrity of the downloaded file by verifying its signature."
 msgstr ""
+"- Langkah 3: Unduh Tor Browser dari salah satu penyedia. Setelah selesai, "
+"periksa integritas berkas yang diunduh dengan memverifikasi tanda tangannya."
 
 #: https//gettor.torproject.org/ (content/contents+en.lrpage.body)
 msgid "- Step 4: If required, get some bridges!"
@@ -167,6 +169,10 @@ msgid ""
 "want to use bridges. To use pluggable transports, click 'Configure' in the "
 "Tor Launcher window that appears when you first run Tor Browser."
 msgstr ""
+"Saat Anda memulai Tor Browser untuk pertama kalinya, Anda akan ditanya "
+"apakah Anda ingin menggunakan bridge. Untuk menggunakan transport pluggable,"
+" klik 'Konfigurasi' di jendela Tor Launcher yang muncul saat Anda pertama "
+"kali menjalankan Tor Browser."
 
 #: https//gettor.torproject.org/ (content/contents+en.lrpage.body)
 msgid ""
@@ -175,6 +181,10 @@ msgid ""
 "bar. Once in Preferences, navigate to 'Tor' from the menu on the left of the"
 " screen."
 msgstr ""
+"Anda juga dapat mengonfigurasi transport pluggable saat Tor Browser sedang "
+"berjalan dengan memilih 'Preferensi' dari menu pengaturan di sebelah kanan "
+"bilah alamat. Setelah berada di Preferensi, navigasikan ke 'Tor' dari menu "
+"di sebelah kiri layar."
 
 #: https//gettor.torproject.org/ (content/contents+en.lrpage.body)
 msgid ""
@@ -182,6 +192,9 @@ msgid ""
 "bridge.' Click on the drop-down menu and select the pluggable transport "
 "you'd like to use."
 msgstr ""
+"Pada bagian 'Bridge', pilih 'Gunakan bridge' dan 'Pilih bridge internal'. "
+"Klik menu tarik-turun dan pilih transportasi yang dapat dipasang yang ingin "
+"Anda gunakan."
 
 #: https//gettor.torproject.org/ (content/contents+en.lrpage.body)
 msgid "Click 'OK' to save your settings."
@@ -228,7 +241,7 @@ msgstr "Donasi Anda akan dicocokkan oleh Friends of Tor 
hingga $100,000."
 
 #: lego/templates/banner.html:32 templates/banner.html:32
 msgid "Donate now"
-msgstr ""
+msgstr "Donasi Sekarang"
 
 #: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"

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

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

2021-10-28 Thread translation

commit 41b60acd2995706db5a910e1dedb9f6ee4d5b30b
Author: Translation commit bot 
Date:   Thu Oct 28 12:48:49 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
---
 contents+es.po| 56 +--
 contents+hu.po| 52 +++
 contents+pt-BR.po | 60 +++
 contents+tr.po| 52 +++
 contents.pot  | 53 
 5 files changed, 137 insertions(+), 136 deletions(-)

diff --git a/contents+es.po b/contents+es.po
index 0fe1a31a50..ab7b47f61b 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -2,26 +2,25 @@
 # Translators:
 # Edward Navarro, 2019
 # Martus Translations , 2019
-# de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2019
 # eulalio barbero espinosa , 2019
 # IDRASSI Mounir , 2019
 # Carlos Guerra , 2019
 # Nicolas Sera-Leyva , 2019
 # walking , 2021
+# erinm, 2021
 # David Figuera , 2021
 # strel, 2021
 # Zuhualime Akoochimoya, 2021
-# erinm, 2021
-# Gus, 2021
 # Emma Peel, 2021
+# de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2021
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-08 13:14+CET\n"
+"POT-Creation-Date: 2021-10-28 13:28+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Emma Peel, 2021\n"
+"Last-Translator: de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2021\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"
@@ -281,17 +280,6 @@ msgstr ""
 "La mayor noticia para 3.12 es que cambiamos completamente los mÃ©todos de "
 "instalaciÃ³n de Tails. "
 
-#: https//www.torproject.org/press/-new-release-tor/
-#: (content/press/new-release-tor/contents+en.lrpost.summary)
-msgid ""
-"There's a new alpha release available for download. If you build Tor from "
-"source, you can download the source code for 0.4.0.1-alpha from the usual "
-"place on the website."
-msgstr ""
-"Hay una nueva versiÃ³n alfa disponible para descargar. Si creas Tor desde el "
-"cÃ³digo fuente, puedes descargar dicho cÃ³digo para 0.4.0.1-alpha desde el "
-"lugar habitual en el sitio web."
-
 #: https//www.torproject.org/press/-new-release-tor-browser/
 #: (content/press/new-release-tor-browser/contents+en.lrpost.summary)
 msgid ""
@@ -305,6 +293,17 @@ msgstr ""
 "alpha\">del proyecto y tambiÃ©n desde nuestro directorio de distribuciÃ³n."
 
+#: https//www.torproject.org/press/-new-release-tor/
+#: (content/press/new-release-tor/contents+en.lrpost.summary)
+msgid ""
+"There's a new alpha release available for download. If you build Tor from "
+"source, you can download the source code for 0.4.0.1-alpha from the usual "
+"place on the website."
+msgstr ""
+"Hay una nueva versiÃ³n alfa disponible para descargar. Si creas Tor desde el "
+"cÃ³digo fuente, puedes descargar dicho cÃ³digo para 0.4.0.1-alpha desde el "
+"lugar habitual en el sitio web."
+
 #: https//www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lrpage.title)
 msgid "Tor Browser 9.5"
@@ -1620,25 +1619,26 @@ msgid "Close banner"
 msgstr "Cerrar banner"
 
 #: lego/templates/banner.html:11 templates/banner.html:11
-msgid "Use a Mask, Use Tor."
-msgstr ""
+msgid "Privacy is a human right"
+msgstr "La privacidad es un derecho humano."
 
-#: lego/templates/banner.html:20 templates/banner.html:20
-msgid "Resist the surveillance pandemic."
+#: lego/templates/banner.html:15 templates/banner.html:15
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
 msgstr ""
 
-#: lego/templates/banner.html:32 templates/banner.html:32
+#: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
 msgstr "A tu donaciÃ³n la emparejarÃ¡ Amigos de Tor hasta $100.000."
 
-#: lego/templates/banner.html:40 templates/banner.html:40
-msgid "DONATE NOW"
+#: lego/templates/banner.html:31 lego/templates/banner.html:33
+#: templates/banner.html:31 templates/banner.html:33
+msgid "Donate now"
 msgstr ""
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
-#: lego/templates/navbar.html:83 templates/footer.html:13
+#: lego/templates/navbar.html:96 templates/footer.html:13
 #: templates/footer.html:22 templates/hero-home.html:13
-#: templates/navbar.html:83
+#: templates/navbar.html:96
 msgid "Download Tor Browser"
 msgstr "Descargar Tor Browser"
 
@@ -1683,8 +1683,8 @@ msgstr "Recibe noticias mensuales y oportunidades del 
Proyecto Tor:"
 msgid "Sign up"
 msgstr "Registrarse"
 
-#: lego/templates/footer.html:98 templates/footer-min.html:67
-#: templates/footer.html:98
+#: lego/templates/footer.html:101 templates/footer-min.html:67
+#: templates/footer.html:101
 #, python-format
 msgid ""
 "Trademark, copyright notices, and rules for

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

2021-10-28 Thread translation

commit 3bfde78818d1fa461a2df7493edff910d704f34b
Author: Translation commit bot 
Date:   Thu Oct 28 12:46:57 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 sq.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sq.po b/sq.po
index 67fd93bce6..8e6510079d 100644
--- a/sq.po
+++ b/sq.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-04 16:34+0200\n"
-"PO-Revision-Date: 2021-10-28 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-28 12:19+\n"
+"Last-Translator: Besnik Bleta \n"
 "Language-Team: Albanian 
(http://www.transifex.com/otf/torproject/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2021-10-28 Thread translation

commit 44d79ef8a4cbcab3844e3fbd0989afcbb1fd4b77
Author: Translation commit bot 
Date:   Thu Oct 28 12:46:01 2021 +

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

diff --git a/sq.po b/sq.po
index ea60f49e69..e63d08a4c8 100644
--- a/sq.po
+++ b/sq.po
@@ -12,8 +12,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-04 16:34+0200\n"
-"PO-Revision-Date: 2021-10-28 09:25+\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-10-28 12:19+\n"
+"Last-Translator: Besnik Bleta \n"
 "Language-Team: Albanian 
(http://www.transifex.com/otf/torproject/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1149,11 +1149,11 @@ msgstr "Rregullime gjuhe, fjalÃ«kalimi administrimi dhe 
tÃ« tjera"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
 msgid "Tor Bridge"
-msgstr ""
+msgstr "UrÃ« Tor"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
 msgid "Save the last bridge that you used to connect to Tor"
-msgstr ""
+msgstr "Ruani urÃ«n e fundit qÃ« pÃ«rdorÃ«t pÃ«r tâu lidhur nÃ« Tor"
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98
 msgid "Browser Bookmarks"

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

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

2021-10-28 Thread translation

commit 4f480881bc890d417e06eeb313775ab966b268af
Author: Translation commit bot 
Date:   Thu Oct 28 12:45:06 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
---
 de/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de/aboutTor.dtd b/de/aboutTor.dtd
index 1c121d9dae..e969dd7698 100644
--- a/de/aboutTor.dtd
+++ b/de/aboutTor.dtd
@@ -47,7 +47,7 @@
 
   Thank you!
 -->
-
+

[tor-commits] [tpo/translations] content and lego updates

2021-10-28 Thread emmapeel

commit f94392348537e0133ab739ab0a4b0991fc3b5347
Author: emma peel 
Date:   Thu Oct 28 10:17:54 2021 +0200

content and lego updates
---
 content/about/people/dgoulet/contents.lr |  2 +-
 content/about/people/egypcio/contents.lr |  2 ++
 content/about/people/eta/contents.lr | 22 ++
 content/about/people/jvoisin/contents.lr | 21 +
 lego |  2 +-
 templates/press.html |  2 +-
 6 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/content/about/people/dgoulet/contents.lr 
b/content/about/people/dgoulet/contents.lr
index 80ecc2e8..6d582346 100644
--- a/content/about/people/dgoulet/contents.lr
+++ b/content/about/people/dgoulet/contents.lr
@@ -14,4 +14,4 @@ image: /static/images/people/dgoulet.png
 ---
 description:
 
-Tor development team focusing on onion services and our torsocks maintainer.
+Tor development. Member of the Network Team.
diff --git a/content/about/people/egypcio/contents.lr 
b/content/about/people/egypcio/contents.lr
index 7bb3faf4..151b1ea6 100644
--- a/content/about/people/egypcio/contents.lr
+++ b/content/about/people/egypcio/contents.lr
@@ -8,6 +8,8 @@ name: Vinicius Zavam
 ---
 nickname: egypcio
 ---
+pronoun: he
+---
 twitter_handle: egypcio
 ---
 gpg: /static/keys/egypcio.txt
diff --git a/content/about/people/eta/contents.lr 
b/content/about/people/eta/contents.lr
new file mode 100644
index ..064236ea
--- /dev/null
+++ b/content/about/people/eta/contents.lr
@@ -0,0 +1,22 @@
+_model: person
+---
+_hidden: yes
+---
+role: core
+---
+name: eta
+---
+twitter_handle: eta9
+---
+pronoun: she/her
+---
+nickname: eta
+---
+gpg: https://eta.st/tor-pubkey.asc
+---
+image: /static/images/people/eta.png
+---
+
+description:
+
+Member of the Network Team, working on 
[Arti](https://gitlab.torproject.org/tpo/core/arti).
diff --git a/content/about/people/jvoisin/contents.lr 
b/content/about/people/jvoisin/contents.lr
new file mode 100644
index ..588b04e2
--- /dev/null
+++ b/content/about/people/jvoisin/contents.lr
@@ -0,0 +1,21 @@
+_model: person
+---
+_hidden: yes
+---
+role: core
+---
+name: Julien Voisin
+---
+twitter_handle: dustriorg
+---
+pronoun: he
+---
+nickname: jvoisin
+---
+gpg: 
https://db.torproject.org/fetchkey.cgi?fingerprint=9FCDEE9E1A381F311EA62A7404D041E8171901CC
+---
+image: /static/images/people/jvoisin.jpg
+---
+description:
+
+Sysadmin for [Nos Oignons](https://nos-oignons.net) and maintainer of 
[mat2](https://0xacab.org/jvoisin/mat2).
diff --git a/lego b/lego
index 5db6fa6d..c615f285 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 5db6fa6df1871a3ded1ba00530fccbb2cd74b87b
+Subproject commit c615f285b3ecdde226b02809f2181aeb30ee7ca7
diff --git a/templates/press.html b/templates/press.html
index 2ea49a82..5a07e169 100644
--- a/templates/press.html
+++ b/templates/press.html
@@ -9,7 +9,7 @@
 https://support.torproject.org/; 
title="Tor Project Support Portal" target="_blank">{{ _('Visit our Support 
Portal') }}
   
   
-https://webchat.oftc.net/; title="Tor 
Project IRC" target="_blank">{{ _('Ask us on #tor') }}
+https://webchat.oftc.net/?channels=tor; title="Tor Project IRC" 
target="_blank">{{ _('Ask us on #tor') }}
   
   
 http://lists.torproject.org/; 
title="Tor Project Mailing List" target="_blank">{{ _('Write to a mailing 
list') }}



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

[tor-commits] [tpo/translations] update translation file

2021-10-28 Thread emmapeel

commit fa0aa5c5f0c9fba8428cbf70e12ef698939cde91
Author: emma peel 
Date:   Thu Oct 28 14:28:48 2021 +0200

update translation file
---
 i18n/contents.pot | 41 +
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 323d6464..832ca1c0 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-08 13:14+CET\n"
+"POT-Creation-Date: 2021-10-28 13:28+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -239,14 +239,6 @@ msgid ""
 "methods for Tails."
 msgstr ""
 
-#: https://www.torproject.org/press/-new-release-tor/
-#: (content/press/new-release-tor/contents+en.lr:post.summary)
-msgid ""
-"There's a new alpha release available for download. If you build Tor from "
-"source, you can download the source code for 0.4.0.1-alpha from the usual "
-"place on the website."
-msgstr ""
-
 #: https://www.torproject.org/press/-new-release-tor-browser/
 #: (content/press/new-release-tor-browser/contents+en.lr:post.summary)
 msgid ""
@@ -256,6 +248,14 @@ msgid ""
 "\">distribution directory."
 msgstr ""
 
+#: https://www.torproject.org/press/-new-release-tor/
+#: (content/press/new-release-tor/contents+en.lr:post.summary)
+msgid ""
+"There's a new alpha release available for download. If you build Tor from "
+"source, you can download the source code for 0.4.0.1-alpha from the usual "
+"place on the website."
+msgstr ""
+
 #: https://www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lr:page.title)
 msgid "Tor Browser 9.5"
@@ -1262,25 +1262,26 @@ msgid "Close banner"
 msgstr ""
 
 #: lego/templates/banner.html:11 templates/banner.html:11
-msgid "Use a Mask, Use Tor."
+msgid "Privacy is a human right"
 msgstr ""
 
-#: lego/templates/banner.html:20 templates/banner.html:20
-msgid "Resist the surveillance pandemic."
+#: lego/templates/banner.html:15 templates/banner.html:15
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
 msgstr ""
 
-#: lego/templates/banner.html:32 templates/banner.html:32
+#: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
 msgstr ""
 
-#: lego/templates/banner.html:40 templates/banner.html:40
-msgid "DONATE NOW"
+#: lego/templates/banner.html:31 lego/templates/banner.html:33
+#: templates/banner.html:31 templates/banner.html:33
+msgid "Donate now"
 msgstr ""
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
-#: lego/templates/navbar.html:83 templates/footer.html:13
+#: lego/templates/navbar.html:96 templates/footer.html:13
 #: templates/footer.html:22 templates/hero-home.html:13
-#: templates/navbar.html:83
+#: templates/navbar.html:96
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -1319,15 +1320,15 @@ msgstr ""
 msgid "Sign up"
 msgstr ""
 
-#: lego/templates/footer.html:98 templates/footer-min.html:67
-#: templates/footer.html:98
+#: lego/templates/footer.html:101 templates/footer-min.html:67
+#: templates/footer.html:101
 #, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:25 templates/navbar.html:25
+#: lego/templates/navbar.html:26 templates/navbar.html:26
 msgid "Menu"
 msgstr ""
 

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

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

2021-10-28 Thread translation

commit 90c2bbd01ec48000f739a1696c670c8b61c96053
Author: Translation commit bot 
Date:   Thu Oct 28 10:47:45 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
---
 contents+en.po | 388 +++-
 contents+hu.po | 393 +++-
 contents+tr.po | 395 -
 contents.pot   | 388 +++-
 4 files changed, 759 insertions(+), 805 deletions(-)

diff --git a/contents+en.po b/contents+en.po
index 768670f14a..528d5b2f77 100644
--- a/contents+en.po
+++ b/contents+en.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-07 17:29+CET\n"
+"POT-Creation-Date: 2021-10-28 11:50+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -12,151 +12,271 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Language: en\n"
 
-#: https//tb-manual.torproject.org/ (content/contents+en.lrshowcase.title)
-msgid "Tor Browser User Manual"
-msgstr "Tor Browser User Manual"
+#: (dynamic)
+msgid ""
+"Defend yourself against tracking and surveillance. Circumvent censorship."
+msgstr ""
+"Defend yourself against tracking and surveillance. Circumvent censorship."
 
-#: https//tb-manual.torproject.org/menu/
+#: (dynamic)
+msgid "Tor Project | Tor Browser Manual"
+msgstr "Tor Project | Tor Browser Manual"
+
+#: (dynamic)
+msgid "Close banner"
+msgstr "Close banner"
+
+#: (dynamic)
+msgid "Privacy is a human right"
+msgstr "Privacy is a human right"
+
+#: (dynamic)
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
+msgstr "Your donation will be matched by Friends of Tor, up to $150,000."
+
+#: (dynamic)
+msgid "Your donation will be matched by Friends of Tor, up to $100,000."
+msgstr "Your donation will be matched by Friends of Tor, up to $100,000."
+
+#: (dynamic)
+msgid "Donate now"
+msgstr "Donate now"
+
+#: (dynamic)
+msgid "Donate"
+msgstr "Donate"
+
+#: (dynamic)
+msgid "Donate Now"
+msgstr "Donate Now"
+
+#: (dynamic)
+msgid "Menu"
+msgstr "Menu"
+
+#: (dynamic) https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "About"
 msgstr "About"
 
-#: https//tb-manual.torproject.org/menu/
+#: (dynamic) https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Documentation"
-msgstr "Documentation"
+msgid "Support"
+msgstr "Support"
 
-#: https//tb-manual.torproject.org/menu/
+#: (dynamic) https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Press"
-msgstr "Press"
+msgid "Community"
+msgstr "Community"
 
-#: https//tb-manual.torproject.org/menu/
+#: (dynamic) https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Blog"
 msgstr "Blog"
 
-#: https//tb-manual.torproject.org/menu/
+#: (dynamic) https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Newsletter"
-msgstr "Newsletter"
-
-#: https//tb-manual.torproject.org/menu/
-#: (content/menu/contents+en.lrtopic.body)
-msgid "Support"
-msgstr "Support"
+msgid "Documentation"
+msgstr "Documentation"
 
-#: https//tb-manual.torproject.org/menu/
+#: (dynamic) https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Community"
-msgstr "Community"
+msgid "Jobs"
+msgstr "Jobs"
 
-#: https//tb-manual.torproject.org/menu/
+#: (dynamic) https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Contact"
 msgstr "Contact"
 
-#: https//tb-manual.torproject.org/menu/
+#: (dynamic) https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
-msgid "Jobs"
-msgstr "Jobs"
+msgid "Press"
+msgstr "Press"
 
-#: https//tb-manual.torproject.org/menu/
+#: (dynamic)
+msgid "Download Tor Browser"
+msgstr "Download Tor Browser"
+
+#: (dynamic)
+msgid "Search"
+msgstr "Search"
+
+#: (dynamic) https//tb-manual.torproject.org/
+#: (content/contents+en.lrshowcase.title)
+msgid "Tor Browser User Manual"
+msgstr "Tor Browser User Manual"
+
+#: (dynamic)
+msgid ""
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
+msgstr ""
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
+
+#: (dynamic)
+msgid "Our mission:"
+msgstr "Our mission:"
+
+#: (dynamic)
+msgid ""
+"To advance human rights and freedoms by creating and deploying free and open"
+" source anonymity and privacy technologies, supporting their unrestricted "
+"availability and use, and furthering their scientific and popular "
+"understanding."
+msgstr ""
+"To advance human rights and freedoms by creating and deploying free and open"
+" source anonymity and privacy technologies, supporting their

[tor-commits] [manual/translations] update lego

2021-10-28 Thread emmapeel

commit d4624849789d159a5d74d1f0dad1d6823a3d5e03
Author: emma peel 
Date:   Thu Oct 28 11:10:16 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 96effb7..c615f28 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 96effb77f3538a99f9b0198d6ff8a63228c5ac37
+Subproject commit c615f285b3ecdde226b02809f2181aeb30ee7ca7



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

[tor-commits] [manual/translations] update translation file

2021-10-28 Thread emmapeel

commit 3d96e57e64c338dc3fb76d8c9e4261a347188661
Author: emma peel 
Date:   Thu Oct 28 12:20:14 2021 +0200

update translation file
---
 i18n/contents.pot | 328 ++
 1 file changed, 160 insertions(+), 168 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 17b7659..4bd8dec 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-07 17:29+CET\n"
+"POT-Creation-Date: 2021-10-28 11:50+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -11,150 +11,261 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: https://tb-manual.torproject.org/ (content/contents+en.lr:showcase.title)
-msgid "Tor Browser User Manual"
+#: (dynamic)
+msgid ""
+"Defend yourself against tracking and surveillance. Circumvent censorship."
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic)
+msgid "Tor Project | Tor Browser Manual"
+msgstr ""
+
+#: (dynamic)
+msgid "Close banner"
+msgstr ""
+
+#: (dynamic)
+msgid "Privacy is a human right"
+msgstr ""
+
+#: (dynamic)
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
+msgstr ""
+
+#: (dynamic)
+msgid "Your donation will be matched by Friends of Tor, up to $100,000."
+msgstr ""
+
+#: (dynamic)
+msgid "Donate now"
+msgstr ""
+
+#: (dynamic)
+msgid "Donate"
+msgstr ""
+
+#: (dynamic)
+msgid "Donate Now"
+msgstr ""
+
+#: (dynamic)
+msgid "Menu"
+msgstr ""
+
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "About"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Documentation"
+msgid "Support"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Press"
+msgid "Community"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "Blog"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Newsletter"
+msgid "Documentation"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Support"
+msgid "Jobs"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Community"
+msgid "Contact"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Contact"
+msgid "Press"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic)
+msgid "Download Tor Browser"
+msgstr ""
+
+#: (dynamic)
+msgid "Search"
+msgstr ""
+
+#: (dynamic) https://tb-manual.torproject.org/
+#: (content/contents+en.lr:showcase.title)
+msgid "Tor Browser User Manual"
+msgstr ""
+
+#: (dynamic)
+msgid ""
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
+msgstr ""
+
+#: (dynamic)
+msgid "Our mission:"
+msgstr ""
+
+#: (dynamic)
+msgid ""
+"To advance human rights and freedoms by creating and deploying free and open "
+"source anonymity and privacy technologies, supporting their unrestricted "
+"availability and use, and furthering their scientific and popular "
+"understanding."
+msgstr ""
+
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Jobs"
+msgid "PrivChat"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic)
+msgid "Subscribe to our Newsletter"
+msgstr ""
+
+#: (dynamic)
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr ""
+
+#: (dynamic)
+msgid "Sign up"
+msgstr ""
+
+#: (dynamic)
+msgid ""
+"Trademark, copyright notices, and rules for use by third parties can be "
+"found in our %(link_to_faq)s"
+msgstr ""
+
+#: (dynamic)
+msgid "Topics"
+msgstr ""
+
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "About Tor Browser"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "Downloading"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Running Tor Browser for the First Time"
+msgid "Installation"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#:

[tor-commits] [manual/translations] content updates

2021-10-28 Thread emmapeel

commit f2f441c0c8aa7286e949ffd56480588baea9759f
Author: emma peel 
Date:   Thu Oct 28 11:10:08 2021 +0200

content updates
---
 content/installation/contents.lr | 4 ++--
 content/menu/contents.lr | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/installation/contents.lr b/content/installation/contents.lr
index 18f54bf..86432f4 100644
--- a/content/installation/contents.lr
+++ b/content/installation/contents.lr
@@ -73,7 +73,7 @@ To change this behavior and launch Tor Browser instead, 
follow this:
 
**Note:** If this command fails to run, you probably need to make the file 
executable. From within this directory run: `chmod +x start-tor-browser.desktop`
 
-* Some additional flags that can be used with `start-tor-browser.desktop` from 
the command-line:
+Some additional flags that can be used with `start-tor-browser.desktop` from 
the command-line:
 
 | **Flag** | **Description** |
 |--|-|
@@ -84,4 +84,4 @@ To change this behavior and launch Tor Browser instead, 
follow this:
 | `--unregister-app` | To unregister Tor Browser as a desktop application. |
 
 
-See here on how to [update Tor 
Browser](https://tb-manual.torproject.org/updating/).
+See here on how to [update Tor Browser](../updating/).
diff --git a/content/menu/contents.lr b/content/menu/contents.lr
index ac004f1..9a82bf3 100644
--- a/content/menu/contents.lr
+++ b/content/menu/contents.lr
@@ -36,4 +36,4 @@ Mobile Tor
 Becoming a Tor Translator
 Making Tor Browser Portable
 Installation
-
+PrivChat



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

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

2021-10-28 Thread translation

commit 2dd6d28d15919fbe1f19f0e70d172ae5320e40fe
Author: Translation commit bot 
Date:   Thu Oct 28 10:15:33 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
---
 contents+ca.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+ca.po b/contents+ca.po
index 08bd7125a7..8dcbdc9a56 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -210,7 +210,7 @@ msgstr "La privadesa Ã©s un dret humÃ "
 
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."
-msgstr "Amics del Tor igualarÃ  la vostra donaciÃ³ fins a 100.000 dÃ²lars."
+msgstr "Amics del Tor igualarÃ  la vostra donaciÃ³ fins a 150.000 dÃ²lars."
 
 #: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."

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

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

2021-10-28 Thread translation

commit ad97ad11760f3e3fe956066e0fae116479c81c41
Author: Translation commit bot 
Date:   Thu Oct 28 10:15:15 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ca.po | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contents+ca.po b/contents+ca.po
index 498a455599..0eba6072c2 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -18920,7 +18920,7 @@ msgstr "La privadesa Ã©s un dret humÃ "
 
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."
-msgstr "Amics del Tor igualarÃ  la vostra donaciÃ³ fins a 100.000 dÃ²lars."
+msgstr "Amics del Tor igualarÃ  la vostra donaciÃ³ fins a 150.000 dÃ²lars."
 
 #: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."

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

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

2021-10-28 Thread translation

commit f79571c31e94631e3dd6c01e393beaec0a523c2f
Author: Translation commit bot 
Date:   Thu Oct 28 10:15:03 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 ca/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd
index 3a73b7664b..db8d2753af 100644
--- a/ca/aboutTor.dtd
+++ b/ca/aboutTor.dtd
@@ -56,4 +56,4 @@
 
   Thank you!
 -->
-
+

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

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

2021-10-28 Thread translation

commit 67ae2cd9247f425521acdee59028165671b81fe0
Author: Translation commit bot 
Date:   Thu Oct 28 09:50:10 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ca.po| 8 
 contents+es.po| 2 +-
 contents+fr.po| 2 +-
 contents+hu.po| 2 +-
 contents+is.po| 6 +++---
 contents+it.po| 2 +-
 contents+pt-BR.po | 2 +-
 contents+ru.po| 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/contents+ca.po b/contents+ca.po
index a3ed261584..460285ea77 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -7,8 +7,8 @@
 # Miquel Bosch, 2021
 # Benny Beat , 2021
 # erinm, 2021
-# Emma Peel, 2021
 # Joan MontanÃ©, 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -16,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-26 15:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Joan MontanÃ©, 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14769,7 +14769,7 @@ msgstr "La privadesa Ã©s un dret humÃ "
 
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."
-msgstr ""
+msgstr "Amics del Tor igualarÃ  la vostra donaciÃ³ fins a 150.000 dÃ²lars."
 
 #: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
@@ -14778,7 +14778,7 @@ msgstr "_Friends of Tor_ igualarÃ  la vostra donaciÃ³ 
fins a 100.000 dÃ²lars."
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Feu una donaciÃ³"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+es.po b/contents+es.po
index 3be7446d5f..e9408c53ba 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -17278,7 +17278,7 @@ msgstr "A tu donaciÃ³n la igualarÃ¡ Amigos de Tor hasta 
un lÃmite de $100.000."
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Dona Ahora"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+fr.po b/contents+fr.po
index af30bd069e..b688a3364d 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -15944,7 +15944,7 @@ msgstr "Votre don sera Ã©galÃ© par les Amis de Tor Ã  
concurrence de 100â000Â 
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Faire un don maintenant"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+hu.po b/contents+hu.po
index 897ddf022e..fab4e7fa78 100644
--- a/contents+hu.po
+++ b/contents+hu.po
@@ -14693,7 +14693,7 @@ msgstr ""
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "AdomÃ¡nyozzon most"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+is.po b/contents+is.po
index c9c618c6d1..fc98d76d01 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -1,8 +1,8 @@
 # 
 # Translators:
-# Emma Peel, 2020
 # erinm, 2021
 # Sveinn Ã Felli , 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-26 15:31+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Sveinn Ã Felli , 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -14940,7 +14940,7 @@ msgstr ""
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Styrkja nÃºna"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+it.po b/contents+it.po
index 665772b771..b041c8652f 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -16498,7 +16498,7 @@ msgstr "La tua donazione sarÃ  mandata a Friends of 
Tor, fino a $100,000."
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Dona Adesso"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+pt-BR.po

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

2021-10-28 Thread translation

commit 3a37bf93e5cbed9e78e810908f422601bfe2c16b
Author: Translation commit bot 
Date:   Thu Oct 28 09:48:01 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
---
 ach.po|  8 
 af.po |  8 
 af_ZA.po  | 10 +-
 ar.po | 10 +-
 ar_EG.po  | 10 +-
 ast.po|  8 
 az.po |  8 
 be.po |  8 
 bg.po |  8 
 bn.po |  8 
 br.po |  8 
 bs.po | 10 +-
 ca.po |  8 
 cs.po | 10 +-
 cy.po |  8 
 da.po | 10 +-
 de.po | 10 +-
 el.po | 10 +-
 en_GB.po  |  8 
 en_US.po  | 10 +-
 eo.po |  8 
 es.po | 12 ++--
 es_AR.po  | 14 +++---
 es_MX.po  |  8 
 et.po |  8 
 eu.po |  8 
 fa.po | 10 +-
 fi.po |  8 
 fr.po | 14 +++---
 fr_FR.po  | 10 +-
 fy.po |  8 
 ga.po |  8 
 gd.po |  8 
 gl.po |  8 
 gu.po |  8 
 he.po | 10 +-
 hi.po |  8 
 hr.po |  8 
 hu.po | 14 +++---
 hy.po |  8 
 ia.po |  8 
 id.po | 10 +-
 is.po | 10 +-
 it.po | 10 +-
 ja.po | 10 +-
 ka.po |  8 
 kab.po|  8 
 kk.po | 10 +-
 km.po |  8 
 kn.po |  8 
 ko.po | 10 +-
 lt.po |  8 
 lv.po |  8 
 mk.po |  8 
 ml.po |  8 
 mr.po | 10 +-
 ms_MY.po  |  8 
 my.po |  8 
 nb.po |  8 
 ne.po |  8 
 nl.po |  8 
 nl_BE.po  |  8 
 nn.po |  8 
 oc.po |  8 
 or.po |  8 
 pa.po |  8 
 pl.po | 10 +-
 pt_BR.po  | 10 +-
 pt_PT.po  | 10 +-
 ro.po | 10 +-
 ro_RO.po  | 10 +-
 ru.po | 10 +-
 si.po | 10 +-
 si_LK.po  |  8 
 sk.po |  8 
 sl.po |  8 
 sl_SI.po  | 10 +-
 son.po|  8 
 sq.po | 10 +-
 sr.po |  8 
 sv.po | 12 ++--
 sw.po |  8 
 ta.po |  8 
 tails.pot |  8 
 te.po |  8 
 th.po |  8 
 tr.po | 14 +++---
 uk.po |  8 
 ur.po |  8 
 uz.po | 10 +-
 vi.po |  8 
 zh.po | 10 +-
 zh_CN.po  | 14 +++---
 zh_HK.po  |  8 
 zh_TW.po  |  8 
 95 files changed, 429 insertions(+), 429 deletions(-)

diff --git a/ach.po b/ach.po
index 49d1e2d113..81838a9000 100644
--- a/ach.po
+++ b/ach.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-06 12:26+\n"
+"POT-Creation-Date: 2021-10-04 16:34+0200\n"
+"PO-Revision-Date: 2021-10-28 09:25+\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Acoli 
(http://www.transifex.com/otf/torproject/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -1144,11 +1144,11 @@ msgid "Language, administration password, and 
additional settings"
 msgstr ""
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
-msgid "Tor Bridges"
+msgid "Tor Bridge"
 msgstr ""
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Save the last bridges that you used to connect to Tor"
+msgid "Save the last bridge that you used to connect to Tor"
 msgstr ""
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98
diff --git a/af.po b/af.po
index 5e63702b56..6918680d64 100644
--- a/af.po
+++ b/af.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-06 12:26+\n"
+"POT-Creation-Date: 2021-10-04 16:34+0200\n"
+"PO-Revision-Date: 2021-10-28 09:25+\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Afrikaans 
(http://www.transifex.com/otf/torproject/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -1144,11 +1144,11 @@ msgid "Language, administration password, and 
additional settings"
 msgstr ""
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
-msgid "Tor Bridges"
+msgid "Tor Bridge"
 msgstr ""
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Save the last bridges that you used to connect to Tor"
+msgid "Save the last bridge that you used to connect to Tor"
 msgstr ""
 
 #:

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

2021-10-28 Thread translation

commit 3ed58f0301e00f5b7cc3c87ccb5c03b5cca4d813
Author: Translation commit bot 
Date:   Thu Oct 28 09:47:07 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
---
 ach.po|  8 
 af.po |  8 
 af_ZA.po  | 10 +-
 ar.po | 14 +++---
 ar_EG.po  | 10 +-
 ast.po|  8 
 az.po |  8 
 be.po |  8 
 bg.po |  8 
 bn.po |  8 
 br.po |  8 
 bs.po | 10 +-
 ca.po |  8 
 cs.po | 10 +-
 cy.po |  8 
 da.po | 14 +++---
 de.po | 14 +++---
 el.po | 14 +++---
 en_GB.po  | 12 ++--
 en_US.po  | 10 +-
 eo.po |  8 
 es.po | 16 
 es_AR.po  | 14 +++---
 es_MX.po  |  8 
 et.po |  8 
 eu.po |  8 
 fa.po | 14 +++---
 fi.po | 12 ++--
 fr.po | 14 +++---
 fr_FR.po  | 10 +-
 fy.po |  8 
 ga.po |  8 
 gd.po |  8 
 gl.po |  8 
 gu.po |  8 
 he.po | 14 +++---
 hi.po |  8 
 hr.po |  8 
 hu.po | 14 +++---
 hy.po |  8 
 ia.po |  8 
 id.po | 14 +++---
 is.po | 14 +++---
 it.po | 14 +++---
 ja.po | 12 ++--
 ka.po |  8 
 kab.po|  8 
 kk.po | 10 +-
 km.po |  8 
 kn.po |  8 
 ko.po | 14 +++---
 lt.po |  8 
 lv.po |  8 
 mk.po |  8 
 ml.po |  8 
 mr.po | 10 +-
 ms_MY.po  |  8 
 my.po |  8 
 nb.po |  8 
 ne.po |  8 
 nl.po |  8 
 nl_BE.po  |  8 
 nn.po |  8 
 oc.po |  8 
 or.po |  8 
 pa.po |  8 
 pl.po | 18 +-
 pt_BR.po  | 14 +++---
 pt_PT.po  | 10 +-
 ro.po | 14 +++---
 ro_RO.po  | 10 +-
 ru.po | 14 +++---
 si.po | 10 +-
 si_LK.po  |  8 
 sk.po |  8 
 sl.po |  8 
 sl_SI.po  | 10 +-
 son.po|  8 
 sq.po | 14 +++---
 sr.po |  8 
 sv.po | 12 ++--
 sw.po |  8 
 ta.po |  8 
 tails.pot | 12 ++--
 te.po |  8 
 th.po |  8 
 tr.po | 14 +++---
 uk.po |  8 
 ur.po |  8 
 uz.po | 10 +-
 vi.po |  8 
 zh.po | 10 +-
 zh_CN.po  | 14 +++---
 zh_HK.po  |  8 
 zh_TW.po  | 10 +-
 95 files changed, 471 insertions(+), 471 deletions(-)

diff --git a/ach.po b/ach.po
index 49d1e2d113..81838a9000 100644
--- a/ach.po
+++ b/ach.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-06 12:26+\n"
+"POT-Creation-Date: 2021-10-04 16:34+0200\n"
+"PO-Revision-Date: 2021-10-28 09:25+\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Acoli 
(http://www.transifex.com/otf/torproject/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -1144,11 +1144,11 @@ msgid "Language, administration password, and 
additional settings"
 msgstr ""
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
-msgid "Tor Bridges"
+msgid "Tor Bridge"
 msgstr ""
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Save the last bridges that you used to connect to Tor"
+msgid "Save the last bridge that you used to connect to Tor"
 msgstr ""
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98
diff --git a/af.po b/af.po
index d0edbfcb24..6267c199f1 100644
--- a/af.po
+++ b/af.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-09-06 12:01+0200\n"
-"PO-Revision-Date: 2021-09-06 12:26+\n"
+"POT-Creation-Date: 2021-10-04 16:34+0200\n"
+"PO-Revision-Date: 2021-10-28 09:25+\n"
 "Last-Translator: Transifex Bot <>\n"
 "Language-Team: Afrikaans 
(http://www.transifex.com/otf/torproject/language/af/)\n"
 "MIME-Version: 1.0\n"
@@ -1144,11 +1144,11 @@ msgid "Language, administration password, and 
additional settings"
 msgstr ""
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83
-msgid "Tor Bridges"
+msgid "Tor Bridge"
 msgstr ""
 
 #: 
config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85
-msgid "Save the last bridges that you used to connect to Tor"
+msgid "Save the last bridge that you used to connect to Tor"
 msgstr ""
 
 #:

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

2021-10-28 Thread translation

commit 666a3691f6548cc2d3c1f27a36077ab2f7f36591
Author: Translation commit bot 
Date:   Thu Oct 28 09:45:56 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=gettor-website-contentspot
---
 contents+ca.po| 8 
 contents+es.po| 6 +++---
 contents+fr.po| 6 +++---
 contents+hu.po| 6 +++---
 contents+is.po| 6 +++---
 contents+it.po| 6 +++---
 contents+pt-BR.po | 6 +++---
 contents+ru.po| 6 +++---
 8 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/contents+ca.po b/contents+ca.po
index ade72676bf..08bd7125a7 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -1,11 +1,11 @@
 # 
 # Translators:
-# Emma Peel, 2021
 # Assumpta, 2021
 # Benny Beat , 2021
 # Joan MontanÃ©, 2021
 # erinm, 2021
 # Ecron , 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-22 09:52+CET\n"
 "PO-Revision-Date: 2021-03-24 14:33+\n"
-"Last-Translator: Ecron , 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/1519/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -210,7 +210,7 @@ msgstr "La privadesa Ã©s un dret humÃ "
 
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."
-msgstr ""
+msgstr "Amics del Tor igualarÃ  la vostra donaciÃ³ fins a 100.000 dÃ²lars."
 
 #: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
@@ -218,7 +218,7 @@ msgstr "_Friends of Tor_ igualarÃ  la vostra donaciÃ³ fins 
a 100.000 dÃ²lars."
 
 #: lego/templates/banner.html:32 templates/banner.html:32
 msgid "Donate now"
-msgstr ""
+msgstr "Feu una donaciÃ³"
 
 #: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"
diff --git a/contents+es.po b/contents+es.po
index fca850b3ce..dc987798d1 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -3,10 +3,10 @@
 # Ines Branco Lopez , 2021
 # Zuhualime Akoochimoya, 2021
 # erinm, 2021
-# Emma Peel, 2021
 # Nicolas Sera-Leyva , 2021
 # de1ca222968aa9b5291789e94a1b3b8a_f1329af, 2021
 # ÄorÄe MaruÅ¡iÄ , 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-22 09:52+CET\n"
 "PO-Revision-Date: 2021-03-24 14:33+\n"
-"Last-Translator: ÄorÄe MaruÅ¡iÄ , 2021\n"
+"Last-Translator: Emma Peel, 2021\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"
@@ -231,7 +231,7 @@ msgstr "A tu donaciÃ³n la emparejarÃ¡ Amigos de Tor hasta 
$100.000."
 
 #: lego/templates/banner.html:32 templates/banner.html:32
 msgid "Donate now"
-msgstr ""
+msgstr "Dona Ahora"
 
 #: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"
diff --git a/contents+fr.po b/contents+fr.po
index a3c1a230c0..8f5a9435bc 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -1,10 +1,10 @@
 # 
 # Translators:
 # Vincent Breitmoser , 2021
-# Emma Peel, 2021
 # AO , 2021
 # erinm, 2021
 # ÄorÄe MaruÅ¡iÄ , 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-22 09:52+CET\n"
 "PO-Revision-Date: 2021-03-24 14:33+\n"
-"Last-Translator: ÄorÄe MaruÅ¡iÄ , 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -230,7 +230,7 @@ msgstr "Votre don sera Ã©galÃ© par les Amis de Tor Ã  
concurrence de 100â000Â 
 
 #: lego/templates/banner.html:32 templates/banner.html:32
 msgid "Donate now"
-msgstr ""
+msgstr "Faire un don maintenant"
 
 #: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"
diff --git a/contents+hu.po b/contents+hu.po
index bc7c6668d7..88461d1987 100644
--- a/contents+hu.po
+++ b/contents+hu.po
@@ -1,9 +1,9 @@
 # 
 # Translators:
 # IstvÃ¡n DÃ¡vid , 2021
-# Emma Peel, 2021
 # vargaviktor , 2021
 # erinm, 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-22 09:52+CET\n"
 "PO-Revision-Date: 2021-03-24 14:33+\n"
-"Last-Translator: erinm, 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -221,7 +221,7 @@ msgstr ""
 
 #: lego/templates/banner.html:32 templates/banner.html:32
 msgid "Donate now"
-msgstr ""
+msgstr "AdomÃ¡nyozzon most"
 
 #: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"
diff --git a/contents+is.po b/contents+is.po
index d61aadf329..7f827aa9df 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -1,8 +1,8 @@
 # 
 # Translators:
-# Emma Peel, 2021
 #

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

2021-10-28 Thread translation

commit b51df87b7bc9c2adcdc76048f83a6bdcc63b6227
Author: Translation commit bot 
Date:   Thu Oct 28 09:45:41 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
---
 contents+ca.po| 4 ++--
 contents+es.po| 2 +-
 contents+fr.po| 2 +-
 contents+hu.po| 2 +-
 contents+is.po| 6 +++---
 contents+it.po| 2 +-
 contents+pt-BR.po | 2 +-
 contents+ru.po| 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/contents+ca.po b/contents+ca.po
index e9cfa551b2..498a455599 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -18920,7 +18920,7 @@ msgstr "La privadesa Ã©s un dret humÃ "
 
 #: lego/templates/banner.html:15 templates/banner.html:15
 msgid "Your donation will be matched by Friends of Tor, up to $150,000."
-msgstr ""
+msgstr "Amics del Tor igualarÃ  la vostra donaciÃ³ fins a 100.000 dÃ²lars."
 
 #: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
@@ -18929,7 +18929,7 @@ msgstr "_Friends of Tor_ igualarÃ  la vostra donaciÃ³ 
fins a 100.000 dÃ²lars."
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Feu una donaciÃ³"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+es.po b/contents+es.po
index 20a21cc2d8..63fa493c55 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -22904,7 +22904,7 @@ msgstr "A tu donaciÃ³n la emparejarÃ¡ Amigos de Tor 
hasta $100.000."
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Dona Ahora"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+fr.po b/contents+fr.po
index cb4d363dc1..a391aa7e4b 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -19768,7 +19768,7 @@ msgstr "Votre don sera Ã©galÃ© par les Amis de Tor Ã  
concurrence de 100â000Â 
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Faire un don maintenant"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+hu.po b/contents+hu.po
index 91e358af81..87da4931e9 100644
--- a/contents+hu.po
+++ b/contents+hu.po
@@ -18859,7 +18859,7 @@ msgstr ""
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "AdomÃ¡nyozzon most"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+is.po b/contents+is.po
index e29a51f5c0..40d793b420 100644
--- a/contents+is.po
+++ b/contents+is.po
@@ -1,8 +1,8 @@
 # 
 # Translators:
-# Emma Peel, 2021
 # erinm, 2021
 # Sveinn Ã Felli , 2021
+# Emma Peel, 2021
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-26 18:39+CET\n"
 "PO-Revision-Date: 2019-12-11 10:50+\n"
-"Last-Translator: Sveinn Ã Felli , 2021\n"
+"Last-Translator: Emma Peel, 2021\n"
 "Language-Team: Icelandic (https://www.transifex.com/otf/teams/1519/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18830,7 +18830,7 @@ msgstr ""
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Styrkja nÃºna"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+it.po b/contents+it.po
index 0bc5fb8aeb..141ea84843 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -19404,7 +19404,7 @@ msgstr "La tua donazione sarÃ  mandata a Friends of 
Tor, fino a $100,000."
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "Dona Adesso"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 79fc5c16eb..3320d17477 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -20161,7 +20161,7 @@ msgstr ""
 #: lego/templates/banner.html:31 lego/templates/banner.html:33
 #: templates/banner.html:31 templates/banner.html:33
 msgid "Donate now"
-msgstr ""
+msgstr "FaÃ§a uma doaÃ§Ã£o"
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
 #: lego/templates/navbar.html:96 templates/footer.html:13
diff --git a/contents+ru.po b/contents+ru.po
index 168ea475a2..d1a8e88a2e 100644
--- a/contents+ru.po

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

2021-10-28 Thread translation

commit b20c197fe1d38655ab7aa8ff61682fd88ed2d3f9
Author: Translation commit bot 
Date:   Thu Oct 28 09:45:06 2021 +


https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_completed
---
 ca/aboutTor.dtd| 28 
 sv-SE/aboutTor.dtd |  2 +-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd
index 0741dd0011..d45560082e 100644
--- a/ca/aboutTor.dtd
+++ b/ca/aboutTor.dtd
@@ -29,3 +29,31 @@
 
 
 
+
+
+
+
+
+
+
+
diff --git a/sv-SE/aboutTor.dtd b/sv-SE/aboutTor.dtd
index 4f7cc496e9..11f3fd70a8 100644
--- a/sv-SE/aboutTor.dtd
+++ b/sv-SE/aboutTor.dtd
@@ -47,7 +47,7 @@
 
   Thank you!
 -->
-
+

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

2021-10-28 Thread translation

commit d0aa8680e5e8faa2c77715b272f475331e187177
Author: Translation commit bot 
Date:   Thu Oct 28 09:45:03 2021 +

https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage
---
 ca/aboutTor.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ca/aboutTor.dtd b/ca/aboutTor.dtd
index a566a3a9ed..3a73b7664b 100644
--- a/ca/aboutTor.dtd
+++ b/ca/aboutTor.dtd
@@ -56,4 +56,4 @@
 
   Thank you!
 -->
-
+

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

1 2 >

1 - 100 of 106 matches

Mail list logo