date:20191205

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

2019-12-05 Thread translation

commit dffb821f48db98b35ad5efeec12f94e3090aad72
Author: Translation commit bot 
Date:   Fri Dec 6 07:53:05 2019 +

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

diff --git a/contents+fa.po b/contents+fa.po
index 9c57d85f96..0deb9ddc87 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -9,8 +9,8 @@
 # magnifico, 2019
 # b0b47d46632b78a09a40de799fda9a65, 2019
 # Emma Peel, 2019
-# MYZJ, 2019
 # Samaneh M , 2019
+# MYZJ, 2019
 # 
 msgid ""
 msgstr ""
@@ -18,7 +18,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-14 16:04+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Samaneh M , 2019\n"
+"Last-Translator: MYZJ, 2019\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,27 +41,27 @@ msgstr "Ù¾Ø±Ø³Ø´âÙØ§Û ÙØªØ¯Ø§ÙÙ "
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "About Tor"
-msgstr "Ø¯Ø±Ø¨Ø§Ø±Ùâ ØªÙØ±"
+msgstr "Ø¯Ø±Ø¨Ø§Ø±Ùâ Tor"
 
 #: https//support.torproject.org/tbb/ (content/tbb/contents+en.lrtopic.title)
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "Tor Browser"
-msgstr "ÙØ±ÙØ±Ú¯Ø± ØªÙØ±"
+msgstr "ÙØ±ÙØ±Ú¯Ø± Tor"
 
 #: https//support.torproject.org/tormessenger/
 #: (content/tormessenger/contents+en.lrtopic.title)
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "Tor Messenger"
-msgstr " Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ØªÙØ±"
+msgstr "Ù¾ÛØ§Ù Ø±Ø³Ø§Ù Tor"
 
 #: https//support.torproject.org/tormobile/
 #: (content/tormobile/contents+en.lrtopic.title)
 #: https//support.torproject.org/misc/menu/
 #: (content/misc/menu/contents+en.lrquestion.description)
 msgid "Tor Mobile"
-msgstr "ØªÙØ± ÙÙØ¨Ø§ÛÙ"
+msgstr "Tor Ø¨Ø± Ø±ÙÛ ÙÙØ¨Ø§ÛÙ"
 
 #: https//support.torproject.org/gettor/
 #: (content/gettor/contents+en.lrtopic.title)
@@ -3205,12 +3205,12 @@ msgstr ""
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.title)
 msgid "To use GetTor via email."
-msgstr ""
+msgstr "Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² GetTor Ø¨ÙØ³ÛÙÙ Ø§ÛÙÛÙ."
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.description)
 msgid "Send an email to get...@torproject.org."
-msgstr ""
+msgstr "ÛÚ© Ø§ÛÙÛÙ Ø¨Ù ÙØ´Ø§ÙÛ get...@torproject.org Ø§Ø±Ø³Ø§Ù 
Ú©ÙÛØ¯."
 
 #: https//support.torproject.org/gettor/gettor-2/
 #: (content/gettor/gettor-2/contents+en.lrquestion.description)
@@ -6177,7 +6177,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### GetTor"
-msgstr ""
+msgstr "### GetTor"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -7208,7 +7208,7 @@ msgstr ""
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### Tor Messenger"
-msgstr ""
+msgstr "### Ù¾ÛØ§Ù Ø±Ø³Ø§Ù Tor"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)

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

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

2019-12-05 Thread translation

commit 30fdc5038ec95d87b6e6498ff22f5565de509f86
Author: Translation commit bot 
Date:   Fri Dec 6 06:45:40 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/tr/LC_MESSAGES/messages.po | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/locale/tr/LC_MESSAGES/messages.po 
b/locale/tr/LC_MESSAGES/messages.po
index c0245349ca..3694b421ac 100644
--- a/locale/tr/LC_MESSAGES/messages.po
+++ b/locale/tr/LC_MESSAGES/messages.po
@@ -9,13 +9,13 @@
 # Lale FatoÅ TunÃ§man , 2019
 # Taha KaradoÄan , 2019
 # Arda BÃ¼yÃ¼kkaya , 2019
-# Kaya Zeren , 2019
 # erinm, 2019
 # T. E. Kalayci , 2019
+# Kaya Zeren , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: T. E. Kalayci , 2019\n"
+"Last-Translator: Kaya Zeren , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -472,7 +472,7 @@ msgstr "aylÄ±k"
 
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:167
 msgid "Want to donate cryptocurrency?"
-msgstr "Kripto para ile baÄÄ±Å yapmak ister misiniz?"
+msgstr "Kripto para birimi ile baÄÄ±Å yapmak ister misiniz?"
 
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:172
 msgid "Want to donate stock or via postal mail?"
@@ -844,8 +844,8 @@ msgid ""
 msgstr ""
 "Not: Tor Projesine https://2019.www.torproject.org/donate/donate.html.en\; "
-"target=\"_blank\">kredi kartÄ± veya PayPal ile baÄÄ±Å yapmak istiyorsanÄ±z "
-"lÃ¼tfen tÄ±klayÄ±n."
+"target=\"_blank\">kredi kartÄ± ya da PayPal ile baÄÄ±Å yapmak istiyorsanÄ±z 
"
+"lÃ¼tfen buraya tÄ±klayÄ±n."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:95
 msgid ""
@@ -854,7 +854,7 @@ msgstr "Tor Projesi aÅaÄÄ±daki alternatif baÄÄ±Å 
yÃ¶ntemlerini de sunuyor:"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:102
 msgid "Bitcoin and Other Cryptocurrencies"
-msgstr "Bitcoin ve DiÄer Kriptoparalar"
+msgstr "Bitcoin ve diÄer kripto para birimleri"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:108
 msgid "BTCPayServer"
@@ -874,14 +874,14 @@ msgstr "Giving Assistant"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:126
 msgid "EU Bank Transfer"
-msgstr "AB Banka Transferi"
+msgstr "AB Banka Havalesi"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:132
 msgid ""
 "Checks or Money Orders"
 msgstr ""
-"Ãek  veya  ya da Ãdeme Emri"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:138
@@ -2574,4 +2574,4 @@ msgstr "AylÄ±k $84 ya da Ã¼zerinde bir baÄÄ±Å ile 
katkÄ±da bulunun."
 
 #: 
tmp/cache_locale/02/023cc9edfe6c60b72788b97f6a123fde6020d003845e03b26b572d864d6eb3de.php:114
 msgid "Join with cryptocurrency."
-msgstr "Kripto para birimi ile katkÄ±da bulunun."
+msgstr "Kripto para birimi ile destek olun."

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

[tor-commits] [gettor/master] Safer token accesss and file cleanup

2019-12-05 Thread cohosh

commit 233d7da2f7749f46ddc100099667f7b794e8f719
Author: Cecylia Bocovich 
Date:   Thu Dec 5 12:05:16 2019 -0500

Safer token accesss and file cleanup

Have the script read directly from an environment variable instead of
passing the token in as a command line argument. This will hide it from
other processes.

Also removed downloaded files to prevent a messy directory.
---
 scripts/update_files | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/scripts/update_files b/scripts/update_files
index 8b705ae..264c118 100755
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -2,12 +2,16 @@
 
 #pip3 install PyGithub
 
+# Before running, place the authentication token for a user with push access 
to the repository
+# in an environment variable 'GITHUB_AUTH'
+
 from github import Github
 
 import sys
 import json
 import urllib
 import subprocess
+import os
 
 REPO_NAME = "TheTorProject/gettorbrowser"
 
@@ -33,6 +37,7 @@ def upload_files(release):
 try:
 subprocess.check_call(["/usr/bin/wget", "--quiet", url])
 release.upload_asset(filename)
+os.remove(filename)
 except:
 print("Error: failed to download "+url+". Will retry 
later.")
 failed_uploads.append(url)
@@ -42,6 +47,7 @@ def upload_files(release):
 try:
 subprocess.check_call(["/usr/bin/wget", "--quiet", url])
 release.upload_asset(filename)
+os.remove(filename)
 except:
 print("Error: failed to download "+url+". Please upload this file 
manually.")
 failure = True
@@ -64,11 +70,10 @@ def main(token):
 
 
 if __name__ == "__main__":
-if len(sys.argv) != 2:
-print("Usage: {} AUTH_TOKEN".format(sys.argv[0]), file=sys.stderr)
-print("\nAUTH_TOKEN should be an authentication token for a user"
-  "with access to the gettor repository.", file=sys.stderr)
+if 'GITHUB_AUTH' not in os.environ:
+print("Usage: {}".format(sys.argv[0]), file=sys.stderr)
+print("\nThe authentication token for github should be placed in the 
environment"
+"variable 'GITHUB_AUTH'", file=sys.stderr)
 sys.exit(1)
-token = sys.argv[1]
-
+token = os.environ['GITHUB_AUTH']
 sys.exit(main(token))



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

[tor-commits] [gettor/master] Slight fix to working of log messages

2019-12-05 Thread cohosh

commit 5684c4fc95170951f062b36002733034cb6a3904
Author: Cecylia Bocovich 
Date:   Thu Dec 5 17:26:32 2019 -0500

Slight fix to working of log messages
---
 scripts/update_files | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/update_files b/scripts/update_files
index 264c118..6d087e6 100755
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -39,7 +39,7 @@ def upload_files(release):
 release.upload_asset(filename)
 os.remove(filename)
 except:
-print("Error: failed to download "+url+". Will retry 
later.")
+print("Error: failed to update "+url+". Will retry later.")
 failed_uploads.append(url)
 #Retry failed uploads
 for url in failed_uploads:
@@ -49,7 +49,7 @@ def upload_files(release):
 release.upload_asset(filename)
 os.remove(filename)
 except:
-print("Error: failed to download "+url+". Please upload this file 
manually.")
+print("Error: failed to update "+url+". Please upload this file 
manually.")
 failure = True
 
 

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

[tor-commits] [gettor/master] Update link in db to github releases

2019-12-05 Thread cohosh

commit 7ddfbacf1bf37dba0da13a91ab52aeba787e0bdc
Author: Cecylia Bocovich 
Date:   Wed Nov 20 10:38:50 2019 -0500

Update link in db to github releases
---
 scripts/add_links_to_db | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db
index a59563d..a2b67f6 100755
--- a/scripts/add_links_to_db
+++ b/scripts/add_links_to_db
@@ -69,7 +69,7 @@ def main():
 
 providers = {
 "gitlab": 
"https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/;,
-"github": 
"https://github.com/TheTorProject/gettorbrowser/raw/torbrowser-releases/;,
+"github": 
"https://github.com/TheTorProject/gettorbrowser/releases/download/torbrowser-release/;
 }
 
 prefixes = {



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

[tor-commits] [gettor/master] Make sure script output clearly prints out errors

2019-12-05 Thread cohosh

commit 7496d1127d4713b57503ccab583be2397e757591
Author: Cecylia Bocovich 
Date:   Thu Nov 21 16:19:40 2019 -0500

Make sure script output clearly prints out errors
---
 scripts/update_files | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update_files b/scripts/update_files
index 7da6836..ab45930 100755
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -22,12 +22,12 @@ def upload_files(release):
 for asset in data['downloads'][arch][locale]:
 url = data['downloads'][arch][locale][asset]
 filename = url.split('/')[-1]
-print("Downloading " + filename)
 try:
 subprocess.check_call(["/usr/bin/wget", "--quiet", url])
 release.upload_asset(filename)
 except:
 print("Error: failed to download "+url)
+print("Please upload this file manually.")
 
 
 



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

[tor-commits] [gettor/master] Include upload function in try/catch block

2019-12-05 Thread cohosh

commit 0d4fc80177ac12810947f6cbdf4e4093d19f4600
Author: Cecylia Bocovich 
Date:   Wed Nov 20 09:47:28 2019 -0500

Include upload function in try/catch block
---
 scripts/update_files | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/update_files b/scripts/update_files
index 3fa35b2..7da6836 100755
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -23,8 +23,12 @@ def upload_files(release):
 url = data['downloads'][arch][locale][asset]
 filename = url.split('/')[-1]
 print("Downloading " + filename)
-subprocess.check_call(["/usr/bin/wget", url])
-release.upload_asset(filename)
+try:
+subprocess.check_call(["/usr/bin/wget", "--quiet", url])
+release.upload_asset(filename)
+except:
+print("Error: failed to download "+url)
+
 
 
 def main(token):



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

[tor-commits] [gettor/master] Retry failed downloads

2019-12-05 Thread cohosh

commit 6aa7e2b2eda363134b572306474e7d646d747315
Author: Cecylia Bocovich 
Date:   Wed Dec 4 20:31:41 2019 -0500

Retry failed downloads

- also fixed a bug where releases won't be deleted untless the assets
are removed first
---
 scripts/update_files | 21 +
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/scripts/update_files b/scripts/update_files
index 827d7d5..8b705ae 100755
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -1,5 +1,7 @@
 #!/usr/bin/env python3
 
+#pip3 install PyGithub
+
 from github import Github
 
 import sys
@@ -11,8 +13,12 @@ REPO_NAME = "TheTorProject/gettorbrowser"
 
 failure = False
 
+failed_uploads = []
+
 def delete_old_releases(repo):
 for release in repo.get_releases():
+for asset in release.get_assets():
+asset.delete_asset()
 release.delete_release()
 
 #Download list of tor browser releases and upload them to github
@@ -28,10 +34,17 @@ def upload_files(release):
 subprocess.check_call(["/usr/bin/wget", "--quiet", url])
 release.upload_asset(filename)
 except:
-print("Error: failed to download "+url)
-print("Please upload this file manually.")
-failure = True
-
+print("Error: failed to download "+url+". Will retry 
later.")
+failed_uploads.append(url)
+#Retry failed uploads
+for url in failed_uploads:
+filename = url.split('/')[-1]
+try:
+subprocess.check_call(["/usr/bin/wget", "--quiet", url])
+release.upload_asset(filename)
+except:
+print("Error: failed to download "+url+". Please upload this file 
manually.")
+failure = True
 
 
 def main(token):



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

[tor-commits] [gettor/master] Changed update_files to upload releases

2019-12-05 Thread cohosh

commit b60b5ad92d17d64f15214d80e20aa08b50fc96d1
Author: Cecylia Bocovich 
Date:   Tue Nov 19 19:27:17 2019 -0500

Changed update_files to upload releases

We were running out of space in both of our github and gitlab
repositories due to storage limits. This change switches to using the
github REST API to upload torbrowser binaries as releases. Releases are
not subject to the space limits of repositories and, even better, do not
count against our bandwidth limits when users download them.
---
 scripts/update_files | 113 +++
 1 file changed, 51 insertions(+), 62 deletions(-)

diff --git a/scripts/update_files b/scripts/update_files
index 6e9e013..3fa35b2 100755
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -1,62 +1,51 @@
-#!/bin/bash
-#
-# This file is part of GetTor, a Tor Browser distribution system.
-#
-# :authors: hiro 
-#   see also AUTHORS file
-#
-# :copyright:   (c) 2008-2019, The Tor Project, Inc.
-#
-# :license: This is Free Software. See LICENSE for license information.
-
-cd ~/releases
-git checkout master
-git branch -D torbrowser-releases
-git push github --delete torbrowser-releases
-
-git fetch --all --prune
-
-git add .
-git commit -am 'Create release branch'
-git checkout -b torbrowser-releases
-git push -f --follow-tags origin torbrowser-releases
-git push -f --follow-tags github torbrowser-releases
-
-
-for row in $(
-curl -s 
'https://aus1.torproject.org/torbrowser/update_3/release/downloads.json' |
-jq -r '.downloads'
-  ); do
-r=$(
-  echo ${row} |
-  egrep -o 'https?://[^ ]+' |
-  tr -d '",'
-);
-if [[ $r = *[!\ ]* ]]; then
-  git fetch --all
-  wget $r
-  git add .
-  git commit -m '[dist ci] commit from CI runner - update with new 
torbrowser downloads'
-  diffs=$(git diff origin/torbrowser-releases)
-  if [ -z "$diffs" ]; then
-  echo "No new releases"
-  else
-  git push -f --follow-tags origin torbrowser-releases
-  fi
-  diffs=$(git diff github/torbrowser-releases)
-  if [ -z "$diffs" ]; then
-  echo "No new releases"
-  else
-  git push -f --follow-tags github torbrowser-releases
-  fi
-fi;
-done
-
-rclone delete gdrive:releases
-
-for f in $(ls); do
-  # Update Google Drive
-  rclone copy $f gdrive:releases
-  # Update Internet Archive
-  ia upload ${f} $f --remote-name=$f --metadata="title:${f}" 
--metadata="mediatype:software" --metadata="collection:open_source_software"
-done
+#!/usr/bin/env python3
+
+from github import Github
+
+import sys
+import json
+import urllib
+import subprocess
+
+REPO_NAME = "TheTorProject/gettorbrowser"
+
+def delete_old_releases(repo):
+for release in repo.get_releases():
+release.delete_release()
+
+#Download list of tor browser releases and upload them to github
+def upload_files(release):
+url = 
urllib.request.urlopen("https://aus1.torproject.org/torbrowser/update_3/release/downloads.json;)
+data = json.loads(url.read().decode())
+for arch in data['downloads']:
+for locale in data['downloads'][arch]:
+for asset in data['downloads'][arch][locale]:
+url = data['downloads'][arch][locale][asset]
+filename = url.split('/')[-1]
+print("Downloading " + filename)
+subprocess.check_call(["/usr/bin/wget", url])
+release.upload_asset(filename)
+
+
+def main(token):
+
+#Initialize a new release
+g = Github(token)
+repo = g.get_repo(REPO_NAME)
+
+delete_old_releases(repo)
+
+#Create a new release
+release = repo.create_git_release("torbrowser-release", "Tor Browser 
releases", "These releases were uploaded to be distributed with gettor.")
+upload_files(release)
+
+
+if __name__ == "__main__":
+if len(sys.argv) != 2:
+print("Usage: {} AUTH_TOKEN".format(sys.argv[0]), file=sys.stderr)
+print("\nAUTH_TOKEN should be an authentication token for a user"
+  "with access to the gettor repository.", file=sys.stderr)
+sys.exit(1)
+token = sys.argv[1]
+
+sys.exit(main(token))



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

[tor-commits] [gettor/master] Exit with non-zero code if some uploads fail

2019-12-05 Thread cohosh

commit ee8d5a85ff6388a27c6aecadcaec3d7c6c920ec6
Author: Cecylia Bocovich 
Date:   Mon Nov 25 15:02:23 2019 -0500

Exit with non-zero code if some uploads fail

The script will continue with the rest of the uploads but will exit with
a non-zero code so that we'll be notified to upload the missing files
manually.
---
 scripts/update_files | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/scripts/update_files b/scripts/update_files
index ab45930..827d7d5 100755
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -9,6 +9,8 @@ import subprocess
 
 REPO_NAME = "TheTorProject/gettorbrowser"
 
+failure = False
+
 def delete_old_releases(repo):
 for release in repo.get_releases():
 release.delete_release()
@@ -28,6 +30,7 @@ def upload_files(release):
 except:
 print("Error: failed to download "+url)
 print("Please upload this file manually.")
+failure = True
 
 
 
@@ -43,6 +46,9 @@ def main(token):
 release = repo.create_git_release("torbrowser-release", "Tor Browser 
releases", "These releases were uploaded to be distributed with gettor.")
 upload_files(release)
 
+if failure:
+sys.exit(1)
+
 
 if __name__ == "__main__":
 if len(sys.argv) != 2:



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

[tor-commits] [gettor/master] Update AUTHORS

2019-12-05 Thread cohosh

commit f6ef9bbe91c972dc499f2e10130ac89452d2b831
Author: Cecylia Bocovich 
Date:   Wed Nov 20 14:11:11 2019 -0500

Update AUTHORS
---
 AUTHORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS b/AUTHORS
index d126179..61a2e09 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,3 +14,4 @@ Contributors:
 Sukhbir Singh  4096R/B297B391
 Aaron Gibson
 Donncha O'Cearbhaill
+Cecylia Bocovich   



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

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

2019-12-05 Thread translation

commit 4dfef02269451dc33b495840d2c02e760af3cf8b
Author: Translation commit bot 
Date:   Thu Dec 5 21:15:37 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ro/LC_MESSAGES/messages.po | 61 ---
 1 file changed, 44 insertions(+), 17 deletions(-)

diff --git a/locale/ro/LC_MESSAGES/messages.po 
b/locale/ro/LC_MESSAGES/messages.po
index d3daef01fb..23be54f29b 100644
--- a/locale/ro/LC_MESSAGES/messages.po
+++ b/locale/ro/LC_MESSAGES/messages.po
@@ -127,14 +127,15 @@ msgstr "DonaÈi folosind BTCPayServer"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:126
 msgid "Donate using wallet addresses"
-msgstr "DonaÈi folosind adrese wallet"
+msgstr "DonaÈi folosind adrese wallet"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:133
 msgid ""
 "Please fill out this form and then send your coins to the appropriate "
 "wallet."
 msgstr ""
-"completeaza forma aceasta si trimite monezi catre portofelul corespunzator."
+"CompletaÈi acest formular Èi trimiteÈi monezile dvs. cÄtre portofelul "
+"corespunzÄtor."
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:135
 msgid ""
@@ -142,19 +143,22 @@ msgid ""
 "your donation quickly, allow us to send you an acknowledgement, and let us "
 "know your communication preferences."
 msgstr ""
-"nu este necesar sa completezi forma asta, dar completand-o sa fim informati "
-"despre donatie, permitandu-ne sa iti comfirmam, si sa stim preferintele tale"
-" pentru comunicatii."
+"Nu este necesarÄ completarea acestui formular, dar completÃ¢ndu-l vom fi "
+"informaÈi rapid despre donaÈie Èi ne va permite sÄ vÄ trimitem o 
confirmare "
+"Èi sÄ vÄ aflÄm preferinÈele de comunicare."
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:141
 msgid ""
 "Below you will find the cryptocurrencies we accept and our wallet addresses."
-msgstr "mai jos gasesti ce monezi criptate acceptam si adresa portofelului"
+msgstr ""
+"Mai jos gÄsiÈi criptomonedele acceptate Èi adresele noastre de portofel."
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:143
 msgid ""
 "The wallet addresses will be displayed again after you complete the form."
-msgstr "adresa portofelului va fi afisata dupa ce completezi forma"
+msgstr ""
+"Adresele pentru portofel vor fi afiÈate din nou dupÄ completarea "
+"formularului."
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:145
 msgid ""
@@ -1802,52 +1806,58 @@ msgid ""
 " class=\"hyperlinks links\">Use Giving Assistant to save money and support "
 "the Tor Project"
 msgstr ""
+"https://givingassistant.org/np#tor-project-inc\; target=\"_blank\""
+" class=\"hyperlinks links\">FolosiÈi Giving Assistant pentru a economisi "
+"bani Èi pentru a sprijini Proiectul Tor"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:573
 msgid "Can I make a stock donation?"
-msgstr ""
+msgstr "Pot dona valori mobiliare?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:577
 msgid "You can donate stock to the Tor Project."
-msgstr ""
+msgstr "PuteÈi dona valori mobiliare pentru Proiectul Tor."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:579
 msgid ""
 "Please let us know in advance if you are transmitting securities via DTC by "
 "contacting us at giving(at)torproject.org."
 msgstr ""
+"VÄ rugÄm sÄ ne informaÈi Ã®n avans dacÄ transmiteÈi valori mobiliare 
prin "
+"DTC, contactÃ¢ndu-ne la giving(at)torproject.org."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:583
 msgid "Brokerage Firm: Merrill Lynch, Pierce, Fenner & Smith, Inc."
-msgstr ""
+msgstr "Brokerage Firm: Merrill Lynch, Pierce, Fenner & Smith, Inc."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:587
 msgid "Account Name: The Tor Project"
-msgstr ""
+msgstr "NUme cont: The Tor Project"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:591
 msgid "Contact: Jeffrey K. Miller: 206.464.3564"
-msgstr ""
+msgstr "Contact: Jeffrey K. Miller: 206.464.3564"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:595
 msgid "E-mail: jeffrey.k.miller(at)ml.com"
-msgstr ""
+msgstr "E-mail: jeffrey.k.miller(at)ml.com"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:599
 msgid "FAX: 206.388.4456"
-msgstr ""
+msgstr "FAX: 206.388.4456"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:603
 msgid "The Tor Project Account #: ***-*3016"
-msgstr ""

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

2019-12-05 Thread translation

commit c0cee7c221a7253f4548e8a48ca857aec2572991
Author: Translation commit bot 
Date:   Thu Dec 5 20:45:44 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ro/LC_MESSAGES/messages.po | 102 ++
 1 file changed, 93 insertions(+), 9 deletions(-)

diff --git a/locale/ro/LC_MESSAGES/messages.po 
b/locale/ro/LC_MESSAGES/messages.po
index b791e9d81b..d3daef01fb 100644
--- a/locale/ro/LC_MESSAGES/messages.po
+++ b/locale/ro/LC_MESSAGES/messages.po
@@ -1071,6 +1071,10 @@ msgid ""
 "target=\"_blank\">running Tor relays to help carry traffic for other "
 "users."
 msgstr ""
+"De asemenea, oamenii sprijinÄ Tor Ã®n moduri nefinanciare, de exemplu, https://community.torproject.org/relay/\; "
+"target=\"_blank\">rulÃ¢nd relee Tor, ajutÃ¢nd la transportul traficului "
+"pentru alÈi utilizatori."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:214
 msgid ""
@@ -1116,6 +1120,9 @@ msgid ""
 "https://youtu.be/JWII85UlzKw\; "
 "target=\"_blank\">Watch this video to learn more about how Tor works."
 msgstr ""
+"https://youtu.be/JWII85UlzKw\; "
+"target=\"_blank\">UrmÄriÈi acest videoclip pentru a afla mai multe "
+"despre cum funcÈioneazÄ Tor."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:237
 msgid ""
@@ -1131,6 +1138,9 @@ msgid ""
 "href=\"https://support.torproject.org/faq/\;>This Tor Project FAQ has "
 "answers to all those questions, and more."
 msgstr ""
+"https://support.torproject.org/faq/\;>ÃntrebÄrile frecvente pentru "
+"Tor Project au rÄspunsuri la toate aceste Ã®ntrebÄri Èi multe altele."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:247
 msgid "Does the Tor software work?"
@@ -1164,6 +1174,12 @@ msgid ""
 "book Data and Goliath, security expert Bruce Schneier wrote, \"the current "
 "best tool to protect your anonymity when browsing the web is Tor.\""
 msgstr ""
+"FundaÈia Electronic Frontier spune cÄ Tor oferÄ https://www.eff.org/deeplinks/2014/07/7;
+"-things-you-should-know-about-tor\">unele dintre cele mai puternice programe"
+" de anonimat care existÄ, iar Ã®n cartea sa Data and Goliath, expertul 
Ã®n"
+" securitate Bruce Schneier a scris cÄ âcel mai bun instrument actual 
pentru "
+"a vÄ proteja anonimatul atunci cÃ¢nd navigaÈi pe web este Tor.â"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:261
 msgid "Is what Tor does legal? Can I get in trouble for using it?"
@@ -1227,6 +1243,9 @@ msgid ""
 "href=\"https://www.torproject.org/about/financials.html.en\;>financial "
 "statements and its Form 990."
 msgstr ""
+"IatÄ  https://www.torproject.org/about/financials.html.en\;>declaraÈiile "
+"financiare Èi Formularul 990 ale Proiectului Tor."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:289
 msgid "Where does the Tor Project's money come from?"
@@ -1248,6 +1267,9 @@ msgid ""
 "href=\"https://www.torproject.org/about/sponsors\;>Sponsors Page for "
 "more.)"
 msgstr ""
+"(ConsultaÈi https://www.torproject.org/about/sponsors\;>Pagina Sponsorilor "
+"pentru mai multe detalii.)"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:297
 msgid ""
@@ -1285,7 +1307,7 @@ msgstr "CÃ¢Èi bani cheltuieÈte anual Tor Project Èi la 
ce se utilizeazÄ?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:311
 msgid "The Tor Project spends about $5 million annually."
-msgstr ""
+msgstr "Proiectul Tor cheltuieÈte aproximativ 5 milioane de dolari anual."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:313
 #, php-format
@@ -1351,6 +1373,8 @@ msgid ""
 "For European bank transfers, we have an arrangement with the Renewable "
 "Freedom Foundation to provide tax-deductible donations for Europeans."
 msgstr ""
+"Pentru transferurile bancare europene, avem un acord cu FundaÈia Renewable "
+"Freedom pentru a oferi europenilor donaÈii deductibile din taxe."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:347
 msgid ""
@@ -1361,7 +1385,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:349
 msgid "The account information is as follows:"
-msgstr ""
+msgstr "InformaÈiile pentru cont sunt urmÄtoarele:"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:353
 msgid ""
@@ -1372,6 +1396,12 @@ msgid ""
 "  Rathausplatz 6\n"
 "  85049 Ingolstadt"
 msgstr ""
+"Renewable Freedom Foundation\n"
+"  IBAN: DE1772150053693701\n"
+"  BIC: BYLADEM1ING\n"
+"  Sparkasse Ingolstadt\n"
+"  Rathausplatz 6\n"
+"  85049 Ingolstadt"
 
 #:

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

2019-12-05 Thread translation

commit 67c945edb34113ae3ef84b1bd2c2270b71e91f98
Author: Translation commit bot 
Date:   Thu Dec 5 18:50:21 2019 +

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

diff --git a/contents+ja.po b/contents+ja.po
index 8f13916d6b..5a4e061c5b 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -331,8 +331,8 @@ msgid ""
 "the latest version of Tor Browser, hosted at a variety of locations, such as"
 " Dropbox, Google Drive and GitHub."
 msgstr ""
-"GetTor ã¯ææ°ãã¼ã¸ã§ã³ã® Tor Browser 
ã¸ã®ãªã³ã¯ãã¡ãã»ã¼ã¸ã§èªåçã«è¿ä¿¡ãããµã¼ãã¹ã§ãããã¡ã¤ã«ã¯
 Dropboxï¼Google"
-" Drive ããã³ GitHub ã¨ãã£ããã¾ãã¾ãªå 
´æã§ãã¹ãããã¦ãã¾ãã"
+"GetTor ã¯ææ°ãã¼ã¸ã§ã³ã® 
Torãã©ã¦ã¶ã¸ã®ãªã³ã¯ãã¡ãã»ã¼ã¸ã§èªåçã«è¿ä¿¡ãããµã¼ãã¹ã§ãããã¡ã¤ã«ã¯
 Dropboxï¼Google "
+"Drive ããã³ GitHub ã¨ãã£ããã¾ãã¾ãªå 
´æã§ãã¹ãããã¦ãã¾ãã"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -948,7 +948,7 @@ msgstr "èå¥åã®ç®¡ç"
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.description)
 msgid "Learn how to control personally-identifying information in Tor Browser"
-msgstr ""
+msgstr "Tor ãã©ã¦ã¶ã«ãããåäººèå¥æå ±ã®å¶å¾¡ãå¦ã¶ã"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1237,12 +1237,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.title)
 msgid "SECURE CONNECTIONS"
-msgstr ""
+msgstr "æ¥ç¶ãä¿è·ããã"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.description)
 msgid "Learn how to protect your data using Tor Browser and HTTPS"
-msgstr ""
+msgstr 
"Torãã©ã¦ã¶åã³HTTPSãä½¿ç¨æã®ãã¼ã¿ä¿è·æ¹æ³ãå¦ã¶ã"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
@@ -1258,7 +1258,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.title)
 msgid "SECURITY SETTINGS"
-msgstr ""
+msgstr "ã»ãã¥ãªãã£è¨å®"
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.description)
@@ -1409,7 +1409,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.title)
 msgid "UPDATING"
-msgstr ""
+msgstr "ã¢ãããã¼ã"
 
 #: https//tb-manual.torproject.org/updating/
 #: (content/updating/contents+en.lrtopic.description)
@@ -1501,7 +1501,7 @@ msgstr "åé¡ã®è§£æ±º"
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.description)
 msgid "What to do if Tor Browser doesnât work"
-msgstr "Tor Browser ãæ£ããåä½ããªãæã«ã¯"
+msgstr "Torãã©ã¦ã¶ãæ£ããåä½ããªãæã«ã¯"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1510,8 +1510,8 @@ msgid ""
 " running the program, and clicking the âConnectâ button if you are using 
it "
 "for the first time."
 msgstr ""
-"Tor Browser 
ãèµ·åãã¦ããã«ãã¾ãããã¯ããã¦ã®ä½¿ç¨ã§ããã°ãæ¥ç¶ããã¿ã³ãã¯ãªãã¯ãã¦ããã«
 Tor Browser "
-"ãå©ç¨ãã¦ã®ã¦ã§ããã©ã¦ã¸ã³ã°ãå§ããããã¯ãã§ãã"
+"Torãã©ã¦ã¶ãèµ·åãã¦ããã«ãã¾ãããã¯ããã¦ã®ä½¿ç¨ã§ããã°ãæ¥ç¶ããã¿ã³ãã¯ãªãã¯ãã¦ããã«
 "
+"Torãã©ã¦ã¶ãå©ç¨ãã¦ã®ã¦ã§ããã©ã¦ã¸ã³ã°ãå§ããããã¯ãã§ãã"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1523,7 +1523,7 @@ msgstr ""
 msgid ""
 "If Tor Browser doesnât connect, there may be a simple solution. Try each of 
"
 "the following:"
-msgstr "Tor Browser ããããã¯ã¼ã¯ã«æ¥ç¶ã§ããªãå 
´åãç°¡åãªè§£æ±ºçãããããããã¾ãããä»¥ä¸ããããããè©¦ããã
 ããã"
+msgstr "Torãã©ã¦ã¶ããããã¯ã¼ã¯ã«æ¥ç¶ã§ããªãå 
´åãç°¡åãªè§£æ±ºçãããããããã¾ãããä»¥ä¸ããããããè©¦ããã
 ããã"
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1538,8 +1538,7 @@ msgid ""
 "* Make sure another Tor Browser is not already running. If youâre not sure "
 "if Tor Browser is running, restart your computer."
 msgstr ""
-"* å¥ã® Tor Browser ãå®è¡ä¸ã§ãªããã¨ãç¢ºèªãã¾ããTor 
Browser "

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

2019-12-05 Thread nickm

commit 247dbf891f98b44b35062b871338bbe6efaf3c2b
Merge: cee30117c 8933c7908
Author: Nick Mathewson 
Date:   Thu Dec 5 13:33:05 2019 -0500

Merge branch 'maint-0.4.1' into release-0.4.1

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

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

[tor-commits] [tor/release-0.4.1] Bump to 0.4.0.6

2019-12-05 Thread nickm

commit e66533befae9c61dad4a2905147c048c2ff17da0
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:01 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 4b69b3c89..d66dd6db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.5-dev])
+AC_INIT([tor],[0.4.0.6])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-05-02"], # for 0.4.0.5-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.0.6
   [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 7b3cf2116..29674dee4 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.5-dev"
+!define VERSION "0.4.0.6"
 !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 adac42268..fa1bc6814 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.5-dev"
+#define VERSION "0.4.0.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.0] Merge branch 'maint-0.4.0' into release-0.4.0

2019-12-05 Thread nickm

commit c3a3539da82177e41275dd8a2761b43b75fd7a9c
Merge: 948e9bf6c e66533bef
Author: Nick Mathewson 
Date:   Thu Dec 5 13:33:04 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

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

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

[tor-commits] [tor/release-0.4.2] Bump to 0.4.2.5

2019-12-05 Thread nickm

commit 0a33522b6268ca8936df37dab4ed622e0ff5507b
Author: Nick Mathewson 
Date:   Thu Dec 5 13:32:30 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index a5c7b5ca1..6d2dae91a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.4-rc-dev])
+AC_INIT([tor],[0.4.2.5])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-15"], # for 0.4.2.4-rc-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.2.5
   [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 fb6799214..fa0bb6b35 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.2.4-rc-dev"
+!define VERSION "0.4.2.5"
 !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 2456ff8af..18f8afca7 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.4-rc-dev"
+#define VERSION "0.4.2.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.2] Merge branch 'maint-0.4.2' into release-0.4.2

2019-12-05 Thread nickm

commit cb51b0d55eea5802ca0917417055392d3c71ef35
Merge: 9b2d87029 0a33522b6
Author: Nick Mathewson 
Date:   Thu Dec 5 13:33:05 2019 -0500

Merge branch 'maint-0.4.2' into release-0.4.2

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

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

[tor-commits] [tor/release-0.4.2] bump version to 0.4.1.7

2019-12-05 Thread nickm

commit 8933c7908d9d894f50d46c7962457fa512190e1b
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 7bdd195e6..3725235e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.6-dev])
+AC_INIT([tor],[0.4.1.7])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-09-19"], # for 0.4.1.6-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.1.7
   [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 32f7692f1..c3c14186d 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.1.6-dev"
+!define VERSION "0.4.1.7"
 !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 78370ae0a..cbf6217dd 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.6-dev"
+#define VERSION "0.4.1.7"
 
 
 



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

[tor-commits] [tor/release-0.4.0] Bump to 0.4.0.6

2019-12-05 Thread nickm

commit e66533befae9c61dad4a2905147c048c2ff17da0
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:01 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 4b69b3c89..d66dd6db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.5-dev])
+AC_INIT([tor],[0.4.0.6])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-05-02"], # for 0.4.0.5-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.0.6
   [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 7b3cf2116..29674dee4 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.5-dev"
+!define VERSION "0.4.0.6"
 !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 adac42268..fa1bc6814 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.5-dev"
+#define VERSION "0.4.0.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.2] Bump version to 0.3.5.9

2019-12-05 Thread nickm

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3
Author: Nick Mathewson 
Date:   Thu Dec 5 13:29:49 2019 -0500

Bump version to 0.3.5.9
---
 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 52cc877db..15b66eef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8-dev])
+AC_INIT([tor],[0.3.5.9])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9d82c5c3d..32d468e79 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.8-dev"
+!define VERSION "0.3.5.9"
 !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 8512da128..6d1801f85 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.8-dev"
+#define VERSION "0.3.5.9"
 
 
 



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

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

2019-12-05 Thread nickm

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e
Merge: 92fb09906 c53567c36
Author: Nick Mathewson 
Date:   Thu Dec 5 13:30:32 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.




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

2019-12-05 Thread nickm

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e
Merge: 92fb09906 c53567c36
Author: Nick Mathewson 
Date:   Thu Dec 5 13:30:32 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.




___
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.2] Bump to 0.4.0.6

2019-12-05 Thread nickm

commit e66533befae9c61dad4a2905147c048c2ff17da0
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:01 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 4b69b3c89..d66dd6db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.5-dev])
+AC_INIT([tor],[0.4.0.6])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-05-02"], # for 0.4.0.5-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.0.6
   [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 7b3cf2116..29674dee4 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.5-dev"
+!define VERSION "0.4.0.6"
 !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 adac42268..fa1bc6814 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.5-dev"
+#define VERSION "0.4.0.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.1] Bump version to 0.3.5.9

2019-12-05 Thread nickm

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3
Author: Nick Mathewson 
Date:   Thu Dec 5 13:29:49 2019 -0500

Bump version to 0.3.5.9
---
 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 52cc877db..15b66eef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8-dev])
+AC_INIT([tor],[0.3.5.9])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9d82c5c3d..32d468e79 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.8-dev"
+!define VERSION "0.3.5.9"
 !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 8512da128..6d1801f85 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.8-dev"
+#define VERSION "0.3.5.9"
 
 
 



___
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.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2019-12-05 Thread nickm

commit f8df0f5f32a1deaeb329ad78f05d209173c5f458
Merge: bb786797a 8933c7908
Author: Nick Mathewson 
Date:   Thu Dec 5 13:32:06 2019 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.




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

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

2019-12-05 Thread nickm

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e
Merge: 92fb09906 c53567c36
Author: Nick Mathewson 
Date:   Thu Dec 5 13:30:32 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.




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

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

2019-12-05 Thread nickm

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e
Merge: 92fb09906 c53567c36
Author: Nick Mathewson 
Date:   Thu Dec 5 13:30:32 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.




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

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

2019-12-05 Thread nickm

commit db1065403ddabacd7c67273bff30f027151fb142
Merge: cfa9cc34a e66533bef
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:17 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

"ours" to avoid version bump.




___
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.2] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-05 Thread nickm

commit db1065403ddabacd7c67273bff30f027151fb142
Merge: cfa9cc34a e66533bef
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:17 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

"ours" to avoid version bump.




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

[tor-commits] [tor/release-0.4.1] bump version to 0.4.1.7

2019-12-05 Thread nickm

commit 8933c7908d9d894f50d46c7962457fa512190e1b
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 7bdd195e6..3725235e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.6-dev])
+AC_INIT([tor],[0.4.1.7])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-09-19"], # for 0.4.1.6-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.1.7
   [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 32f7692f1..c3c14186d 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.1.6-dev"
+!define VERSION "0.4.1.7"
 !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 78370ae0a..cbf6217dd 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.6-dev"
+#define VERSION "0.4.1.7"
 
 
 



___
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] Bump version to 0.3.5.9

2019-12-05 Thread nickm

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3
Author: Nick Mathewson 
Date:   Thu Dec 5 13:29:49 2019 -0500

Bump version to 0.3.5.9
---
 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 52cc877db..15b66eef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8-dev])
+AC_INIT([tor],[0.3.5.9])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9d82c5c3d..32d468e79 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.8-dev"
+!define VERSION "0.3.5.9"
 !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 8512da128..6d1801f85 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.8-dev"
+#define VERSION "0.3.5.9"
 
 
 



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

[tor-commits] [tor/master] Bump version to 0.3.5.9

2019-12-05 Thread nickm

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3
Author: Nick Mathewson 
Date:   Thu Dec 5 13:29:49 2019 -0500

Bump version to 0.3.5.9
---
 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 52cc877db..15b66eef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8-dev])
+AC_INIT([tor],[0.3.5.9])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9d82c5c3d..32d468e79 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.8-dev"
+!define VERSION "0.3.5.9"
 !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 8512da128..6d1801f85 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.8-dev"
+#define VERSION "0.3.5.9"
 
 
 



___
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.2] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-12-05 Thread nickm

commit db1065403ddabacd7c67273bff30f027151fb142
Merge: cfa9cc34a e66533bef
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:17 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

"ours" to avoid version bump.




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

[tor-commits] [tor/master] bump version to 0.4.1.7

2019-12-05 Thread nickm

commit 8933c7908d9d894f50d46c7962457fa512190e1b
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 7bdd195e6..3725235e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.6-dev])
+AC_INIT([tor],[0.4.1.7])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-09-19"], # for 0.4.1.6-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.1.7
   [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 32f7692f1..c3c14186d 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.1.6-dev"
+!define VERSION "0.4.1.7"
 !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 78370ae0a..cbf6217dd 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.6-dev"
+#define VERSION "0.4.1.7"
 
 
 



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

[tor-commits] [tor/master] Bump to 0.4.2.5

2019-12-05 Thread nickm

commit 0a33522b6268ca8936df37dab4ed622e0ff5507b
Author: Nick Mathewson 
Date:   Thu Dec 5 13:32:30 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index a5c7b5ca1..6d2dae91a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.4-rc-dev])
+AC_INIT([tor],[0.4.2.5])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-15"], # for 0.4.2.4-rc-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.2.5
   [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 fb6799214..fa0bb6b35 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.2.4-rc-dev"
+!define VERSION "0.4.2.5"
 !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 2456ff8af..18f8afca7 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.4-rc-dev"
+#define VERSION "0.4.2.5"
 
 
 



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

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

2019-12-05 Thread nickm

commit db1065403ddabacd7c67273bff30f027151fb142
Merge: cfa9cc34a e66533bef
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:17 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

"ours" to avoid version bump.




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

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

2019-12-05 Thread nickm

commit 39bb283fca95648aeb58d9e8927de6e1530c6015
Merge: 37d1ee554 0a33522b6
Author: Nick Mathewson 
Date:   Thu Dec 5 13:32:40 2019 -0500

Merge branch 'maint-0.4.2'

"ours" to avoid version bump.

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

[tor-commits] [tor/master] Bump to 0.4.0.6

2019-12-05 Thread nickm

commit e66533befae9c61dad4a2905147c048c2ff17da0
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:01 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 4b69b3c89..d66dd6db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.5-dev])
+AC_INIT([tor],[0.4.0.6])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-05-02"], # for 0.4.0.5-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.0.6
   [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 7b3cf2116..29674dee4 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.5-dev"
+!define VERSION "0.4.0.6"
 !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 adac42268..fa1bc6814 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.5-dev"
+#define VERSION "0.4.0.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.0] Bump version to 0.3.5.9

2019-12-05 Thread nickm

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3
Author: Nick Mathewson 
Date:   Thu Dec 5 13:29:49 2019 -0500

Bump version to 0.3.5.9
---
 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 52cc877db..15b66eef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8-dev])
+AC_INIT([tor],[0.3.5.9])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9d82c5c3d..32d468e79 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.8-dev"
+!define VERSION "0.3.5.9"
 !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 8512da128..6d1801f85 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.8-dev"
+#define VERSION "0.3.5.9"
 
 
 



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

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

2019-12-05 Thread nickm

commit db1065403ddabacd7c67273bff30f027151fb142
Merge: cfa9cc34a e66533bef
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:17 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1

"ours" to avoid version bump.




___
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.2] Bump to 0.4.0.6

2019-12-05 Thread nickm

commit e66533befae9c61dad4a2905147c048c2ff17da0
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:01 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 4b69b3c89..d66dd6db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.5-dev])
+AC_INIT([tor],[0.4.0.6])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-05-02"], # for 0.4.0.5-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.0.6
   [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 7b3cf2116..29674dee4 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.5-dev"
+!define VERSION "0.4.0.6"
 !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 adac42268..fa1bc6814 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.5-dev"
+#define VERSION "0.4.0.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.1] bump version to 0.4.1.7

2019-12-05 Thread nickm

commit 8933c7908d9d894f50d46c7962457fa512190e1b
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 7bdd195e6..3725235e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.6-dev])
+AC_INIT([tor],[0.4.1.7])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-09-19"], # for 0.4.1.6-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.1.7
   [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 32f7692f1..c3c14186d 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.1.6-dev"
+!define VERSION "0.4.1.7"
 !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 78370ae0a..cbf6217dd 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.6-dev"
+#define VERSION "0.4.1.7"
 
 
 

___
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.2] Bump version to 0.3.5.9

2019-12-05 Thread nickm

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3
Author: Nick Mathewson 
Date:   Thu Dec 5 13:29:49 2019 -0500

Bump version to 0.3.5.9
---
 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 52cc877db..15b66eef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8-dev])
+AC_INIT([tor],[0.3.5.9])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9d82c5c3d..32d468e79 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.8-dev"
+!define VERSION "0.3.5.9"
 !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 8512da128..6d1801f85 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.8-dev"
+#define VERSION "0.3.5.9"
 
 
 



___
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.2] bump version to 0.4.1.7

2019-12-05 Thread nickm

commit 8933c7908d9d894f50d46c7962457fa512190e1b
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:46 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 7bdd195e6..3725235e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.6-dev])
+AC_INIT([tor],[0.4.1.7])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-09-19"], # for 0.4.1.6-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.1.7
   [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 32f7692f1..c3c14186d 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.1.6-dev"
+!define VERSION "0.4.1.7"
 !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 78370ae0a..cbf6217dd 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.6-dev"
+#define VERSION "0.4.1.7"
 
 
 



___
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

2019-12-05 Thread nickm

commit bd664bca96566f2491c854dc9f07966650b1c61a
Merge: 084446058 c53567c36
Author: Nick Mathewson 
Date:   Thu Dec 5 13:33:04 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.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/master] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-12-05 Thread nickm

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e
Merge: 92fb09906 c53567c36
Author: Nick Mathewson 
Date:   Thu Dec 5 13:30:32 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.




___
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.2] Merge branch 'maint-0.4.1' into maint-0.4.2

2019-12-05 Thread nickm

commit f8df0f5f32a1deaeb329ad78f05d209173c5f458
Merge: bb786797a 8933c7908
Author: Nick Mathewson 
Date:   Thu Dec 5 13:32:06 2019 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.




___
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.2] Bump to 0.4.2.5

2019-12-05 Thread nickm

commit 0a33522b6268ca8936df37dab4ed622e0ff5507b
Author: Nick Mathewson 
Date:   Thu Dec 5 13:32:30 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index a5c7b5ca1..6d2dae91a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.4-rc-dev])
+AC_INIT([tor],[0.4.2.5])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-11-15"], # for 0.4.2.4-rc-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.2.5
   [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 fb6799214..fa0bb6b35 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.2.4-rc-dev"
+!define VERSION "0.4.2.5"
 !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 2456ff8af..18f8afca7 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.4-rc-dev"
+#define VERSION "0.4.2.5"
 
 
 

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

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

2019-12-05 Thread nickm

commit f8df0f5f32a1deaeb329ad78f05d209173c5f458
Merge: bb786797a 8933c7908
Author: Nick Mathewson 
Date:   Thu Dec 5 13:32:06 2019 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.




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

[tor-commits] [tor/maint-0.4.1] Bump to 0.4.0.6

2019-12-05 Thread nickm

commit e66533befae9c61dad4a2905147c048c2ff17da0
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:01 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 4b69b3c89..d66dd6db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.5-dev])
+AC_INIT([tor],[0.4.0.6])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-05-02"], # for 0.4.0.5-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.0.6
   [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 7b3cf2116..29674dee4 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.5-dev"
+!define VERSION "0.4.0.6"
 !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 adac42268..fa1bc6814 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.5-dev"
+#define VERSION "0.4.0.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.2] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-12-05 Thread nickm

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e
Merge: 92fb09906 c53567c36
Author: Nick Mathewson 
Date:   Thu Dec 5 13:30:32 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.




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

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

2019-12-05 Thread nickm

commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e
Merge: 92fb09906 c53567c36
Author: Nick Mathewson 
Date:   Thu Dec 5 13:30:32 2019 -0500

Merge branch 'maint-0.3.5' into maint-0.4.0

"ours" to avoid version bump.




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

[tor-commits] [tor/maint-0.4.1] Bump version to 0.3.5.9

2019-12-05 Thread nickm

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3
Author: Nick Mathewson 
Date:   Thu Dec 5 13:29:49 2019 -0500

Bump version to 0.3.5.9
---
 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 52cc877db..15b66eef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8-dev])
+AC_INIT([tor],[0.3.5.9])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9d82c5c3d..32d468e79 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.8-dev"
+!define VERSION "0.3.5.9"
 !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 8512da128..6d1801f85 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.8-dev"
+#define VERSION "0.3.5.9"
 
 
 



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

[tor-commits] [tor/maint-0.4.0] Bump to 0.4.0.6

2019-12-05 Thread nickm

commit e66533befae9c61dad4a2905147c048c2ff17da0
Author: Nick Mathewson 
Date:   Thu Dec 5 13:31:01 2019 -0500

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

diff --git a/configure.ac b/configure.ac
index 4b69b3c89..d66dd6db0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.0.5-dev])
+AC_INIT([tor],[0.4.0.6])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # version number changes.  Tor uses it to make sure that it
 # only shuts down for missing "required protocols" when those protocols
 # are listed as required by a consensus after this date.
-AC_DEFINE(APPROX_RELEASE_DATE, ["2019-05-02"], # for 0.4.0.5-dev
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.0.6
   [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 7b3cf2116..29674dee4 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.0.5-dev"
+!define VERSION "0.4.0.6"
 !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 adac42268..fa1bc6814 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.0.5-dev"
+#define VERSION "0.4.0.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.0] Bump version to 0.3.5.9

2019-12-05 Thread nickm

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3
Author: Nick Mathewson 
Date:   Thu Dec 5 13:29:49 2019 -0500

Bump version to 0.3.5.9
---
 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 52cc877db..15b66eef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8-dev])
+AC_INIT([tor],[0.3.5.9])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9d82c5c3d..32d468e79 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.8-dev"
+!define VERSION "0.3.5.9"
 !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 8512da128..6d1801f85 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.8-dev"
+#define VERSION "0.3.5.9"
 
 
 



___
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] Bump version to 0.3.5.9

2019-12-05 Thread nickm

commit c53567c36f2ea55e4b3be2ce5cff06e0eddde5e3
Author: Nick Mathewson 
Date:   Thu Dec 5 13:29:49 2019 -0500

Bump version to 0.3.5.9
---
 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 52cc877db..15b66eef6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.5.8-dev])
+AC_INIT([tor],[0.3.5.9])
 AC_CONFIG_SRCDIR([src/app/main/tor_main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9d82c5c3d..32d468e79 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.8-dev"
+!define VERSION "0.3.5.9"
 !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 8512da128..6d1801f85 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.8-dev"
+#define VERSION "0.3.5.9"
 
 
 

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

[tor-commits] [tor/master] Remove changes files that are scheduled for inclusion in 0.4.2.5

2019-12-05 Thread nickm

commit 37d1ee554da5db5a4e13ecdac3cc91e07656f27d
Author: Nick Mathewson 
Date:   Thu Dec 5 13:27:46 2019 -0500

Remove changes files that are scheduled for inclusion in 0.4.2.5
---
 changes/ticket32500 | 5 -
 1 file changed, 5 deletions(-)

diff --git a/changes/ticket32500 b/changes/ticket32500
deleted file mode 100644
index 2c0f35df7..0
--- a/changes/ticket32500
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Testing:
-- Require C99 standards-conforming code in Travis CI, but allow GNU gcc
-  extensions. Also activates clang's -Wtypedef-redefinition warnings.
-  Build some jobs with -std=gnu99, and some jobs without.
-  Closes ticket 32500.

___
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.2] Start releasenotes for 0.4.2.5

2019-12-05 Thread nickm

commit 9b2d87029264e12bf8f51cd2fe2a8a092c1b489a
Author: Nick Mathewson 
Date:   Thu Dec 5 13:25:52 2019 -0500

Start releasenotes for 0.4.2.5
---
 ChangeLog|   2 +-
 ReleaseNotes | 642 +++
 2 files changed, 643 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 12685beb6..bbefe58d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 Changes in version 0.4.2.5 - 2019-12-??
   Blurb blurb.
 
-  o Testing (backport from 0.4.2.5):
+  o Testing:
 - Require C99 standards-conforming code in Travis CI, but allow GNU
   gcc extensions. Also activates clang's -Wtypedef-redefinition
   warnings. Build some jobs with -std=gnu99, and some jobs without.
diff --git a/ReleaseNotes b/ReleaseNotes
index ad24efd60..545545b0f 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,648 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.4.2.5 - 2019-12-??
+  Blurb blurb.
+
+  o Major features (directory authorities):
+- Directory authorities now reject relays running all currently
+  deprecated release series. The currently supported release series
+  are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549.
+
+  o Major features (onion service v3, denial of service):
+- Add onion service introduction denial of service defenses. Intro
+  points can now rate-limit client introduction requests, using
+  parameters that can be sent by the service within the
+  ESTABLISH_INTRO cell. If the cell extension for this is not used,
+  the intro point will honor the consensus parameters. Closes
+  ticket 30924.
+
+  o Major bugfixes (circuit build, guard):
+- When considering upgrading circuits from "waiting for guard" to
+  "open", always ignore circuits that are marked for close.
+  Previously we could end up in the situation where a subsystem is
+  notified of a circuit opening, but the circuit is still marked for
+  close, leading to undesirable behavior. Fixes bug 30871; bugfix
+  on 0.3.0.1-alpha.
+
+  o Major bugfixes (crash, Linux, Android):
+- Tolerate systems (including some Android installations) where
+  madvise and MADV_DONTDUMP are available at build-time, but not at
+  run time. Previously, these systems would notice a failed syscall
+  and abort. Fixes bug 31570; bugfix on 0.4.1.1-alpha.
+- Tolerate systems (including some Linux installations) where
+  madvise and/or MADV_DONTFORK are available at build-time, but not
+  at run time. Previously, these systems would notice a failed
+  syscall and abort. Fixes bug 31696; bugfix on 0.4.1.1-alpha.
+
+  o Major bugfixes (embedded Tor):
+- Avoid a possible crash when restarting Tor in embedded mode and
+  enabling a different set of publish/subscribe messages. Fixes bug
+  31898; bugfix on 0.4.1.1-alpha.
+
+  o Major bugfixes (relay):
+- Relays now respect their AccountingMax bandwidth again. When
+  relays entered "soft" hibernation (which typically starts when
+  we've hit 90% of our AccountingMax), we had stopped checking
+  whether we should enter hard hibernation. Soft hibernation refuses
+  new connections and new circuits, but the existing circuits can
+  continue, meaning that relays could have exceeded their configured
+  AccountingMax. Fixes bug 32108; bugfix on 0.4.0.1-alpha.
+
+  o Major bugfixes (torrc parsing):
+- Stop ignoring torrc options after an %include directive, when the
+  included directory ends with a file that does not contain any
+  config options (but does contain comments or whitespace). Fixes
+  bug 31408; bugfix on 0.3.1.1-alpha.
+
+  o Major bugfixes (v3 onion services):
+- Onion services now always use the exact number of intro points
+  configured with the HiddenServiceNumIntroductionPoints option (or
+  fewer if nodes are excluded). Before, a service could sometimes
+  pick more intro points than configured. Fixes bug 31548; bugfix
+  on 0.3.2.1-alpha.
+
+  o Minor feature (onion services, control port):
+- The ADD_ONION command's keyword "BEST" now defaults to ED25519-V3
+  (v3) onion services. Previously it defaulted to RSA1024 (v2).
+  Closes ticket 29669.
+
+  o Minor features (auto-formatting scripts):
+- When annotating C macros, never generate a line that our check-
+  spaces script would reject. Closes ticket 31759.
+- When annotating C macros, try to remove cases of double-negation.
+  Closes ticket 31779.
+
+  o Minor features (best practices tracker):
+- Our best-practices tracker now integrates with our include-checker
+  tool to keep track of how many layering violations we have not yet
+  fixed. We hope to reduce this number over time to improve

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

2019-12-05 Thread translation

commit b5b021fbe93b3f44bb688543a325d9245672303b
Author: Translation commit bot 
Date:   Thu Dec 5 18:20:17 2019 +

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

diff --git a/contents+ja.po b/contents+ja.po
index c45b9e0116..8f13916d6b 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -7,6 +7,7 @@
 # Songbo Gong , 2019
 # Emma Peel, 2019
 # Tokumei Nanashi, 2019
+# 987 pluto , 2019
 # 
 msgid ""
 msgstr ""
@@ -14,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-29 10:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Tokumei Nanashi, 2019\n"
+"Last-Translator: 987 pluto , 2019\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -520,7 +521,7 @@ msgstr 
"åãã¦Torãã©ã¦ã¶ãå®è¡ããæã«ãTorãããã¯ã¼ã¯è¨
 msgid ""
 "This offers you the option to connect directly to the Tor network, or to "
 "configure Tor Browser for your connection."
-msgstr 
"ç´æ¥ã«Torãããã¯ã¼ã¯ã¨æ¥ç¶ããé¸æè¢ãããã¨ãæ¥ç¶ã«ãããã¦Torãã©ã¦ã¶ãè¨å®ããé¸æè¢ã¯ä¸ãããã¾ãã"
+msgstr 
"ã¦ã¼ã¶ã¼å´ãç´æ¥Torãããã¯ã¼ã¯ã¨æ¥ç¶ããããããã¨ãã¦ã¼ã¶ã¼ã®æ¥ç¶ã«åããã¦Torãã©ã¦ã¶å´ãèªåçã«è¨å®ããé¸æè¢ãä¸ãããã¾ãã"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -620,7 +621,7 @@ msgstr "Tor 
ãããã¯ã¼ã¯ããããã¯ããã¦ããæã«ã¯"
 msgid ""
 "Direct access to the Tor network may sometimes be blocked by your Internet "
 "Service Provider or by a government."
-msgstr ""
+msgstr 
"ããªãã®ã¤ã³ã¿ã¼ãããã»ãµã¼ãã¹ã»ãããã¤ãããã®Torãããã¯ã¼ã¯ã¸ã®ç´æ¥ã¢ã¯ã»ã¹ã¯æ¿åºã«ãã£ã¦é®æãããããããã¾ããã"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -628,6 +629,7 @@ msgid ""
 "Tor Browser includes some circumvention tools for getting around these "
 "blocks. These tools are called âpluggable transportsâ."
 msgstr ""
+"Torãã©ã¦ã¶ã¯ããããããã¯ã«å¯¾ããåé¿ãã¼ã«ãããã¤ãç¨æããã¦ãã¾ãããããã®ãã¼ã«ã®ãã¨ãããã©ã°æ¥ç¶å¯è½ãªãã©ã³ã¹ãã¼ããã¨å¼ã³ã¾ã"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -639,7 +641,7 @@ msgstr ""
 msgid ""
 "Currently there are three pluggable transports available, but more are being"
 " developed."
-msgstr ""
+msgstr 
"ç¾å¨ã3ã¤ã®ãã©ã°æ¥ç¶å¯è½ãªãã©ã³ã¹ãã¼ããä½¿ç¨å¯è½ã§ããããããããä»¥ä¸ã®æ°ã¯ãã
 ä»éçºä¸ã§ãã"
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
@@ -1394,7 +1396,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
 msgid "These changes affect images, media, and scripts."
-msgstr ""
+msgstr 
"ãããã®å¤æ´ã¯ãã¤ã¡ã¼ã¸ãã¡ãã£ã¢ãããã¦ã¹ã¯ãªããã«å½±é¿ãä¸ãã¾ãã"
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/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] [tor/release-0.3.5] Start a changelog for 0.3.5.9

2019-12-05 Thread nickm

commit 0844460589ff5d3418edc117c7130f03de3687ea
Author: Nick Mathewson 
Date:   Thu Dec 5 13:18:15 2019 -0500

Start a changelog for 0.3.5.9
---
 ChangeLog| 473 +++
 changes/29241_diagnostic |   4 -
 changes/bug12399 |   3 -
 changes/bug13221 |   5 -
 changes/bug22619 |   3 -
 changes/bug23507 |   5 -
 changes/bug23818_v2  |   6 -
 changes/bug23818_v3  |   6 -
 changes/bug27199 |   3 -
 changes/bug28525 |   7 -
 changes/bug28656 |   3 -
 changes/bug28698 |   3 -
 changes/bug29017 |   4 -
 changes/bug29034 |   5 -
 changes/bug29036 |   5 -
 changes/bug29144 |   5 -
 changes/bug29145 |   3 -
 changes/bug29241 |   6 -
 changes/bug29530_035 |   5 -
 changes/bug29599 |   3 -
 changes/bug29601 |   6 -
 changes/bug29665 |   7 -
 changes/bug29670 |   4 -
 changes/bug29703 |   4 -
 changes/bug29706_minimal |   4 -
 changes/bug29875 |  11 -
 changes/bug29922 |   4 -
 changes/bug30011 |   4 -
 changes/bug30021 |   8 -
 changes/bug30040 |   9 -
 changes/bug30041 |   5 -
 changes/bug30148 |   4 -
 changes/bug30189 |   4 -
 changes/bug30190 |   3 -
 changes/bug30316 |   4 -
 changes/bug30344 |   4 -
 changes/bug30452 |   3 -
 changes/bug30475 |   4 -
 changes/bug30561 |   6 -
 changes/bug30713 |   5 -
 changes/bug30744 |   3 -
 changes/bug30781 |   4 -
 changes/bug30894 |   4 -
 changes/bug30916 |   4 -
 changes/bug31003 |   4 -
 changes/bug31107 |   4 -
 changes/bug31343 |   9 -
 changes/bug31408 |   5 -
 changes/bug31463 |   3 -
 changes/bug31571 |   7 -
 changes/bug31657 |   5 -
 changes/bug31837 |   5 -
 changes/bug31884 |   3 -
 changes/bug31939 |   3 -
 changes/bug32449 |   5 -
 changes/chutney_ci   |   3 -
 changes/cid1444119   |   3 -
 changes/doc31089 |   4 -
 changes/geoip-2019-03-04 |   4 -
 changes/geoip-2019-04-02 |   4 -
 changes/geoip-2019-05-13 |   4 -
 changes/geoip-2019-06-10 |   4 -
 changes/geoip-2019-10-01 |   4 -
 changes/geoip-2019-11-06 |   4 -
 changes/ticket28795  |   5 -
 changes/ticket28970  |   6 -
 changes/ticket29435  |   3 -
 changes/ticket29617  |   4 -
 changes/ticket29702  |   4 -
 changes/ticket29806  |   7 -
 changes/ticket29962  |   3 -
 changes/ticket30117  |   4 -
 changes/ticket30213  |   3 -
 changes/ticket30234  |   2 -
 changes/ticket30454  |  10 -
 changes/ticket30591  |   3 -
 changes/ticket30694  |   3 -
 changes/ticket30860  |   3 -
 changes/ticket30871  |   6 -
 changes/ticket31372_appveyor |   4 -
 changes/ticket31372_travis   |   4 -
 changes/ticket31374  |   4 -
 changes/ticket31406  |   3 -
 changes/ticket31466  |   5 -
 changes/ticket31548  |   7 -
 changes/ticket31554  |   4 -
 changes/ticket31673  |   3 -
 changes/ticket31687_1|   4 -
 changes/ticket31687_2|   5 -
 changes/ticket31859  |   3 -
 changes/ticket31919_bionic   |   5 -
 changes/ticket32058  |   5 -
 changes/ticket32086  |   3 -
 changes/ticket32177  |   3 -
 changes/ticket32241  |   2 -
 changes/ticket32500  |   5 -
 96 files changed, 473 insertions(+), 424 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d4d0d3587..a8f77ab17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,476 @@
+Changes in version 0.3.5.9 - 2019-12-??
+  Tor 0.3.5.9 backports serveral fixes from later releases, including
+  several that affect bridge users, relay stability, onion services,
+  and much more.
+
+  o Directory authority changes (backport from 0.4.1.5):
+- The directory authority "dizum" has a new IP address. Closes
+  ticket 31406.
+
+  o Major bugfixes (bridges, backport from 0.4.1.2-alpha):
+- Consider our directory information to have changed when our list
+  of bridges changes. Previously, Tor would not re-compute the
+  status of its directory information when bridges changed, and
+  therefore would not realize that it was no longer able to build
+  circuits. Fixes part of bug 29875.
+- Do not count previously configured working bridges towards our
+  total of working bridges. Previously, when Tor's list of bridges
+  changed, it would think that the old bridges were still usable,
+  and delay fetching router

[tor-commits] [tor/release-0.4.1] Add a missing changelog entry in 0.4.1.6 for the FreeBSD part of 31687

2019-12-05 Thread nickm

commit cee30117cd9241da8a55a1b7241525a779ff3fbd
Author: Nick Mathewson 
Date:   Thu Dec 5 12:52:30 2019 -0500

Add a missing changelog entry in 0.4.1.6 for the FreeBSD part of 31687
---
 ChangeLog| 6 ++
 ReleaseNotes | 6 ++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5a1ad1aa9..0aeb483d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -197,6 +197,12 @@ Changes in version 0.4.1.6 - 2019-09-19
   arguments. Previously, it required two or more arguments, and ignored
   the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.
 
+  o Minor bugfixes (FreeBSD, PF-based proxy, IPv6, backport from 
0.4.2.1-alpha):
+- When extracting an IPv6 address from a PF-based proxy, verify that
+  we are actually configured to receive an IPv6 address, and log an
+  internal error if not. Fixes part of bug 31687; bugfix
+  on 0.2.3.4-alpha.
+
   o Minor bugfixes (guards, backport from 0.4.2.1-alpha):
 - When tor is missing descriptors for some primary entry guards,
   make the log message less alarming. It's normal for descriptors to
diff --git a/ReleaseNotes b/ReleaseNotes
index 8b7dd18ba..cfeacd729 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -42,6 +42,12 @@ Changes in version 0.4.1.6 - 2019-09-19
   arguments. Previously, it required two or more arguments, and ignored
   the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.
 
+  o Minor bugfixes (FreeBSD, PF-based proxy, IPv6, backport from 
0.4.2.1-alpha):
+- When extracting an IPv6 address from a PF-based proxy, verify that
+  we are actually configured to receive an IPv6 address, and log an
+  internal error if not. Fixes part of bug 31687; bugfix
+  on 0.2.3.4-alpha.
+
   o Minor bugfixes (guards, backport from 0.4.2.1-alpha):
 - When tor is missing descriptors for some primary entry guards,
   make the log message less alarming. It's normal for descriptors to

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

[tor-commits] [tpo/staging] Update download.html

2019-12-05 Thread antonela

commit 4d29cfb29567f5ff3eea78992e6068f5fc24801a
Author: Antonela 
Date:   Thu Dec 5 15:14:50 2019 -0300

Update download.html

I'm adding the minimal navbar and also a CTA to each platform.

To-do:
- replace the navbar for nav-min
- fix the caps at the platforms name
---
 templates/hero-download.html | 22 +-
 templates/navbar-min.html| 19 +++
 2 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/templates/hero-download.html b/templates/hero-download.html
index a13fb08..e142ecb 100644
--- a/templates/hero-download.html
+++ b/templates/hero-download.html
@@ -7,7 +7,7 @@
 
   {% for id, item in bag('platforms').items() %}
 
-  
+  
 {% set alt_l = alt %}
 {% set t = bag('versions', 'torbrowser-stable') %}
 {% set download_prefix = '/dist/torbrowser/' + t.version + '/' %}
@@ -29,23 +29,27 @@
 
   
 
-sig
+{{ 
_('Download for') }} {{ id }}
+{{ 
_('Signature') }}
   
 
-  {% endfor %}
-  
-
-  
-
-  
+{% endfor %}
+
+  
+
+  
+
+{{ _('Download for 
Android') }}
+  
 
-  
 
+
 
   {{ _('Download in another language or 
platform') }}
   {{ _('Download the latest alpha build') 
}}
   {{ _('Download Tor Source Code') }}
 
+
 
   https://blog.torproject.org/category/tags/tor-browser;>{{ _('Read the 
latest release announcements') }}
 
diff --git a/templates/navbar-min.html b/templates/navbar-min.html
new file mode 100644
index 000..f9d2bc7
--- /dev/null
+++ b/templates/navbar-min.html
@@ -0,0 +1,19 @@
+{% if not this.color %}
+
+  
+{% elif this.color == 'primary' %}
+
+  
+{% else %}
+
+  
+{% endif %}
+
+
+  
+  Tor Logo
+
+
+
+  
+

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

[tor-commits] [tor/master] Add a missing changelog entry in 0.4.1.6 for the FreeBSD part of 31687

2019-12-05 Thread nickm

commit 9e7cd76e4cb7508680942e7ad86cd9bb57efc8ce
Author: Nick Mathewson 
Date:   Thu Dec 5 12:52:30 2019 -0500

Add a missing changelog entry in 0.4.1.6 for the FreeBSD part of 31687
---
 ChangeLog| 6 ++
 ReleaseNotes | 6 ++
 2 files changed, 12 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 1f23fa1cf..24fbb0b16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -327,6 +327,12 @@ Changes in version 0.4.1.6 - 2019-09-19
   arguments. Previously, it required two or more arguments, and ignored
   the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.
 
+  o Minor bugfixes (FreeBSD, PF-based proxy, IPv6, backport from 
0.4.2.1-alpha):
+- When extracting an IPv6 address from a PF-based proxy, verify that
+  we are actually configured to receive an IPv6 address, and log an
+  internal error if not. Fixes part of bug 31687; bugfix
+  on 0.2.3.4-alpha.
+
   o Minor bugfixes (guards, backport from 0.4.2.1-alpha):
 - When tor is missing descriptors for some primary entry guards,
   make the log message less alarming. It's normal for descriptors to
diff --git a/ReleaseNotes b/ReleaseNotes
index ad24efd60..aeeb383ba 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -42,6 +42,12 @@ Changes in version 0.4.1.6 - 2019-09-19
   arguments. Previously, it required two or more arguments, and ignored
   the first. Fixes bug 31772; bugfix on 0.4.1.1-alpha.
 
+  o Minor bugfixes (FreeBSD, PF-based proxy, IPv6, backport from 
0.4.2.1-alpha):
+- When extracting an IPv6 address from a PF-based proxy, verify that
+  we are actually configured to receive an IPv6 address, and log an
+  internal error if not. Fixes part of bug 31687; bugfix
+  on 0.2.3.4-alpha.
+
   o Minor bugfixes (guards, backport from 0.4.2.1-alpha):
 - When tor is missing descriptors for some primary entry guards,
   make the log message less alarming. It's normal for descriptors to

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

[tor-commits] [tor/release-0.4.0] Start a changelog for 0.4.0.6

2019-12-05 Thread nickm

commit 948e9bf6c13b0259d24d5504186ae2f59f872e27
Author: Nick Mathewson 
Date:   Thu Dec 5 12:50:18 2019 -0500

Start a changelog for 0.4.0.6
---
 ChangeLog| 361 +++
 changes/bug12399 |   3 -
 changes/bug22619 |   3 -
 changes/bug23507 |   5 -
 changes/bug23818_v2  |   6 -
 changes/bug23818_v3  |   6 -
 changes/bug29034 |   5 -
 changes/bug29670 |   4 -
 changes/bug29875 |  11 --
 changes/bug30148 |   4 -
 changes/bug30189 |   4 -
 changes/bug30190 |   3 -
 changes/bug30316 |   4 -
 changes/bug30344 |   4 -
 changes/bug30452 |   3 -
 changes/bug30475 |   4 -
 changes/bug30561 |   6 -
 changes/bug30614 |   4 -
 changes/bug30649 |   4 -
 changes/bug30713 |   5 -
 changes/bug30744 |   3 -
 changes/bug30781 |   4 -
 changes/bug30894 |   4 -
 changes/bug30916 |   4 -
 changes/bug31003 |   4 -
 changes/bug31107 |   4 -
 changes/bug31343 |   9 --
 changes/bug31408 |   5 -
 changes/bug31463 |   3 -
 changes/bug31571 |   7 -
 changes/bug31657 |   5 -
 changes/bug31810 |   4 -
 changes/bug31837 |   5 -
 changes/bug31884 |   3 -
 changes/bug31939 |   3 -
 changes/bug32108 |   8 -
 changes/bug32449 |   5 -
 changes/chutney_ci   |   3 -
 changes/doc31089 |   4 -
 changes/geoip-2019-05-13 |   4 -
 changes/geoip-2019-06-10 |   4 -
 changes/geoip-2019-10-01 |   4 -
 changes/geoip-2019-11-06 |   4 -
 changes/ticket28795  |   5 -
 changes/ticket28970  |   6 -
 changes/ticket29617  |   4 -
 changes/ticket29702  |   4 -
 changes/ticket30213  |   3 -
 changes/ticket30234  |   2 -
 changes/ticket30454  |  10 --
 changes/ticket30591  |   3 -
 changes/ticket30694  |   3 -
 changes/ticket30860  |   3 -
 changes/ticket30871  |   6 -
 changes/ticket31091  |   3 -
 changes/ticket31372_appveyor |   4 -
 changes/ticket31372_travis   |   4 -
 changes/ticket31374  |   4 -
 changes/ticket31406  |   3 -
 changes/ticket31466  |   5 -
 changes/ticket31548  |   7 -
 changes/ticket31554  |   4 -
 changes/ticket31673  |   3 -
 changes/ticket31687_1|   4 -
 changes/ticket31687_2|   5 -
 changes/ticket31859  |   3 -
 changes/ticket31919_bionic   |   5 -
 changes/ticket32058  |   5 -
 changes/ticket32086  |   3 -
 changes/ticket32177  |   3 -
 changes/ticket32241  |   2 -
 changes/ticket32500  |   5 -
 72 files changed, 361 insertions(+), 312 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2d1ca785d..9c741c4bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,364 @@
+Changes in version 0.4.0.6 - 2019-12-??
+  This is the second stable release in the 0.4.0.x series. This release
+  backports several bugfixes to improve stability and correctness.  Anyone
+  experiencing build problems or crashes with 0.4.0.5, including all relays
+  relying on AccountingMax, should upgrade.
+
+  Note that, per our support policy, support for the 0.4.0.x series will end
+  on 2 Feb 2020.  Anyone still running 0.4.0.x should plan to upgrade to the
+  latest stable release, or downgrade to 0.3.5.x, which will get long-term
+  support until 1 Feb 2022.
+
+  o Directory authority changes (backport from 0.4.1.5):
+- The directory authority "dizum" has a new IP address. Closes
+  ticket 31406.
+
+  o Major bugfixes (bridges, backport from 0.4.1.2-alpha):
+- Consider our directory information to have changed when our list
+  of bridges changes. Previously, Tor would not re-compute the
+  status of its directory information when bridges changed, and
+  therefore would not realize that it was no longer able to build
+  circuits. Fixes part of bug 29875.
+- Do not count previously configured working bridges towards our
+  total of working bridges. Previously, when Tor's list of bridges
+  changed, it would think that the old bridges were still usable,
+  and delay fetching router descriptors for the new ones. Fixes part
+  of bug 29875; bugfix on 0.3.0.1-alpha.
+
+  o Major bugfixes (circuit build, guard, backport from 0.4.1.4-rc):
+- When considering upgrading circuits from "waiting for guard" to
+  "open", always ignore circuits that are marked for close. Otherwise,
+  we can end up in the situation where a subsystem is notified that
+  a closing circuit has just opened, leading to undesirable
+  behavior. Fixes bug 30871; bugfix on 0.3.0.1-alpha.
+
+  o Major bugfixes (Onion service

[tor-commits] [tor/release-0.4.1] Start a changelog for 0.4.1.7

2019-12-05 Thread nickm

commit 1e218d73604ecd80b100553b89a495874be5eefd
Author: Nick Mathewson 
Date:   Thu Dec 5 12:21:40 2019 -0500

Start a changelog for 0.4.1.7
---
 ChangeLog| 159 +++
 changes/bug30344 |   4 --
 changes/bug30916 |   4 --
 changes/bug31107 |   4 --
 changes/bug31408 |   5 --
 changes/bug31571 |   7 --
 changes/bug31594 |   5 --
 changes/bug31614 |   9 ---
 changes/bug31736 |   3 -
 changes/bug31810 |   4 --
 changes/bug31837 |   5 --
 changes/bug31884 |   3 -
 changes/bug31897 |   3 -
 changes/bug31898 |   4 --
 changes/bug31939 |   3 -
 changes/bug32108 |   8 ---
 changes/bug32449 |   5 --
 changes/geoip-2019-10-01 |   4 --
 changes/geoip-2019-11-06 |   4 --
 changes/ticket28970  |   6 --
 changes/ticket30860  |   3 -
 changes/ticket31091  |   3 -
 changes/ticket31372_appveyor |   4 --
 changes/ticket31372_travis   |   4 --
 changes/ticket31466  |   5 --
 changes/ticket31548  |   7 --
 changes/ticket31549  |   4 --
 changes/ticket31859  |   3 -
 changes/ticket31919_bionic   |   5 --
 changes/ticket32058  |   5 --
 changes/ticket32086  |   3 -
 changes/ticket32177  |   3 -
 changes/ticket32241  |   2 -
 changes/ticket32500  |   5 --
 34 files changed, 159 insertions(+), 146 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f1af1258..5a1ad1aa9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,162 @@
+Changes in version 0.4.1.7 - 2019-12-??
+  This release backports several bugfixes to improve stability and
+  correctness.  Anyone experiencing build problems or crashes with 0.4.1.6,
+  including all relays relying on AccountingMax, should upgrade.
+
+  o Major features (directory authorities, backport from 0.4.2.2-alpha):
+- Directory authorities now reject relays running all currently
+  deprecated release series. The currently supported release series
+  are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549.
+
+  o Major bugfixes (embedded Tor, backport from 0.4.2.2-alpha):
+- Avoid a possible crash when restarting Tor in embedded mode and
+  enabling a different set of publish/subscribe messages. Fixes bug
+  31898; bugfix on 0.4.1.1-alpha.
+
+  o Major bugfixes (relay, backport from 0.4.2.3-alpha):
+- Relays now respect their AccountingMax bandwidth again. When
+  relays entered "soft" hibernation (which typically starts when
+  we've hit 90% of our AccountingMax), we had stopped checking
+  whether we should enter hard hibernation. Soft hibernation refuses
+  new connections and new circuits, but the existing circuits can
+  continue, meaning that relays could have exceeded their configured
+  AccountingMax. Fixes bug 32108; bugfix on 0.4.0.1-alpha.
+
+  o Major bugfixes (torrc parsing, backport from 0.4.2.2-alpha):
+- Stop ignoring torrc options after an %include directive, when the
+  included directory ends with a file that does not contain any
+  config options (but does contain comments or whitespace). Fixes
+  bug 31408; bugfix on 0.3.1.1-alpha.
+
+  o Major bugfixes (v3 onion services, backport from 0.4.2.3-alpha):
+- Onion services now always use the exact number of intro points
+  configured with the HiddenServiceNumIntroductionPoints option (or
+  fewer if nodes are excluded). Before, a service could sometimes
+  pick more intro points than configured. Fixes bug 31548; bugfix
+  on 0.3.2.1-alpha.
+
+  o Minor features (continuous integration, backport from 0.4.2.2-alpha):
+- When building on Appveyor and Travis, pass the "-k" flag to make,
+  so that we are informed of all compilation failures, not just the
+  first one or two. Closes ticket 31372.
+
+  o Minor features (geoip, backport from 0.4.2.4-rc):
+- Update geoip and geoip6 to the November 6 2019 Maxmind GeoLite2
+  Country database. Closes ticket 32440.
+
+  o Minor bugfixes (Appveyor CI, backport from 0.4.2.2-alpha):
+- Avoid spurious errors when Appveyor CI fails before the install step.
+  Fixes bug 31884; bugfix on 0.3.4.2-alpha.
+
+  o Minor bugfixes (client, onion service v3, backport from 0.4.2.4-rc):
+- Fix a BUG() assertion that occurs within a very small race window
+  between when a client intro circuit opens and when its descriptor
+  gets cleaned up from the cache. The circuit is now closed early,
+  which will trigger a re-fetch of the descriptor and continue the
+  connection. Fixes bug 28970; bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (connections, backport from 0.4.2.3-rc):
+- Avoid trying to read data from closed connections, which can cause
+  needless loops in Libevent and infinite loops in Shadow. Fixes

[tor-commits] [tor/release-0.4.2] start on changelog for 0.4.2.5

2019-12-05 Thread nickm

commit a0f80026d0a813ffeab2ad51e26290cf46dd1ed4
Author: Nick Mathewson 
Date:   Thu Dec 5 12:18:50 2019 -0500

start on changelog for 0.4.2.5
---
 ChangeLog   | 10 ++
 changes/ticket32500 |  5 -
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1f23fa1cf..12685beb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Changes in version 0.4.2.5 - 2019-12-??
+  Blurb blurb.
+
+  o Testing (backport from 0.4.2.5):
+- Require C99 standards-conforming code in Travis CI, but allow GNU
+  gcc extensions. Also activates clang's -Wtypedef-redefinition
+  warnings. Build some jobs with -std=gnu99, and some jobs without.
+  Closes ticket 32500.
+
+
 Changes in version 0.4.2.4-rc - 2019-11-15
   Tor 0.4.2.4-rc is the first release candidate in its series. It fixes
   several bugs from earlier versions, including a few that would result in
diff --git a/changes/ticket32500 b/changes/ticket32500
deleted file mode 100644
index 2c0f35df7..0
--- a/changes/ticket32500
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Testing:
-- Require C99 standards-conforming code in Travis CI, but allow GNU gcc
-  extensions. Also activates clang's -Wtypedef-redefinition warnings.
-  Build some jobs with -std=gnu99, and some jobs without.
-  Closes ticket 32500.

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

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

2019-12-05 Thread translation

commit 86bd68ece7e0b2b02bdcd9579dee0bc3f46c3568
Author: Translation commit bot 
Date:   Thu Dec 5 16:45:40 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 32 
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index 72dcf6ac27..2f2c7b0439 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -2511,11 +2511,11 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:89
 msgid "Florida Registration #CH58356"
-msgstr ""
+msgstr "á¤ááá áááá¡ á¡áá áááá¡á¢á ááªáá 
#CH58356"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:93
 msgid "Georgia"
-msgstr ""
+msgstr "á¯áá á¯áá"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:95
 msgid ""
@@ -2523,30 +2523,38 @@ msgid ""
 "summary is available upon request at the office and phone number "
 "+1-844-863-0915."
 msgstr ""
+"á¡á á£áá áá á¡ááááááá áá¦á¬áá á 
á©áááá áá ááá áááááá¡á áá 
á¤ááááá¡á£á á á®áá á¯ááá¦á ááªá®ááá¡ "
+"ááááá áá¨á á®ááááá¡áá¬áááááá 
áááá®ááááá¡áááááá 
ááá¬áá¡ááá£ááááá¨á áá 
á¡áá¢áááá¤ááá áááá áá "
+"+1-844-863-0915."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:99
 msgid "Maryland"
-msgstr ""
+msgstr "ááá áááááá"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:101
 msgid ""
 "For the cost of copies and postage, from the Office of the Secretary of "
 "State, State House, Annapolis, MD 21401."
 msgstr ""
+"áá¡ááááá¡á áá á¤áá¡á¢áá¡ ááá¡ááá 
ááááá, á¨á¢áá¢áá¡ á¡áááááááááá, 
á¨á¢áá¢áá¡ á¡ááááá ááááá, "
+"áááááááá¡á, MD 21401."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:105
 msgid "Nevada"
-msgstr ""
+msgstr "áááááá"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:107
 msgid ""
 "Contributions may be tax deductible pursuant to the provisions of sec. "
 "170(c) of the Internal Revenue Code of 1986, 26 U.S.C. 170(c)."
 msgstr ""
+"á¨áááá¬áá á£áááááá á¨áá¡áá«áá 
ááááá¡áá®áááá¡ááá ááááá¡á£á¤ááá,  
170(c) ááá¬áááá "
+"áááá¡ááá¦áá á£áá 
áááááááááááááá¡ ááááá®ááá, 
á¨ááá á¡áá¨áááá¡áááá ááááá¥á¡áá 1986, 
26 "
+"U.S.C. 170(c)."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:111
 msgid "New Jersey"
-msgstr ""
+msgstr "ááá£-á¯áá á¡á"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:113
 msgid ""
@@ -2565,7 +2573,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:119
 msgid "New York"
-msgstr ""
+msgstr "ááá£-ááá áá"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:121
 msgid ""
@@ -2577,7 +2585,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:125
 msgid "North Carolina"
-msgstr ""
+msgstr "á©á áááááá ááá ááááá"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:127
 msgid ""
@@ -2591,7 +2599,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:133
 msgid "Pennsylvania"
-msgstr ""
+msgstr "áááá¡ááááááá"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:135
 msgid ""
@@ -2602,7 +2610,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:139
 msgid "Virginia"
-msgstr ""
+msgstr "ááá á¯áááá"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:141
 msgid ""
@@ -2612,7 +2620,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:145
 msgid "Washington"
-msgstr ""
+msgstr "ááá¨áááá¢ááá"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:147
 msgid ""
@@ -2623,7 +2631,7 @@ msgstr ""
 
 #:

[tor-commits] [styleguide/master] Add tor logo

2019-12-05 Thread hiro

commit bfdb5c0d914f43d9b40135f80625d9976ac2291b
Author: hiro 
Date:   Thu Dec 5 17:40:29 2019 +0100

Add tor logo
---
 assets/static/images/tor-l...@2x.png | Bin 0 -> 10042 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/static/images/tor-l...@2x.png 
b/assets/static/images/tor-l...@2x.png
new file mode 100644
index 000..5a459de
Binary files /dev/null and b/assets/static/images/tor-l...@2x.png differ

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

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

2019-12-05 Thread translation

commit b967b6d5a563b96071681e5d4af542d28d5c6897
Author: Translation commit bot 
Date:   Thu Dec 5 16:15:42 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 15 ---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index b5f392c22e..72dcf6ac27 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -2470,21 +2470,24 @@ msgstr "ááááá ááá§á 
ááá®áááá¡á"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:53
 msgid "Tor State Nonprofit Disclosures"
-msgstr ""
+msgstr "Tor-áá¡ á¬áá á¡áááááá á¡ááá£áááá 
á¨á¢áá¢ááá¨á"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:64
 msgid "State Nonprofit Disclosures"
-msgstr ""
+msgstr "áá ááááááááááá 
ááá¬áá¡ááá£ááááá¡ á¬áá á¡áááááá 
á¡ááá£áááá á¨á¢áá¢á¨á"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:79
 msgid ""
 "Certain states require written disclosures for nonprofit organizations "
 "soliciting contributions. Individual state disclosures are below."
 msgstr ""
+"áááááá á á¨á¢áá¢á¨á áá 
ááááááááááá 
ááá¬áá¡ááá£ááááááá¡áááá¡ 
ááá¬áá¡ááá£ááá á¬áá ááááááá "
+"á¡ááá£ááááá¡ áááªáááá¡ 
ááááááá£áááá, á¨áááá¬áá 
á£ááááááá¡ ááááááá. á¥ááááá 
áááªááá£ááá "
+"áááááá£á á¨á¢áá¢á¨á á¬áá á¡áááááá 
áááááªááááá."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:83
 msgid "Florida"
-msgstr ""
+msgstr "á¤ááá ááá"
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:85
 msgid ""
@@ -2493,12 +2496,18 @@ msgid ""
 " the state, 1-800-435-7352 (800-HELP-FLA), or visiting "
 "www.FloridaConsumerHelp.com."
 msgstr ""
+"áá¤ááªáááá£á á á¡áá áááá¡á¢á ááªáá áá 
á¤ááááá¡á£á á ááá¤áá áááªááá¡ 
á¡ááá£ááááá¡ áá¡ááááá¡ "
+"áááááá®ááá á¨áá¡áá«ááááááá 
á¡ááááá®ááá áááá áááá¡áá®á£á áááá¡ 
áááá§áá¤áááááááá á£á¤áá¡á "
+"ááá áá, á¨á¢áá¢áá¡ á¤áá ááááá¨á, 
1-800-435-7352 (800-HELP-FLA) áá á¡ááá¢áá "
+"www.FloridaConsumerHelp.com."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:87
 msgid ""
 "Registration does not imply endorsement, approval, or recommendation by the "
 "state."
 msgstr ""
+"á áááá¡á¢á ááªáá áá  áá£ááá¡á®áááá¡ 
á¨á¢áá¢áá¡ áááá  ááááá¬ááááá¡, 
áááá®ááááá¡ áá "
+"á áááááááááªááá¡."
 
 #: 
tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:89
 msgid "Florida Registration #CH58356"

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

[tor-commits] [snowflake/master] Add tests to check for data race in broker

2019-12-05 Thread cohosh

commit 42e16021c49b59433450c8f5b5a54e449f9dc522
Author: Cecylia Bocovich 
Date:   Mon Nov 25 14:00:54 2019 -0500

Add tests to check for data race in broker

We had some data races in the broker that occur when proxies and clients
modify the heap/snowflake map at the same time. This test has a client
and proxy access the broker simultaneously to check for data races.
---
 broker/snowflake-broker_test.go | 144 +++-
 1 file changed, 97 insertions(+), 47 deletions(-)

diff --git a/broker/snowflake-broker_test.go b/broker/snowflake-broker_test.go
index b23e688..18b83dd 100644
--- a/broker/snowflake-broker_test.go
+++ b/broker/snowflake-broker_test.go
@@ -191,58 +191,108 @@ func TestBroker(t *testing.T) {
})
 
})
+
})
 
Convey("End-To-End", t, func() {
-   done := make(chan bool)
-   polled := make(chan bool)
ctx := NewBrokerContext(NullLogger())
 
-   // Proxy polls with its ID first...
-   dataP := 
bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0"}`))
-   wP := httptest.NewRecorder()
-   rP, err := http.NewRequest("POST", "snowflake.broker/proxy", 
dataP)
-   So(err, ShouldBeNil)
-   go func() {
-   proxyPolls(ctx, wP, rP)
-   polled <- true
-   }()
-
-   // Manually do the Broker goroutine action here for full 
control.
-   p := <-ctx.proxyPolls
-   So(p.id, ShouldEqual, "ymbcCMto7KHNGYlp")
-   s := ctx.AddSnowflake(p.id, "")
-   go func() {
-   offer := <-s.offerChannel
-   p.offerChannel <- offer
-   }()
-   So(ctx.idToSnowflake["ymbcCMto7KHNGYlp"], ShouldNotBeNil)
-
-   // Client request blocks until proxy answer arrives.
-   dataC := bytes.NewReader([]byte("fake offer"))
-   wC := httptest.NewRecorder()
-   rC, err := http.NewRequest("POST", "snowflake.broker/client", 
dataC)
-   So(err, ShouldBeNil)
-   go func() {
-   clientOffers(ctx, wC, rC)
-   done <- true
-   }()
-
-   <-polled
-   So(wP.Code, ShouldEqual, http.StatusOK)
-   So(wP.Body.String(), ShouldResemble, `{"Status":"client 
match","Offer":"fake offer"}`)
-   So(ctx.idToSnowflake["ymbcCMto7KHNGYlp"], ShouldNotBeNil)
-   // Follow up with the answer request afterwards
-   wA := httptest.NewRecorder()
-   dataA := 
bytes.NewReader([]byte(`{"Version":"1.0","Sid":"ymbcCMto7KHNGYlp","Answer":"test"}`))
-   rA, err := http.NewRequest("POST", "snowflake.broker/answer", 
dataA)
-   So(err, ShouldBeNil)
-   proxyAnswers(ctx, wA, rA)
-   So(wA.Code, ShouldEqual, http.StatusOK)
-
-   <-done
-   So(wC.Code, ShouldEqual, http.StatusOK)
-   So(wC.Body.String(), ShouldEqual, "test")
+   Convey("Check for client/proxy data race", func() {
+   proxy_done := make(chan bool)
+   client_done := make(chan bool)
+
+   go ctx.Broker()
+
+   // Make proxy poll
+   wp := httptest.NewRecorder()
+   datap := 
bytes.NewReader([]byte(`{"Sid":"ymbcCMto7KHNGYlp","Version":"1.0"}`))
+   rp, err := http.NewRequest("POST", 
"snowflake.broker/proxy", datap)
+   So(err, ShouldBeNil)
+
+   go func(ctx *BrokerContext) {
+   proxyPolls(ctx, wp, rp)
+   proxy_done <- true
+   }(ctx)
+
+   // Client offer
+   wc := httptest.NewRecorder()
+   datac := bytes.NewReader([]byte("test"))
+   rc, err := http.NewRequest("POST", 
"snowflake.broker/client", datac)
+   So(err, ShouldBeNil)
+
+   go func() {
+   clientOffers(ctx, wc, rc)
+   client_done <- true
+   }()
+
+   <-proxy_done
+   So(wp.Code, ShouldEqual, http.StatusOK)
+
+   // Proxy answers
+   wp = httptest.NewRecorder()
+   datap = 
bytes.NewReader([]byte(`{"Version":"1.0","Sid":"ymbcCMto7KHNGYlp","Answer":"test"}`))
+   rp, err = http.NewRequest("POST", 
"snowflake.broker/answer", datap)
+   So(err, ShouldBeNil)
+   go func(ctx *BrokerContext) {
+   proxyAnswers(ctx, wp, rp)
+

[tor-commits] [snowflake/master] Add synchronization to prevent race in broker

2019-12-05 Thread cohosh

commit dccc15a6e9d620298f77fb7ae14692723b434306
Author: Cecylia Bocovich 
Date:   Fri Nov 22 17:15:06 2019 -0500

Add synchronization to prevent race in broker

There's a race condition in the broker where both the proxy and the
client processes try to pop/remove the same snowflake from the heap.
This patch adds synchronization to prevent simultaneous accesses to
snowflakes.
---
 broker/broker.go | 34 +++---
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/broker/broker.go b/broker/broker.go
index c166f1a..a5b0edf 100644
--- a/broker/broker.go
+++ b/broker/broker.go
@@ -18,6 +18,7 @@ import (
"os"
"os/signal"
"strings"
+   "sync"
"syscall"
"time"
 
@@ -37,6 +38,8 @@ type BrokerContext struct {
// Map keeping track of snowflakeIDs required to match SDP answers from
// the second http POST.
idToSnowflake map[string]*Snowflake
+   // Synchronization for the
+   snowflakeLock sync.Mutex
proxyPollschan *ProxyPoll
metrics   *Metrics
 }
@@ -127,10 +130,13 @@ func (ctx *BrokerContext) Broker() {
request.offerChannel <- offer
case <-time.After(time.Second * ProxyTimeout):
// This snowflake is no longer available to 
serve clients.
-   // TODO: Fix race using a delete channel
-   heap.Remove(ctx.snowflakes, snowflake.index)
-   delete(ctx.idToSnowflake, snowflake.id)
-   request.offerChannel <- nil
+   ctx.snowflakeLock.Lock()
+   defer ctx.snowflakeLock.Unlock()
+   if snowflake.index != -1 {
+   heap.Remove(ctx.snowflakes, 
snowflake.index)
+   delete(ctx.idToSnowflake, snowflake.id)
+   close(request.offerChannel)
+   }
}
}(request)
}
@@ -146,7 +152,9 @@ func (ctx *BrokerContext) AddSnowflake(id string, proxyType 
string) *Snowflake {
snowflake.proxyType = proxyType
snowflake.offerChannel = make(chan []byte)
snowflake.answerChannel = make(chan []byte)
+   ctx.snowflakeLock.Lock()
heap.Push(ctx.snowflakes, snowflake)
+   ctx.snowflakeLock.Unlock()
ctx.idToSnowflake[id] = snowflake
return snowflake
 }
@@ -215,15 +223,19 @@ func clientOffers(ctx *BrokerContext, w 
http.ResponseWriter, r *http.Request) {
return
}
// Immediately fail if there are no snowflakes available.
-   if ctx.snowflakes.Len() <= 0 {
+   ctx.snowflakeLock.Lock()
+   numSnowflakes := ctx.snowflakes.Len()
+   ctx.snowflakeLock.Unlock()
+   if numSnowflakes <= 0 {
ctx.metrics.clientDeniedCount++
w.WriteHeader(http.StatusServiceUnavailable)
return
}
// Otherwise, find the most available snowflake proxy, and pass the 
offer to it.
// Delete must be deferred in order to correctly process answer request 
later.
+   ctx.snowflakeLock.Lock()
snowflake := heap.Pop(ctx.snowflakes).(*Snowflake)
-   defer delete(ctx.idToSnowflake, snowflake.id)
+   ctx.snowflakeLock.Unlock()
snowflake.offerChannel <- offer
 
// Wait for the answer to be returned on the channel or timeout.
@@ -243,6 +255,10 @@ func clientOffers(ctx *BrokerContext, w 
http.ResponseWriter, r *http.Request) {
log.Printf("unable to write timeout error, failed with 
error: %v", err)
}
}
+
+   ctx.snowflakeLock.Lock()
+   delete(ctx.idToSnowflake, snowflake.id)
+   ctx.snowflakeLock.Unlock()
 }
 
 /*
@@ -266,7 +282,9 @@ func proxyAnswers(ctx *BrokerContext, w 
http.ResponseWriter, r *http.Request) {
}
 
var success = true
+   ctx.snowflakeLock.Lock()
snowflake, ok := ctx.idToSnowflake[id]
+   ctx.snowflakeLock.Unlock()
if !ok || nil == snowflake {
// The snowflake took too long to respond with an answer, so 
its client
// disappeared / the snowflake is no longer recognized by the 
Broker.
@@ -287,9 +305,10 @@ func proxyAnswers(ctx *BrokerContext, w 
http.ResponseWriter, r *http.Request) {
 }
 
 func debugHandler(ctx *BrokerContext, w http.ResponseWriter, r *http.Request) {
-   s := fmt.Sprintf("current snowflakes available: %d\n", 
ctx.snowflakes.Len())
 
var webexts, browsers, standalones, unknowns int
+   ctx.snowflakeLock.Lock()
+   s := fmt.Sprintf("current snowflakes available: %d\n", 
len(ctx.idToSnowflake))
for _, snowflake := range ctx.idToSnowflake {
if snowflake.proxyType ==

[tor-commits] [snowflake/master] Added another lock to protect broker stats

2019-12-05 Thread cohosh

commit 06298eec730aa2664bb61d4cce4ef56dfce91ee3
Author: Cecylia Bocovich 
Date:   Mon Dec 2 13:22:05 2019 -0500

Added another lock to protect broker stats

Added another lock to the metrics struct to synchronize accesses to the
broker stats. There's a possible race condition if stats are updated at
the same time they are being logged.
---
 broker/broker.go  | 10 +-
 broker/metrics.go |  5 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/broker/broker.go b/broker/broker.go
index a5b0edf..17c677e 100644
--- a/broker/broker.go
+++ b/broker/broker.go
@@ -38,7 +38,7 @@ type BrokerContext struct {
// Map keeping track of snowflakeIDs required to match SDP answers from
// the second http POST.
idToSnowflake map[string]*Snowflake
-   // Synchronization for the
+   // Synchronization for the snowflake map and heap
snowflakeLock sync.Mutex
proxyPollschan *ProxyPoll
metrics   *Metrics
@@ -181,14 +181,18 @@ func proxyPolls(ctx *BrokerContext, w 
http.ResponseWriter, r *http.Request) {
if err != nil {
log.Println("Error processing proxy IP: ", err.Error())
} else {
+   ctx.metrics.lock.Lock()
ctx.metrics.UpdateCountryStats(remoteIP, proxyType)
+   ctx.metrics.lock.Unlock()
}
 
// Wait for a client to avail an offer to the snowflake, or timeout if 
nil.
offer := ctx.RequestOffer(sid, proxyType)
var b []byte
if nil == offer {
+   ctx.metrics.lock.Lock()
ctx.metrics.proxyIdleCount++
+   ctx.metrics.lock.Unlock()
 
b, err = messages.EncodePollResponse("", false)
if err != nil {
@@ -227,7 +231,9 @@ func clientOffers(ctx *BrokerContext, w 
http.ResponseWriter, r *http.Request) {
numSnowflakes := ctx.snowflakes.Len()
ctx.snowflakeLock.Unlock()
if numSnowflakes <= 0 {
+   ctx.metrics.lock.Lock()
ctx.metrics.clientDeniedCount++
+   ctx.metrics.lock.Unlock()
w.WriteHeader(http.StatusServiceUnavailable)
return
}
@@ -241,7 +247,9 @@ func clientOffers(ctx *BrokerContext, w 
http.ResponseWriter, r *http.Request) {
// Wait for the answer to be returned on the channel or timeout.
select {
case answer := <-snowflake.answerChannel:
+   ctx.metrics.lock.Lock()
ctx.metrics.clientProxyMatchCount++
+   ctx.metrics.lock.Unlock()
if _, err := w.Write(answer); err != nil {
log.Printf("unable to write answer with error: %v", err)
}
diff --git a/broker/metrics.go b/broker/metrics.go
index bf5ce29..ea4d220 100644
--- a/broker/metrics.go
+++ b/broker/metrics.go
@@ -39,6 +39,9 @@ type Metrics struct {
proxyIdleCount  uint
clientDeniedCount   uint
clientProxyMatchCount   uint
+
+   //synchronization for access to snowflake metrics
+   lock sync.Mutex
 }
 
 func (s CountryStats) Display() string {
@@ -161,6 +164,7 @@ func (m *Metrics) logMetrics() {
 }
 
 func (m *Metrics) printMetrics() {
+   m.lock.Lock()
m.logger.Println("snowflake-stats-end", 
time.Now().UTC().Format("2006-01-02 15:04:05"), fmt.Sprintf("(%d s)", 
int(metricsResolution.Seconds(
m.logger.Println("snowflake-ips", m.countryStats.Display())
m.logger.Println("snowflake-ips-total", len(m.countryStats.standalone)+
@@ -171,6 +175,7 @@ func (m *Metrics) printMetrics() {
m.logger.Println("snowflake-idle-count", binCount(m.proxyIdleCount))
m.logger.Println("client-denied-count", binCount(m.clientDeniedCount))
m.logger.Println("client-snowflake-match-count", 
binCount(m.clientProxyMatchCount))
+   m.lock.Unlock()
 }
 
 // Restores all metrics to original values

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

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

2019-12-05 Thread translation

commit 8b8f7cd2562afae723295cc6f36357f1f47e3859
Author: Translation commit bot 
Date:   Thu Dec 5 15:15:41 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 34 ++
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index a04a3d2334..b5f392c22e 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -365,7 +365,7 @@ msgstr ""
 #: 
tmp/cache_locale/c8/c806c3e41d2762077fdd1ce236b4b0b7dc838a7c1a428d6d6daeede2a01d35aa.php:117
 msgid "We do not publish, sell, trade, or rent any information about you."
 msgstr ""
-"á©ááá áá  ááááá¡áá¯áá áááá, 
áááá§áááá, áááááá ááá áá 
ááááªááá áá¥áááá¡ á¨áá¡áá®áá á ááá "
+"á©ááá áá  ááááá¡áá¯áá áááá, 
áááá§áááá, áááááá ááá áá 
ááááªááá áá¥ááá á¨áá¡áá®áá á ááá "
 "á¡áá®áá¡ ááá¤áá áááªááá¡."
 
 #: 
tmp/cache_locale/c8/c806c3e41d2762077fdd1ce236b4b0b7dc838a7c1a428d6d6daeede2a01d35aa.php:119
@@ -724,7 +724,7 @@ msgid ""
 "Join the Tor Project - Defenders of Privacy program - a monthly giving "
 "circle designed to honor donors that make privacy a priority."
 msgstr ""
-"á¨áááá£áá áááá Tor-áá ááá¥á¢á¡ â ááá 
ááá£ááááá¡ áá£á¨ááááá â 
á§áááááááá£á á á¨áááá¢áááááá¡ "
+"á¨áááá£áá áááá Tor-áá ááá¥á¢á¡ â ááá 
ááá£ááááá¡ ááááªáááááá â 
á§áááááááá£á á á¨áááá¢áááááá¡ "
 "áá ááá ááá, ááááá£áááááá á©áááá 
ááá¢ááá¡ááªááá á¨ááááá¬áá 
ááááááá¡áááá¡, á áááááááááá¡ááª "
 "á£áááá¨áááááááááá¡áá ááá ááá 
áááááªáááááá¡ áááªáá."
 
@@ -734,7 +734,7 @@ msgid ""
 "reliable source of funds to help us be agile in an ever-changing privacy "
 "landscape and we send you exclusive gifts to show our appreciation!"
 msgstr ""
-"ááá ááá£ááááá¡ áá£á¨ááááá 
áááááááá áááá á«ááááá£áá 
á¬áááááá â á¥ááááá á¨áááá¡ááááá¡ "
+"ááá ááá£ááááá¡ ááááªáááááá 
áááááááá áááá á«ááááá£áá 
á¬áááááá â á¥ááááá á¨áááá¡ááááá¡ "
 "áá£áááá, á¡áááá á¬á§áá áá¡, á ááª 
áááá®ááá ááá ááá¥ááááá 
ááááá¥ááááá ááá ááááááááá¡ "
 "áªáááááááá¡ ááá ááááá¨ááª áá áá 
áá¡ááá, ááááá«á¦áááá áááá¡ááá£áá 
ááá£áá á¡áá®áá¡ á¡áá©á£á¥á ááá,"
 " ááááááá áááá¡ ááá¨ááá!"
@@ -745,8 +745,8 @@ msgid ""
 "continue our mission to provide tools that protect people's privacy and "
 "identity online."
 msgstr ""
-"Tor-áá ááá¥á¢á ááá¢áááá 
áááááááááá£áá á©áááá ááá 
ááá£ááááá¡ áá£á¨áááááá¡ áá®áá ááááá 
ááá, "
-"áááááá¡ááá á¡á¬á áá¤ááá¡ ááá¡ááá 
á«ááááááá áá á®ááá®áá¡áááá¡ ááá 
ááá áááááªáááááá¡ áááªááá¡á "
+"Tor-áá ááá¥á¢á ááá¢áááá 
áááááááááá£áá á©áááá ááá 
ááá£ááááá¡ ááááªááááááá¡ áá®áá 
ááááá ááá,"
+" áááááá¡ááá á¡á¬á áá¤ááá¡ ááá¡ááá 
á«ááááááá áá á®ááá®áá¡áááá¡ ááá 
ááá áááááªáááááá¡ áááªááá¡á "
 "áá áááááááá¡ ááá£áá®áááááá¡áááá¡ 
á¡áááá á á¡áá¨á£áááááááá¡ 
á¨áá¡ááááááááááá."
 
 #: 
tmp/cache_locale/94/94c6c1969d2fadbd23c135ac864b97902daca8f5c816b03864ea5c4970a167cf.php:97
@@ -1921,7 +1921,7 @@ msgid ""
 "donor without my permission."
 msgstr ""
 "áá¥áááá ááá ááá áááááªáááááá¡ 
áááá£ááááá¨á, áááááá á áá áá áá¡áá 
áá¡ áááá¡áá¯áá áááá á©ááá¡ "
-"áááááááá¡, á áááá áª á¨ááááá¬áá 
áááá¡, á©ááá ááááá áááá¡

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

2019-12-05 Thread translation

commit e98240ea06844784bbbaf52fb414831ebbc26193
Author: Translation commit bot 
Date:   Thu Dec 5 14:45:42 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index fd38b2697e..a04a3d2334 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -1848,7 +1848,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:583
 msgid "Brokerage Firm: Merrill Lynch, Pierce, Fenner & Smith, Inc."
-msgstr ""
+msgstr "á¡ááá áááá á áááááááá: Merrill Lynch, 
Pierce, Fenner & Smith, Inc."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:587
 msgid "Account Name: The Tor Project"
@@ -1971,6 +1971,9 @@ msgid ""
 " so!), we will take that to mean it's okay for us to engage with or amplify "
 "your post."
 msgstr ""
+"áá£ áá¥ááá á¡áá£áá ááá á¨áááá¬áá 
á£áááááá á¡ááªáááá£á  á¥á¡ááá¨á (áá 
á©ááá ááá áááá ááá¤áá¡ááá "
+"áááá¡!) áááá£ááá¡á®áááá, á áá 
áá¥áááá¡ ááá¡á¢áá ááááá®ááá£á ááá 
áá ááá¡á ááá®áááá "
+"ááá¨áááá£ááá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:653
 msgid "What is your donor privacy policy?"
@@ -2039,6 +2042,8 @@ msgid ""
 "The fastest way to find out if your company matches donations is usually by "
 "checking with your HR department."
 msgstr ""
+"á£á¡á¬á áá¤áá¡á ááá áááá¡ ááá¡áá 
áááááá, áá¥áááá ááá¬áá¡ááá£áááá 
ááá áááááá¡ áá£ áá á "
+"á¨áááá¬áá á£áááááá¡, ááá¡áá¥ááááá¡ 
áááá§áá¤áááááá¡ááá 
ááááááá¬ááááá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:687
 msgid ""

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

[tor-commits] [snowflake/master] bump version to 0.2.0

2019-12-05 Thread cohosh

commit 07f2cd8073168f26044aba1f9971469355d30e53
Author: Cecylia Bocovich 
Date:   Tue Dec 3 14:09:05 2019 -0500

bump version to 0.2.0
---
 proxy/translation  | 2 +-
 proxy/webext/manifest.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/proxy/translation b/proxy/translation
index c145dfe..488054e 16
--- a/proxy/translation
+++ b/proxy/translation
@@ -1 +1 @@
-Subproject commit c145dfe5b308085a700264e96509799355a52fa6
+Subproject commit 488054eda4c4d9c16fc4bddf439136178d0c769e
diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json
index 90d3922..2894db6 100644
--- a/proxy/webext/manifest.json
+++ b/proxy/webext/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Snowflake",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "__MSG_appDesc__",
   "default_locale": "en_US",
   "background": {

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

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

2019-12-05 Thread translation

commit c21e16040b049c6eb00da00d029edca7bd3d6f05
Author: Translation commit bot 
Date:   Thu Dec 5 14:15:39 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 15 ++-
 locale/tr/LC_MESSAGES/messages.po | 28 +---
 2 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index 0662007a7f..fd38b2697e 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -1795,22 +1795,30 @@ msgid ""
 "Foundation will donate 0.5% of the purchase price of eligible products to "
 "the charitable organization of your choice."
 msgstr ""
+"áááá¡á®áááááá áá¡áá, á áá á ááªá 
á¨áá¡áá«áááá Amazon Smile-á¡ áá§ááááá, Amazon 
Smile-áá¡"
+" á¤áááá, ááá áááá£á áááááááá 
ááá¦ááá£áá áááá®áá¡ 0.5%-á¡ á¨áááá¬áá 
á£ááááá¡ á¡áá®áá "
+"á£ááááááá¡ áá¥ááá áááá  á¨áá á©áá£á 
á¡áá¥áááááá¥áááá 
ááá¬áá¡ááá£ááááá¡."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:553
 msgid ""
 "https://smile.amazon.com/ch/20-8096820\; target=\"_blank\" "
 "class=\"hyperlinks links\">Set up the Tor Project on Amazon Smile"
 msgstr ""
+"https://smile.amazon.com/ch/20-8096820\; target=\"_blank\" "
+"class=\"hyperlinks links\">ááá£ááááá Tor-áá ááá¥á¢á 
Amazon Smile-áá"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:559
 msgid "Can I donate via Giving Assistant?"
-msgstr ""
+msgstr "á¨áááá«ááá ááááááá§ááá Giving 
Assistant á¨áááá¬áá á£ááááá¡áááá¡?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:563
 msgid ""
 "Giving Assistant helps you donate a percentage of your cash back earnings to"
 " us with every purchase you make at 3,000+ popular online retailers."
 msgstr ""
+"Giving Assistant ááááá®ááá áááá 
á¨áááááá¬áá áá áááááá£áá 
á¨áááá«áááááá, á£ááá "
+"áááá á£áááá£áá áááá®áá¡ ááá¬ááá 
3,000+ ááá¢áá ááá¢áááá áááá¡ áªáááááá 
á¡ááá¢áá "
+"á¡áá áááááááá¡áá¡."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:567
 msgid ""
@@ -1818,6 +1826,9 @@ msgid ""
 " class=\"hyperlinks links\">Use Giving Assistant to save money and support "
 "the Tor Project"
 msgstr ""
+"https://givingassistant.org/np#tor-project-inc\; target=\"_blank\""
+" class=\"hyperlinks links\">áááááá§áááá Giving Assistant 
áááá®áá¡ ááá¡áááááá áá "
+"Tor-áá ááá¥á¢áá¡ áá®áá ááá¡áááá áá"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:573
 msgid "Can I make a stock donation?"
@@ -1832,6 +1843,8 @@ msgid ""
 "Please let us know in advance if you are transmitting securities via DTC by "
 "contacting us at giving(at)torproject.org."
 msgstr ""
+"ááá®ááá, ááááªááááá áá 
á¨áááá®ááááá¨á, áá£ á£á¡áá¤á áá®ááááá¡ 
ááááá¡ááªáááá áá§ááááá DTC-á¡,"
+" ááá¤áá¡á¢áá¡ ááá¡áááá ááá giving(at)torproject.org."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:583
 msgid "Brokerage Firm: Merrill Lynch, Pierce, Fenner & Smith, Inc."
diff --git a/locale/tr/LC_MESSAGES/messages.po 
b/locale/tr/LC_MESSAGES/messages.po
index 704961cae1..c0245349ca 100644
--- a/locale/tr/LC_MESSAGES/messages.po
+++ b/locale/tr/LC_MESSAGES/messages.po
@@ -8,14 +8,14 @@
 # Cenk YÄ±ldÄ±zlÄ± , 2019
 # Lale FatoÅ TunÃ§man , 2019
 # Taha KaradoÄan , 2019
-# T. E. Kalayci , 2019
 # Arda BÃ¼yÃ¼kkaya , 2019
 # Kaya Zeren , 2019
 # erinm, 2019
+# T. E. Kalayci , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: T. E. Kalayci , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -834,7 +834,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:87
 msgid "How else can I donate to the Tor Project?"
-msgstr ""
+msgstr "Tor Projesine baÅka nasÄ±l baÄÄ±Å yapabilirim?"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:91
 msgid ""
@@ -842,45 +842,51 @@ msgid ""
 "links\"

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

2019-12-05 Thread translation

commit 120db38f85beb58ca29473bdcfa36d48498e52d3
Author: Translation commit bot 
Date:   Thu Dec 5 13:45:39 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index 070728805f..0662007a7f 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -1731,7 +1731,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:509
 msgid "You can donate by sending us a postal money order."
-msgstr ""
+msgstr "á¨áááá«áááá á¨áááá¬áá á£áááá 
á¡áááááá¡áá®ááá ááááááááá¡ 
á¤áá¡á¢áá ááááááááááá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:511
 msgid ""
@@ -1785,6 +1785,8 @@ msgid ""
 "Amazon Smile is a website operated by Amazon with the same products, prices,"
 " and shopping features as Amazon.com."
 msgstr ""
+"Amazon Smile á¬áá áááááááá¡ Amazon-áá¡ 
áá£ááááá áááá¡ááá¢á¡, ááááá ááá¬áá 
ááá, "
+"á¤áá¡ááááá áá á§ááááá¡ 
á¨áá¡áá«áááááááááá, á áááá ááª 
áá¥áá¡ Amazon.com-á¡."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:549
 #, php-format

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

[tor-commits] [styleguide/master] Update file names for tor-logo

2019-12-05 Thread hiro

commit adb351c2ef24a81ecee57bfc37b851ff9af3d74f
Author: hiro 
Date:   Thu Dec 5 14:43:05 2019 +0100

Update file names for tor-logo
---
 assets/static/images/tor-logo/{Black.png => black.png}   | Bin
 assets/static/images/tor-logo/{Black.svg => black.svg}   |   0
 assets/static/images/tor-logo/{Color.png => color.png}   | Bin
 assets/static/images/tor-logo/{Color.svg => color.svg}   |   0
 assets/static/images/tor-logo/{Purple.png => purple.png} | Bin
 assets/static/images/tor-logo/{Purple.svg => purple.svg} |   0
 assets/static/images/tor-logo/{White.png => white.png}   | Bin
 assets/static/images/tor-logo/{White.svg => white.svg}   |   0
 8 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/static/images/tor-logo/Black.png 
b/assets/static/images/tor-logo/black.png
similarity index 100%
rename from assets/static/images/tor-logo/Black.png
rename to assets/static/images/tor-logo/black.png
diff --git a/assets/static/images/tor-logo/Black.svg 
b/assets/static/images/tor-logo/black.svg
similarity index 100%
rename from assets/static/images/tor-logo/Black.svg
rename to assets/static/images/tor-logo/black.svg
diff --git a/assets/static/images/tor-logo/Color.png 
b/assets/static/images/tor-logo/color.png
similarity index 100%
rename from assets/static/images/tor-logo/Color.png
rename to assets/static/images/tor-logo/color.png
diff --git a/assets/static/images/tor-logo/Color.svg 
b/assets/static/images/tor-logo/color.svg
similarity index 100%
rename from assets/static/images/tor-logo/Color.svg
rename to assets/static/images/tor-logo/color.svg
diff --git a/assets/static/images/tor-logo/Purple.png 
b/assets/static/images/tor-logo/purple.png
similarity index 100%
rename from assets/static/images/tor-logo/Purple.png
rename to assets/static/images/tor-logo/purple.png
diff --git a/assets/static/images/tor-logo/Purple.svg 
b/assets/static/images/tor-logo/purple.svg
similarity index 100%
rename from assets/static/images/tor-logo/Purple.svg
rename to assets/static/images/tor-logo/purple.svg
diff --git a/assets/static/images/tor-logo/White.png 
b/assets/static/images/tor-logo/white.png
similarity index 100%
rename from assets/static/images/tor-logo/White.png
rename to assets/static/images/tor-logo/white.png
diff --git a/assets/static/images/tor-logo/White.svg 
b/assets/static/images/tor-logo/white.svg
similarity index 100%
rename from assets/static/images/tor-logo/White.svg
rename to assets/static/images/tor-logo/white.svg

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

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

2019-12-05 Thread translation

commit 41866a30e2b6f21588f3b623dc64ff7527e1e6f2
Author: Translation commit bot 
Date:   Thu Dec 5 13:15:41 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 30 +-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index 103f22894b..070728805f 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -1470,6 +1470,9 @@ msgid ""
 "the Tor network and may be able to offer you tax-deductibility for your "
 "donation."
 msgstr ""
+"á®ááá áá£ ááá§áá¤áááá ááá 
áááááá¨á, á¡áá¤á áááááá¨á áá 
á¨áááááá¨á, áááªááá£áá "
+"ááá¬áá¡ááá£áááááá áá®áá á¡ á£ááá áá 
Tor-á¥á¡ááá¡ áá á¨áá¡áá«ááá á°á¥ááááá 
á¨ááááááááááá£áá "
+"ááááá¡áá®áááááá¡ááá 
ááááá¡á£á¤ááá á¨áááá¬áá á£ááááá¡ 
á¨áá¡áá«ááááááá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:389
 msgid ""
@@ -1477,10 +1480,15 @@ msgid ""
 " links\">torservers.net is a German charitable non-profit that runs a "
 "wide variety of exit relays worldwide."
 msgstr ""
+"https://www.torservers.net/\; target=\"_blank\" class=\"hyperlinks"
+" links\">torservers.net áá áá¡ ááá áááá£áá áá 
ááááááááááá á¡áá¥áááááá¥áááá "
+"ááá¬áá¡ááá£áááá, á ááááááª á£áá 
á£ááááá§áá¤á¡ áá ááááá áááá¡ááááá 
ááááá«áá¡ áá£á¨ááááá¡, "
+"áá¡áá¤ááá ááá¡á¨á¢áááá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:391
 msgid "They also like donations of bandwidth from ISPs."
 msgstr ""
+"ááááááá¡ áá¡ááá á¡áá¡á£á ááááá 
ááá¢áá ááá¢áá¡ áááá¬ááááááá¡ 
áááá¢áá á£ááá ááááááá¡ á¨áá¬áá áá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:395
 msgid ""
@@ -1489,6 +1497,11 @@ msgid ""
 "501(c)(3) non-profit that collects donations and turns them into more US-"
 "based exit relay capacity."
 msgstr ""
+"https://www.noisebridge.net/wiki/Noisebridge_Tor\; "
+"target=\"_blank\" class=\"hyperlinks links\">Noisebridge áá áá¡ 
áááá áááá¨á "
+"áááá á¡ááá£áá 501(c)(3) áá 
ááááááááááá ááá¬áá¡ááá£áááá, á 
ááááááª ááá ááááá¡ "
+"á¨áááá¬áá á£áááááá¡ áá áááááááá¡ 
ááá áááá áááá¨á ááááááá¡ááá£áá 
áááá¡ááááá ááááá«áááá¡ "
+"á£áá á£ááááá§áá¤áá¨á."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:399
 msgid ""
@@ -1496,6 +1509,9 @@ msgid ""
 "links\">Nos Oignons is a French charitable non-profit that runs fast "
 "exit relays in France."
 msgstr ""
+"https://nos-oignons.net/\; target=\"_blank\" class=\"hyperlinks "
+"links\">Nos Oignons áá áá¡ á¤á áááá£áá 
á¡áá¥áááááá¥áááá áá ááááááááááá 
"
+"ááá¬áá¡ááá£áááá, á¡á¬á áá¤á 
áááá¡ááááá ááááá«áááá¡ á£áá 
á£áááááá§áá¤á á¡áá¤á áááááá¨á."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:403
 msgid ""
@@ -1503,6 +1519,9 @@ msgid ""
 "class=\"hyperlinks links\">DFRI is a Swedish non-profit running exit "
 "relays."
 msgstr ""
+"https://www.dfri.se/donera/?lang=en\; target=\"_blank\" "
+"class=\"hyperlinks links\">DFRI á¨áááá£á á áá 
ááááááááááá ááá¬áá¡ááá£áááá, "
+"áááá¡ááááá ááááá«áááá¡ 
áá£á¨ááááá¡ á£áá á£áááááá§áá¤á."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:407
 msgid ""
@@ -1510,10 +1529,15 @@ msgid ""
 "target=\"_blank\" class=\"hyperlinks links\">The Tor Project, Inc, but "
 "we consider that a good thing."
 msgstr ""
+"áá¡ ááá¬áá¡ááá£áááááá áá  á¬áá 
áááááááá¡ The Tor Project, Inc-á¡, áááá áá 
áááááá£áá "
+"áá ááááááá á¡áá¡áá áááááá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:409
 msgid

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

2019-12-05 Thread translation

commit 51636454a0de6ff5a1456183f46c71e9901c6c17
Author: Translation commit bot 
Date:   Thu Dec 5 12:52:48 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-properties_completed
---
 nl/torlauncher.properties | 152 +++---
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/nl/torlauncher.properties b/nl/torlauncher.properties
index c5c75182a5..a86d70395f 100644
--- a/nl/torlauncher.properties
+++ b/nl/torlauncher.properties
@@ -1,94 +1,94 @@
 ### Copyright (c) 2016, The Tor Project, Inc.
 ### See LICENSE for licensing information.
 
-torlauncher.error_title=Tor Starter
+# torlauncher.error_title=Tor Launcher
 
-torlauncher.tor_exited_during_startup=Tor is afgesloten tijdens het opstarten. 
Dit kan komen door een fout in uw torrc-bestand, een bug in Tor of ander 
programma op uw systeem, of defecte hardware. Totdat u het onderliggende 
probleem oplost en Tor opnieuw start, zal Tor Browser niet opstarten.
-torlauncher.tor_exited=Tor is onverwachts afgesloten. Dit kan komen door een 
bug in Tor zelf, een ander programma op uw systeem, of defecte hardware. Totdat 
u Tor opnieuw start, zal Tor Browser geen websites kunnen bereiken. Stuur een 
kopie van uw Tor-logboek naar het ondersteuningsteam als het probleem zich 
blijft voordoen.
-torlauncher.tor_exited2=Tor herstarten zal niet uw browsertabbladen sluiten.
-torlauncher.tor_controlconn_failed=Kon geen verbinding maken met 
Tor-controlepoort.
+# torlauncher.tor_exited_during_startup=Tor exited during startup. This might 
be due to an error in your torrc file, a bug in Tor or another program on your 
system, or faulty hardware. Until you fix the underlying problem and restart 
Tor, Tor Browser will not start.
+# torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug 
in Tor itself, another program on your system, or faulty hardware. Until you 
restart Tor, the Tor Browser will not able to reach any websites. If the 
problem persists, please send a copy of your Tor Log to the support team.
+# torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
+# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
 torlauncher.tor_failed_to_start=Tor kon niet worden gestart.
-torlauncher.tor_control_failed=Controle over Tor mislukt.
-torlauncher.tor_bootstrap_failed=Tor kon geen Tor-netwerkverbinding maken.
-torlauncher.tor_bootstrap_failed_details=%1$S mislukt (%2$S).
+# torlauncher.tor_control_failed=Failed to take control of Tor.
+# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network 
connection.
+# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
 
-torlauncher.unable_to_start_tor=Kon Tor niet starten.\n\n%S
-torlauncher.tor_missing=Het uitvoerbare Tor-bestand ontbreekt.
-torlauncher.torrc_missing=Het torrc-bestand ontbreekt en kon niet worden 
aangemaakt.
-torlauncher.datadir_missing=De Tor-gegevensmap bestaat niet en kon niet worden 
aangemaakt.
-torlauncher.password_hash_missing=Ophalen van gehasht wachtwoord is mislukt.
+# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
+# torlauncher.tor_missing=The Tor executable is missing.
+# torlauncher.torrc_missing=The torrc file is missing and could not be created.
+# torlauncher.datadir_missing=The Tor data directory does not exist and could 
not be created.
+# torlauncher.password_hash_missing=Failed to get hashed password.
 
-torlauncher.failed_to_get_settings=Kon Tor-instellingen niet ophalen.\n\n%S
-torlauncher.failed_to_save_settings=Kon Tor-instellingen niet opslaan.\n\n%S
-torlauncher.ensure_tor_is_running=Zorg ervoor dat Tor actief is.
+# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
+# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
+# torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
 
-torlauncher.error_proxy_addr_missing=U moet zowel een IP-adres of hostnaam en 
een poortnummer opgeven om Tor te configureren voor het gebruik van een 
ââproxy om toegang te krijgen tot het internet.
-torlauncher.error_proxy_type_missing=U moet het proxytype selecteren.
-torlauncher.error_bridges_missing=U moet een of meer bridges opgeven.
-torlauncher.error_default_bridges_type_missing=U moet een transporttype 
selecteren voor de verstrekte bridges.
-torlauncher.error_bridgedb_bridges_missing=Vraag een bridge aan.
-torlauncher.error_bridge_bad_default_type=Er zijn geen verstrekte bridges met 
het transporttype %S beschikbaar. Pas uw instellingen aan.
+# torlauncher.error_proxy_addr_missing=You must specify both an IP address or 
hostname and a port number to configure Tor to use a proxy to access the 
Internet.
+# torlauncher.error_proxy_type_missing=You must select the proxy type.
+# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport 
type for the provided bridges.
+#

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

2019-12-05 Thread translation

commit 4d26b010deed83fe79d53296b16d16095eaa6dab
Author: Translation commit bot 
Date:   Thu Dec 5 12:45:40 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 9 +
 1 file changed, 9 insertions(+)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index 4c11bff36f..103f22894b 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -899,6 +899,9 @@ msgid ""
 "making a donation with one of the methods above, please email giving(at)torproject.org."
 msgstr ""
+"áá£ á ááá á¨ááááá®áá ááá¥áá áá 
áá¡á£á á á¡áááááááááá á¡áá©á£á¥á áá¡ 
ááá¦ááá á¨áááá¬áá á£ááááá¡ "
+"ááááá áááªááá£áá á ááááááá 
áááá ááááááááá¡áá¡, ááá®ááá 
ááááá¬áá áá ááá¤áá¡á¢ááá giving(at)torproject.org."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:149
 msgid "What is the Tor Project and what does it do?"
@@ -1383,6 +1386,9 @@ msgid ""
 "For European bank transfers, we have an arrangement with the Renewable "
 "Freedom Foundation to provide tax-deductible donations for Europeans."
 msgstr ""
+"ááá ááá£áá á¡áááááá ááááá 
ááªá®ááááá¡áááá¡, áááá¥áá¡ 
á¨ááááá®áááá ááááá¡á£á¤ááááá¡ "
+"(Renewable Freedom) á¤áááááá, 
ááááá¡áá®áááááá¡ááá ááááá¡á£á¤ááá 
á¨áááá¬áá á£ááááá¡ "
+"á¨áá¡áá«áááááááá¡áááá¡, ááá 
áááááááááá¡."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:347
 msgid ""
@@ -1390,6 +1396,9 @@ msgid ""
 "href=\"https://renewablefreedom.org/contact/\; target=\"_blank\" "
 "class=\"hyperlinks links\">upon request."
 msgstr ""
+"áá¡ááá ááá¡áªáááá á¨áááá¬áá 
á£ááááá¡ á¥ááááá á¡ https://renewablefreedom.org/contact/\; target=\"_blank\" "
+"class=\"hyperlinks links\">áááá®ááááá¡áááááá."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:349
 msgid "The account information is as follows:"

___
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

2019-12-05 Thread translation

commit f07405f5b585e52ab482e3d54eb06d66cd31637d
Author: Translation commit bot 
Date:   Thu Dec 5 12:23:40 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+fa.po | 20 +++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/contents+fa.po b/contents+fa.po
index 70436d74fc..9c57d85f96 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -4557,7 +4557,25 @@ msgstr ""
 #: https//support.torproject.org/operators/offline-ed25519/
 #: (content/operators/offline-ed25519/contents+en.lrquestion.description)
 msgid "This feature is optional, you don't need to use it unless you want to."
-msgstr "Ø§ÛÙ ÙÛÚÚ¯Û Ø§Ø®ØªÛØ§Ø±Û Ø§Ø³Øª Ù Ø´ÙØ§ ÙÛâØªÙØ§ÙÛØ¯ 
Ø§Ú¯Ø± Ø¨Ø®ÙØ§ÙÛØ¯ Ø§Ø² Ø¢Ù Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÛØ¯."
+msgstr ""
+"Ø§ÛÙ ÙÛÚÚ¯Û Ø§Ø®ØªÛØ§Ø±Û Ø§Ø³Øª Ù Ø´ÙØ§ ÙÛâØªÙØ§ÙÛØ¯ Ø§Ú¯Ø± 
Ø¨Ø®ÙØ§ÙÛØ¯ Ø§Ø² Ø¢Ù Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÛØ¯.\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+"\n"
+" "
 
 #: https//support.torproject.org/operators/offline-ed25519/
 #: (content/operators/offline-ed25519/contents+en.lrquestion.description)

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

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

2019-12-05 Thread translation

commit fe71ba26a02d0e7e32b33fab9331b5ead39f77b5
Author: Translation commit bot 
Date:   Thu Dec 5 12:21:39 2019 +


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

diff --git a/nl/torbutton.dtd b/nl/torbutton.dtd
index ee09cbc7e4..7a4d577d67 100644
--- a/nl/torbutton.dtd
+++ b/nl/torbutton.dtd
@@ -1,4 +1,4 @@
-
+
 
 
 
@@ -25,10 +25,10 @@
 
 
 
-
+
 
 
-
+
 
 
 

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

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

2019-12-05 Thread translation

commit 1770a55371ab8c768e052787837feed67adf48f3
Author: Translation commit bot 
Date:   Thu Dec 5 12:15:41 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 locale/ka/LC_MESSAGES/messages.po | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/locale/ka/LC_MESSAGES/messages.po 
b/locale/ka/LC_MESSAGES/messages.po
index f4081d89de..4c11bff36f 100644
--- a/locale/ka/LC_MESSAGES/messages.po
+++ b/locale/ka/LC_MESSAGES/messages.po
@@ -847,11 +847,15 @@ msgid ""
 "links\" href=\"https://2019.www.torproject.org/donate/donate.html.en\; "
 "target=\"_blank\">credit card or PayPal, please click here."
 msgstr ""
+"á¨áááá¨ááá: áá£ áá¡á£á á áááá¦áá 
áááá®á Tor-áá ááá¥á¢áá¡áááá¡ https://2019.www.torproject.org/donate/donate.html.en\; "
+"target=\"_blank\">á¡ááá áááá¢á ááá áááá áá 
PayPal-áá, ááá®ááá ááá¬ááááá áá¥."
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:95
 msgid ""
 "The Tor Project also offers the following alternative donation methods:"
 msgstr ""
+"Tor-áá ááá¥á¢á ááá áááá ááááááááá 
áááá¡á®áááááá£á ááááá¡ á¨áááá¬áá 
á£ááááá¡ ááá¡áá¦áááá:"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:102
 msgid "Bitcoin and Other Cryptocurrencies"
@@ -871,11 +875,11 @@ msgstr "Amazon Smile"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:120
 msgid "Giving Assistant"
-msgstr ""
+msgstr "Giving Assistant"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:126
 msgid "EU Bank Transfer"
-msgstr ""
+msgstr "ááá ááá£áá á¡áááááá ááááá 
ááªá®áá"
 
 #: 
tmp/cache_locale/7d/7d56367a61f987367eeb2a89d0c6db83fd0801cce86278bf7e99ed39b5b46254.php:132
 msgid ""

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

[tor-commits] [community/master] Update h6 header to include portal and section

2019-12-05 Thread antonela

commit 3b7add0533da45fd2e2bd1ac3c1068b5b2274daa
Author: Antonela 
Date:   Thu Dec 5 09:15:00 2019 -0300

Update h6 header to include portal and section

Fix https://dip.torproject.org/torproject/web/community/issues/38
---
 templates/hero.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/hero.html b/templates/hero.html
index 3a8f7c0..f02d70c 100644
--- a/templates/hero.html
+++ b/templates/hero.html
@@ -2,7 +2,7 @@
   
   
 
-  {% block section %}{{ 
this.section }}{% endblock %}
+  {{ _(Community) }}
 
 
   {% block title %}{{ 
this.title }}{% endblock %}

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

[tor-commits] [community/master] Make color header consistent

2019-12-05 Thread antonela

commit 276e27d951de5175315a62aa863a1f992dfbcc02
Author: Antonela 
Date:   Thu Dec 5 08:54:43 2019 -0300

Make color header consistent

Fix https://dip.torproject.org/torproject/web/community/issues/108
---
 .../community-resources/bad-relays/contents.lr | 26 --
 .../eff-tor-legal-faq/contents.lr  |  4 +++-
 .../tor-dmca-response/contents.lr  |  2 ++
 .../community-resources/good-bad-isps/contents.lr  |  2 ++
 .../community-resources/swag/contents.lr   |  6 +++--
 .../tor-abuse-templates/contents.lr|  2 ++
 .../tor-exit-guidelines/contents.lr|  4 +++-
 .../tor-relay-universities/contents.lr |  4 +++-
 8 files changed, 33 insertions(+), 17 deletions(-)

diff --git 
a/content/relay-operations/community-resources/bad-relays/contents.lr 
b/content/relay-operations/community-resources/bad-relays/contents.lr
index 217730a..594eaf6 100644
--- a/content/relay-operations/community-resources/bad-relays/contents.lr
+++ b/content/relay-operations/community-resources/bad-relays/contents.lr
@@ -1,10 +1,12 @@
 _model: page
 ---
+color: primary
+---
 title: Bad relays
 ---
 body:
 
-Ran into a misconfigured, malicious, or suspicious relay while using Tor? 
Please let us know by sending email to bad-relays AT lists DOT torproject DOT 
org! Many bad relays are caught thanks to our wider community, so many thanks 
for all your help and vigilance! 
+Ran into a misconfigured, malicious, or suspicious relay while using Tor? 
Please let us know by sending email to bad-relays AT lists DOT torproject DOT 
org! Many bad relays are caught thanks to our wider community, so many thanks 
for all your help and vigilance!
 
 ### What is a bad relay?
 
@@ -12,16 +14,16 @@ A bad relay is one that either doesn't work properly or 
tampers with our users'
 
  * Tampering with exit traffic in any way (including dropping accepted 
connections). This might be accidental (such as an anti-virus filter) or 
malicious (commonly SSLStrip, which replaces https:// links with http:// to 
snoop on traffic) or even intentional (such as layer 7 inspection for P2P 
traffic detection/mitigation).
  * Running HSDirs that harvest and probe .onion addresses
- * Manipulating the DHT that is used for onion services, e.g., by positioning 
itself in the DHT. 
+ * Manipulating the DHT that is used for onion services, e.g., by positioning 
itself in the DHT.
  * Using a DNS provider that censors its results (such as some 
[OpenDNS](http://www.opendns.com) or Quad (9 9.9.9.9) configurations).
  * Performing a [Sybil attack](https://en.wikipedia.org/wiki/Sybil_attack), 
which means flooding the network with new relays in an effort to deanonymize 
users. If you want to run multiple relays then that's great! But please be sure 
to set the [MyFamily 
parameter](https://www.torproject.org/docs/tor-manual.html.en#MyFamily).
- * Exit relays routing their exit traffic back into the tor network (not 
actually exiting any traffic) 
- 
+ * Exit relays routing their exit traffic back into the tor network (not 
actually exiting any traffic)
+
 Also, if your relay is stolen or goes missing, please report it as well, so we 
can blacklist it in case whoever took it puts it back online.
 
-The following are currently permitted yet do have some discussion for 
prohibition (as such, they should not be reported at this time)... 
+The following are currently permitted yet do have some discussion for 
prohibition (as such, they should not be reported at this time)...
 
- * Only allowing plain-text traffic (for instance, just port 80). There's no 
good reason to disallow its encrypted counterpart (like port 443), making these 
relays highly suspect for sniffing traffic. See 
[context](https://www.google.com/search?site:torproject.org+80+443+6667) and 
[spec](https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n1969). 
+ * Only allowing plain-text traffic (for instance, just port 80). There's no 
good reason to disallow its encrypted counterpart (like port 443), making these 
relays highly suspect for sniffing traffic. See 
[context](https://www.google.com/search?site:torproject.org+80+443+6667) and 
[spec](https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n1969).
 
 ### How do I report a bad relay?
 
@@ -31,9 +33,9 @@ You can check which exit you are using at any time by 
visiting [tor check](https
 
  1. The relay's IP address or fingerprint. The fingerprint is a 
forty-character hex string such as `203933ED4E55EF8A3C3518427D1A1ED6A4CC285E`.
  2. What kind of behavior did you see?
- 3. Any additional information we'll need to reproduce the issue. 
+ 3. Any additional information we'll need to reproduce the issue.
 
-However, if you need help with anything Tor-related, please contact the [help 
desk](https://www.torproject.org/about/contact) instead. 
+However, if you need help with anything Tor-related, please contact the [help

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

2019-12-05 Thread translation

commit 05d604d88c054826e19559589269aafe5a267fef
Author: Translation commit bot 
Date:   Thu Dec 5 11:53:34 2019 +

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

diff --git a/contents+fa.po b/contents+fa.po
index 1dc927813a..70436d74fc 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -3950,7 +3950,7 @@ msgstr ""
 #: https//support.torproject.org/operators/better-anonymity/
 #: (content/operators/better-anonymity/contents+en.lrquestion.title)
 msgid "Do I get better anonymity if I run a relay?"
-msgstr ""
+msgstr "Ø¢ÛØ§ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Ø±ÙÙ Ø¨Ù Ú¯ÙÙØ§Ù ÙØ§ÙØ¯Ù ÙÙ Ú©Ù
Ú© ÙÛâÚ©ÙØ¯Ø"
 
 #: https//support.torproject.org/operators/better-anonymity/
 #: (content/operators/better-anonymity/contents+en.lrquestion.description)
@@ -4557,7 +4557,7 @@ msgstr ""
 #: https//support.torproject.org/operators/offline-ed25519/
 #: (content/operators/offline-ed25519/contents+en.lrquestion.description)
 msgid "This feature is optional, you don't need to use it unless you want to."
-msgstr ""
+msgstr "Ø§ÛÙ ÙÛÚÚ¯Û Ø§Ø®ØªÛØ§Ø±Û Ø§Ø³Øª Ù Ø´ÙØ§ ÙÛâØªÙØ§ÙÛØ¯ 
Ø§Ú¯Ø± Ø¨Ø®ÙØ§ÙÛØ¯ Ø§Ø² Ø¢Ù Ø§Ø³ØªÙØ§Ø¯Ù Ú©ÙÛØ¯."
 
 #: https//support.torproject.org/operators/offline-ed25519/
 #: (content/operators/offline-ed25519/contents+en.lrquestion.description)

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

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

2019-12-05 Thread translation

commit 95a5914808cd179c9eb659b588e1d7a529c82892
Author: Translation commit bot 
Date:   Thu Dec 5 11:50:09 2019 +

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

diff --git a/contents+ja.po b/contents+ja.po
index e7a164ca48..c45b9e0116 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -5,8 +5,8 @@
 # erinm, 2019
 # ue zaeco, 2019
 # Songbo Gong , 2019
-# Tokumei Nanashi, 2019
 # Emma Peel, 2019
+# Tokumei Nanashi, 2019
 # 
 msgid ""
 msgstr ""
@@ -14,7 +14,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-29 10:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Tokumei Nanashi, 2019\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -598,12 +598,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
 msgid ""
-msgstr ""
+msgstr ""
 
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.title)
@@ -998,6 +998,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1315,6 +1317,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1342,6 +1346,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1747,6 +1753,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -1760,6 +1768,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/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] [lego/master] Update footer

2019-12-05 Thread antonela

commit e058aee7e40a97434ddbffbb1d5ffe18a610076b
Author: Antonela 
Date:   Thu Dec 5 08:34:58 2019 -0300

Update footer

Remove newsletter block border
---
 templates/footer.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/footer.html b/templates/footer.html
index 7f45ce0..d9a350c 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -60,7 +60,7 @@
 {% endif %}
   
 
-
+
   
 {{ _('Subscribe to our 
Newsletter') }}
 {{ _('Get monthly updates and opportunities from 
the Tor Project:') }}

___
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

2019-12-05 Thread translation

commit 1c02fbd816477a6d407cb52a456fff74c43d6ca5
Author: Translation commit bot 
Date:   Thu Dec 5 11:23:38 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ar.po | 2 ++
 contents+fa.po | 7 +--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index 651b9c4773..05cdfc2403 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -2894,6 +2894,8 @@ msgid ""
 "* Note the Library folder is hidden on newer versions of macOS. To navigate "
 "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
+"* Ø§ÙØªØ¨ÙÙØ§ Ø¨Ø£ÙÙ ÙØ¬ÙÙØ¯ Library Ø³ÙÙÙÙ ÙØ®ÙÙÙØ§Ù ÙÙ 
Ø§ÙÙÙØ³Ø® Ø§ÙØ£Ø¬Ø¯Ø¯ ÙÙ macOS. "
+"ÙÙØ§ÙØªÙØ§Ù ÙÙØ°Ø§ Ø§ÙÙØ¬ÙÙØ¯ ÙÙ Finder Ø§Ø®ØªØ§Ø±ÙØ§ \"Go to 
Folder\" ÙÙ ÙØ§Ø¦ÙØ© \"Go\". "
 
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)
diff --git a/contents+fa.po b/contents+fa.po
index 884e851e80..1dc927813a 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -3769,7 +3769,7 @@ msgstr ""
 #: (content/https/https-2/contents+en.lrquestion.description)
 msgid ""
 "HTTPS Connections are used to secure communications over computer networks."
-msgstr ""
+msgstr "Ø§ØªØµØ§Ù HTTPS Ø¨Ø±Ø§Û Ø§ÙÙ Ú©Ø±Ø¯Ù Ø§Ø±ØªØ¨Ø§Ø· Ø¯Ø± Ø´Ø¨Ú©Ù 
ÙØ§Û Ú©Ø§ÙÙ¾ÛÙØªØ±Û Ø¨Ù Ú©Ø§Ø± ÙÛâØ±ÙØ¯."
 
 #: https//support.torproject.org/https/https-2/
 #: (content/https/https-2/contents+en.lrquestion.description)
@@ -3789,7 +3789,7 @@ msgstr ""
 #: https//support.torproject.org/operators/bandwidth-shaping/
 #: (content/operators/bandwidth-shaping/contents+en.lrquestion.title)
 msgid "What bandwidth shaping options are available to Tor relays?"
-msgstr ""
+msgstr "Ø¨Ø±Ø§Û Ø´Ú©Ù Ø¯Ø§Ø¯Ù Ø¨Ù Ù¾ÙÙØ§ÛâØ¨Ø§ÙØ¯ ÚÙ 
Ø±Ø§ÙÙØ§ÛÛ Ø¯Ø± Ø±ÙÙ ÙØ§Û ØªÙØ± ÙØ¬ÙØ¯ Ø¯Ø§Ø±Ø¯Ø"
 
 #: https//support.torproject.org/operators/bandwidth-shaping/
 #: (content/operators/bandwidth-shaping/contents+en.lrquestion.description)
@@ -3848,6 +3848,9 @@ msgid ""
 "cable modem, you should set BandwidthRate to less than your smaller "
 "bandwidth (Usually that's the upload bandwidth)."
 msgstr ""
+"Ø§Ú¯Ø± Ø§ØªØµØ§Ù ÙØ§ÙØªÙØ§Ø²ÙÛ (ÛØ¹ÙÛ Ø¢Ù¾ÙÙØ¯ Ú©ÙØªØ± Ø§Ø² 
Ø¯Ø§ÙÙÙØ¯) Ø¯Ø§Ø±ÛØ¯ ÙØ«ÙØ§ ÙÙØ¯Ù Ø´ÙØ§ Ø³ÛÙÛ "
+"Ø§Ø³ØªØ Ø¨Ø§ÛØ¯ ÙÛØ²Ø§Ù Ù¾ÙÙØ§Û Ø¨Ø§ÙØ¯ Ø±Ø§ Ù¾Ø§ÛÛÙ Ø§Ø² Ø§Ø² 
Ù¾ÙÙØ§Û Ø¨Ø§ÙØ¯ Ú©ÙÚÚ©ØªØ± ØªÙØ¸ÛÙ Ú©ÙÛØ¯ "
+"(ÙØ¹ÙÙÙØ§ Ù¾ÙÙØ§Û Ø¨Ø§ÙØ¯ Ø¢Ù¾ÙÙØ¯ Ú©ÙÚÚ©ØªØ± Ø§Ø³Øª)."
 
 #: https//support.torproject.org/operators/bandwidth-shaping/
 #: (content/operators/bandwidth-shaping/contents+en.lrquestion.description)

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

[tor-commits] [tpo/master] Bug 32675: Add lt, ms, th locales to the alpha download page

2019-12-05 Thread boklm

commit cab9f95c5ec7434c967e2ccf5f98e7bbe5aed352
Author: Nicolas Vigier 
Date:   Thu Dec 5 12:21:33 2019 +0100

Bug 32675: Add lt, ms, th locales to the alpha download page
---
 databags/download-alternatives-alpha.ini | 12 
 1 file changed, 12 insertions(+)

diff --git a/databags/download-alternatives-alpha.ini 
b/databags/download-alternatives-alpha.ini
index 1badac9..ae9a793 100644
--- a/databags/download-alternatives-alpha.ini
+++ b/databags/download-alternatives-alpha.ini
@@ -74,10 +74,18 @@ language = á¥áá áá£áá ááá (ka)
 url = /ko/
 language = íêµì´ (ko)
 
+[lt]
+url = /lt/
+language = LietuviÅ³ (lt)
+
 [mk]
 url = /mk/
 language = Ð¼Ð°ÐºÐµÐ´Ð¾Ð½ÑÐºÐ¸ (mk)
 
+[ms]
+url = /ms/
+language = Melayu (ms)
+
 [nb-NO]
 url = /nb-NO/
 language = Norsk BokmÃ¥l (nb-NO)
@@ -106,6 +114,10 @@ url = /ru/
 url = /sv-SE/
 language = Svenska (sv-SE)
 
+[th]
+url = /th/
+language = à¸ à¸²à¸©à¸²à¹à¸à¸¢ (th)
+
 [tr]
 url = /tr/
 language = TÃ¼rkÃ§e (tr)

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

[tor-commits] [tpo/master] Remove 9.5a1 and 9.5a2 from RecommendedTBBVersions

2019-12-05 Thread boklm

commit c5a0ebb2126991483ea90e1ef9542ce4a730a921
Author: Nicolas Vigier 
Date:   Thu Dec 5 11:49:41 2019 +0100

Remove 9.5a1 and 9.5a2 from RecommendedTBBVersions
---
 content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 8 
 1 file changed, 8 deletions(-)

diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr 
b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
index f7bcee0..121aaae 100644
--- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
+++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr
@@ -9,14 +9,6 @@ body:
 "9.0.2-MacOS",
 "9.0.2-Linux",
 "9.0.2-Windows",
-"9.5a1",
-"9.5a1-MacOS",
-"9.5a1-Linux",
-"9.5a1-Windows",
-"9.5a2",
-"9.5a2-MacOS",
-"9.5a2-Linux",
-"9.5a2-Windows",
 "9.5a3",
 "9.5a3-MacOS",
 "9.5a3-Linux",



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

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

2019-12-05 Thread translation

commit 7296135af514e27791c726c303ef9d046e25cab2
Author: Translation commit bot 
Date:   Thu Dec 5 11:20:11 2019 +

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

diff --git a/contents+ar.po b/contents+ar.po
index dcd7f91393..48dba45230 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -1982,12 +1982,12 @@ msgstr ""
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Move the Tor Browser application to Trash."
-msgstr ""
+msgstr "* Ø§ÙÙÙÙØ§ ØªØ·Ø¨ÙÙ Tor Browser Ø¥ÙÙ Ø³ÙØ© Ø§ÙÙ
ØØ°ÙÙØ§Øª. "
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "* Go to your `~/Library/Application Support/` folder."
-msgstr ""
+msgstr "Ø¥Ø°ÙØ¨ÙØ§ Ø¥ÙÙ ÙØ¬ÙÙØ¯ `~/Library/Application Support/`"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -1995,6 +1995,8 @@ msgid ""
 "* Note the Library folder is hidden on newer versions of macOS. To navigate "
 "to this folder in Finder, select \"Go to Folder...\" in the \"Go\" menu."
 msgstr ""
+"* Ø§ÙØªØ¨ÙÙØ§ Ø¨Ø£ÙÙ ÙØ¬ÙÙØ¯ Library Ø³ÙÙÙÙ ÙØ®ÙÙÙØ§Ù ÙÙ 
Ø§ÙÙÙØ³Ø® Ø§ÙØ£Ø¬Ø¯Ø¯ ÙÙ macOS. "
+"ÙÙØ§ÙØªÙØ§Ù ÙÙØ°Ø§ Ø§ÙÙØ¬ÙÙØ¯ ÙÙ Finder Ø§Ø®ØªØ§Ø±ÙØ§ \"Go to 
Folder\" ÙÙ ÙØ§Ø¦ÙØ© \"Go\". "
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2002,6 +2004,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -2015,6 +2019,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/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] [styleguide/master] Update visuals.html

2019-12-05 Thread antonela

commit 0628be13a45c5b5c21db9d1930d80d310c6ecc9f
Author: Antonela 
Date:   Thu Dec 5 08:12:53 2019 -0300

Update visuals.html
---
 templates/visuals.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/visuals.html b/templates/visuals.html
index 59007b6..5db28a9 100644
--- a/templates/visuals.html
+++ b/templates/visuals.html
@@ -50,7 +50,7 @@
   
 
   Apps
-  .
+  Our apps' interface use safe and bright colors.
   
   
   blueviolet

___
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

2019-12-05 Thread translation

commit 1b2181aacda55d25b908948a292f77e7177a5437
Author: Translation commit bot 
Date:   Thu Dec 5 10:53:44 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ar.po |  6 +++---
 contents+fa.po | 14 --
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index 5b7caf26fd..651b9c4773 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -7,8 +7,8 @@
 # erinm, 2019
 # Ahmed IB , 2019
 # ButterflyOfFire, 2019
-# Layla Taha , 2019
 # Emma Peel, 2019
+# Layla Taha , 2019
 # 
 msgid ""
 msgstr ""
@@ -16,7 +16,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-14 16:04+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Layla Taha , 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/1519/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2879,7 +2879,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)
 msgid "On macOS:"
-msgstr ""
+msgstr "Ø¹Ù ÙØ¸Ø§Ù macOS : "
 
 #: https//support.torproject.org/tbb/tbb-editing-torrc/
 #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description)
diff --git a/contents+fa.po b/contents+fa.po
index cd7dec2ae6..884e851e80 100644
--- a/contents+fa.po
+++ b/contents+fa.po
@@ -3647,6 +3647,7 @@ msgid ""
 "Bridge relays are Tor relays that are not listed in the public Tor "
 "directory."
 msgstr ""
+"Ø±ÙÙ ÙØ§Û Ù¾ÙÛ Ø¯Ø± ØªÙØ± Ø±ÙÙ ÙØ§ÛÛ ÙØ³ØªÙØ¯ Ú©Ù Ø¯Ø± 
ÙÙØ±Ø³Øª Ø±Ø§ÙÙÙØ§Û ØªÙØ± Ù¾ÛØ¯Ø§ ÙÛØ³ØªÙØ¯."
 
 #: https//support.torproject.org/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)
@@ -3654,6 +3655,8 @@ msgid ""
 "That means that ISPs or governments trying to block access to the Tor "
 "network can't simply block all bridges."
 msgstr ""
+"Ø§ÛÙ ÛØ¹ÙÛ Ø³Ø±ÙÛØ³ Ø¯ÙÙØ¯Ù ÙØ§Û Ø§ÛÙØªØ±ÙØªÛ ÛØ§ Ø¯ÙÙØª 
ÙØ§ÛÛ Ú©Ù ØªÙØ§Ø´ ÙÛâÚ©ÙÙØ¯ Ø§Ø² Ø¯Ø³ØªØ±Ø³Û Ø¨Ù "
+"Ø´Ø¨Ú©ÙâÛ ØªÙØ± Ø¬ÙÙÚ¯ÛØ±Û Ú©ÙÙØ¯ ÙØ®ÙØ§ÙÙØ¯ ØªÙØ§ÙØ³Øª ÙÙ
ÙâÛ Ù¾Ù ÙØ§ Ø±Ø§ Ø¨Ø¨ÙØ¯ÙØ¯."
 
 #: https//support.torproject.org/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)
@@ -3662,12 +3665,15 @@ msgid ""
 "who want an extra layer of security because they're worried somebody will "
 "recognize that they are contacting a public Tor relay IP address."
 msgstr ""
+"Ù¾Ù ÙØ§ Ø¨Ù Ø¯Ø±Ø¯ Ú©Ø§Ø±Ø¨Ø±Ø§ÙÛ ÙÛâØ®ÙØ±ÙØ¯ Ú©Ù ØÚ©ÙÙØª 
Ø³Ø±Ú©ÙØ¨Ú¯Ø±Û Ø¨Ø§ÙØ§Û Ø³Ø± Ø¯Ø§Ø±ÙØ¯ ÛØ§ Ú©Ø³Ø§ÙÛ Ú©Ù "
+"ÙÛâØ®ÙØ§ÙÙØ¯ ÙØ§ÛÙâÛ ØÙØ§Ø¸ØªÛ Ø¯ÛÚ¯Ø±Û Ø¯Ø§Ø´ØªÙ 
Ø¨Ø§Ø´ÙØ¯ ØªØ§ Ú©Ø³Û Ø§Ø² Ø§ØªØµØ§Ù Ø¢ÙÙØ§ Ø¨Ù ÙØ´Ø§ÙÛ IP "
+"ÛÚ© Ø±ÙÙâÛ ÙÙÚ¯Ø§ÙÛ Ø¢Ú¯Ø§Ù ÙØ´ÙØ¯."
 
 #: https//support.torproject.org/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)
 msgid ""
 "A bridge is just a normal relay with a slightly different configuration."
-msgstr ""
+msgstr "Ù¾Ù ÛÚ© Ø±ÙÙâÛ ÙØ¹ÙÙÙÛ Ø§Ø³Øª Ú©Ù Ù¾ÛÚ©Ø±Ø¨ÙØ¯Û Ø¢Ù 
Ú©ÙÛ ÙØ±Ù Ø¯Ø§Ø±Ø¯."
 
 #: https//support.torproject.org/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)
@@ -3683,6 +3689,8 @@ msgid ""
 "Several countries, including China and Iran, have found ways to detect and "
 "block connections to Tor bridges."
 msgstr ""
+"Ú©Ø´ÙØ±ÙØ§ÛÛ ÙØ«Ù Ø§ÛØ±Ø§Ù Ù ÚÛÙ Ø±Ø§Ù ÙØ§ÛÛ Ø¨Ø±Ø§Û 
Ø´ÙØ§Ø³Ø§ÛÛ Ù¾Ù ÙØ§Û ØªÙØ± Ù ÙØ³Ø¯ÙØ¯ Ú©Ø±Ø¯Ù Ø§ØªØµØ§Ù"
+" Ø¨Ù Ø¢ÙÙØ§ Ù¾ÛØ¯Ø§ Ú©Ø±Ø¯ÙâØ§ÙØ¯."
 
 #: https//support.torproject.org/censorship/censorship-7/
 #: (content/censorship/censorship-7/contents+en.lrquestion.description)
@@ -3747,13 +3755,15 @@ msgstr ""
 #: https//support.torproject.org/https/https-2/
 #: (content/https/https-2/contents+en.lrquestion.title)
 msgid "Can I browse normal HTTPS sites with Tor?"
-msgstr ""
+msgstr "Ø¢ÛØ§ ÙÛâØªÙØ§ÙÙ Ø¨Ø§ ØªÙØ± ÙØ¨Ø³Ø§ÛØª ÙØ§ÛÛ Ø±Ø§ Ú©Ù 
HTTPS Ø¹Ø§Ø¯Û Ø¯Ø§Ø±ÙØ¯ Ø¨Ø¨ÛÙÙØ"
 
 #: https//support.torproject.org/https/https-2/
 #: (content/https/https-2/contents+en.lrquestion.description)
 msgid ""
 "The short answer is: **Yes, you can browse normal HTTPS Sites using Tor.**"
 msgstr ""
+"Ù¾Ø§Ø³Ø® Ú©ÙØªØ§Ù Ø§ÛÙ Ø§Ø³Øª: Ø¨ÙÙØ Ø´ÙØ§ ÙÛâØªÙØ§ÙÛØ¯ Ø¨Ø§ 
ØªÙØ± ÙØ¨Ø³Ø§ÛØª ÙØ§Û Ø¨Ø§ HTTPS Ø¹Ø§Ø¯Û Ø±Ø§ "
+"ÙØ±ÙØ± Ú©ÙÛØ¯."
 
 #: https//support.torproject.org/https/https-2/
 #: (content/https/https-2/contents+en.lrquestion.description)

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

[tor-commits] [styleguide/master] Clean /images

2019-12-05 Thread antonela

commit a90fb2b99a851b8c612a0321a71d11b949f6aead
Author: Antonela 
Date:   Thu Dec 5 07:51:59 2019 -0300

Clean /images
---
 assets/static/images/color.svg |  76 -
 assets/static/images/index.svg |   1 -
 assets/static/images/onion-bg.png  | Bin 2606 -> 0 bytes
 assets/static/images/onion-bg.svg  |  41 ---
 assets/static/images/purple.svg|  72 ---
 .../{onboarding => tb-onboarding}/circuit.svg  |   0
 .../circumvention.svg  |   0
 .../decentralized.svg  |   0
 .../onion-services.svg |   0
 .../{onboarding => tb-onboarding}/protected.svg|   0
 .../{onboarding => tb-onboarding}/security.svg |   0
 .../{home => tor-homepage}/png/block-trackers.png  | Bin
 .../png/block-track...@2x.png  | Bin
 .../png/block-track...@3x.png  | Bin
 .../{home => tor-homepage}/png/browse-freely.png   | Bin
 .../png/browse-fre...@2x.png   | Bin
 .../png/browse-fre...@3x.png   | Bin
 .../{home => tor-homepage}/png/encryption.png  | Bin
 .../{home => tor-homepage}/png/encrypt...@2x.png   | Bin
 .../{home => tor-homepage}/png/encrypt...@3x.png   | Bin
 .../{home => tor-homepage}/png/fingerprinting.png  | Bin
 .../png/fingerprint...@2x.png  | Bin
 .../png/fingerprint...@3x.png  | Bin
 .../{home => tor-homepage}/png/surveillance.png| Bin
 .../{home => tor-homepage}/png/surveilla...@2x.png | Bin
 .../{home => tor-homepage}/png/surveilla...@3x.png | Bin
 .../{home => tor-homepage}/png/take-b...@3x.png| Bin
 .../{home => tor-homepage}/svg/block-trackers.svg  |   0
 .../{home => tor-homepage}/svg/browse-freely.svg   |   0
 .../{home => tor-homepage}/svg/encryption.svg  |   0
 .../{home => tor-homepage}/svg/fingerprinting.svg  |   0
 .../{home => tor-homepage}/svg/surveillance.svg|   0
 .../{home => tor-homepage}/svg/take-back.svg   |   0
 assets/static/images/tor-logo.svg  |  50 --
 assets/static/images/tor-logo1x.png| Bin 4143 -> 0 bytes
 assets/static/images/tor-l...@2x.png   | Bin 10042 -> 0 bytes
 assets/static/images/white.svg |  49 -
 templates/brand-assets.html|  14 ++--
 templates/visuals.html |  22 +++---
 39 files changed, 18 insertions(+), 307 deletions(-)

diff --git a/assets/static/images/color.svg b/assets/static/images/color.svg
deleted file mode 100644
index ebd0032..000
--- a/assets/static/images/color.svg
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd;>
-http://www.w3.org/2000/svg; 
xmlns:xlink="http://www.w3.org/1999/xlink; x="0px" y="0px"
-viewBox="0 0 150.5 91.1" enable-background="new 0 0 150.5 91.1" 
xml:space="preserve">
-
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-   
-
-
diff --git a/assets/static/images/index.svg b/assets/static/images/index.svg
deleted file mode 100644
index 69c76c5..000
--- a/assets/static/images/index.svg
+++ /dev/null
@@ -1 +0,0 @@
-http://www.w3.org/2000/svg; viewBox="0 0 
318 180" preserveAspectRatio="none">#holder_1607dc07957 text { 
fill:rgba(255,255,255,.75);font-weight:normal;font-family:Helvetica, 
monospace;font-size:16pt } Image 
cap
\ No newline at end of file
diff --git a/assets/static/images/onion-bg.png 
b/assets/static/images/onion-bg.png
deleted file mode 100755
index c7aee46..000
Binary files a/assets/static/images/onion-bg.png and /dev/null differ
diff --git a/assets/static/images/onion-bg.svg 
b/assets/static/images/onion-bg.svg
deleted file mode 100644
index 4d7eefd..000
--- a/assets/static/images/onion-bg.svg

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

2019-12-05 Thread translation

commit 661d944c83b4b81caf769d74d6437db2e60476af
Author: Translation commit bot 
Date:   Thu Dec 5 10:50:11 2019 +

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

diff --git a/contents+ar.po b/contents+ar.po
index 3dc31321c6..dcd7f91393 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -875,8 +875,8 @@ msgid ""
 "Most [Pluggable Transports](/circumvention), such as obfs4, rely on the use "
 "of âbridgeâ relays."
 msgstr ""
-"ÙØ¹Ø¸Ù [Ø§ÙÙÙØ§ÙÙ Ø§ÙÙÙØµÙÙØ©](/ar/circumvention/)Ø ÙØ«Ù 
obfs4Ø ØªØ¹ØªÙØ¯ Ø¹ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù "
-"ØªÙØ§ÙØ¨ Ø§Ù\"Ø¬Ø³Ø±\". "
+"ÙØ¹Ø¸Ù [Ø§ÙÙÙØ§ÙÙ Ø§ÙÙÙØµÙÙØ©](/circumvention)Ø ÙØ«Ù obfs4Ø 
ØªØ¹ØªÙØ¯ Ø¹ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù ØªÙØ§ÙØ¨ "
+"Ø§Ù\"Ø¬Ø³Ø±\". "
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -1795,6 +1795,9 @@ msgid ""
 "censoring connections to the Tor network. Read the "
 "[Circumvention](/circumvention) section for possible solutions."
 msgstr ""
+"Ø¥Ø°Ø§ ÙØ§ Ø²Ø§Ù Ø§ØªØµØ§ÙÙÙ ØºÙØ± ÙÙÙÙØ ÙØ¯ ÙÙÙÙ ÙØ²ÙÙØ¯ 
Ø®Ø¯ÙØ© Ø§ÙØ§ÙØªØ±ÙØª ÙØ¯ÙÙÙ ÙÙØ±Ø¶ Ø§ÙØ±ÙÙØ§Ø¨Ø©"
+" Ø¹ÙÙ Ø§ØªØµØ§ÙØ§ØªÙÙ Ø¨Ø´Ø¨ÙØ© ØªÙØ±. Ø§ÙØ±Ø¤ÙØ§ ÙØ³Ù 
(circumvention/)[ØªØ¬Ø§ÙØ² Ø§ÙØØ¬Ø¨] ÙØ¨Ø¹Ø¶ "
+"Ø§ÙØÙÙÙ Ø§ÙÙØØªÙÙØ©. "
 
 #: https//tb-manual.torproject.org/troubleshooting/
 #: (content/troubleshooting/contents+en.lrtopic.body)
@@ -1808,21 +1811,24 @@ msgid ""
 "but not yet fixed. Please check the [Known Issues](/known-issues) page to "
 "see if the problem you are experiencing is already listed there."
 msgstr ""
+"ÙØ®Ø¶Ø¹ ÙØªØµÙÙØ ØªÙØ± ÙÙØªØ·ÙÙØ± Ø¨Ø´ÙÙ ÙØ³ØªÙØ±Ø ÙÙØ¯ 
ØªÙÙÙ Ø¨Ø¹Ø¶ Ø§ÙÙØ¶Ø§ÙØ§ ÙØ¹Ø±ÙÙØ© ÙÙÙ ÙÙ ÙØªÙ "
+"Ø£ØµÙØ§ØÙØ§ Ø¨Ø¹Ø¯. ÙØ±Ø¬Ù ÙØ±Ø§Ø¬Ø¹Ø© ØµÙØØ© 
(/known-issues)[Ø§ÙÙØ¶Ø§ÙØ§ Ø§ÙÙØ¹Ø±ÙÙØ©] ÙÙØªØ£ÙÙØ¯ ÙÙÙØ§"
+" Ø¥Ø°Ø§ ÙØ§ÙØª Ø§ÙÙØ´ÙÙØ© Ø§ÙØªÙ ØªÙØ§Ø¬ÙÙÙÙØ§ ÙØ¯Ø±Ø¬Ø© 
ÙÙØ§Ù. "
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.title)
 msgid "PLUGINS, ADD-ONS AND JAVASCRIPT"
-msgstr "Ø§ÙØ¥Ø¶Ø§ÙØ§Øª ÙØ§ÙÙÙØÙØ§Øª ÙØ¬Ø§ÙØ§ Ø³ÙØ±Ø¨Øª"
+msgstr "Ø§ÙØ¥Ø¶Ø§ÙØ§Øª ÙØ§ÙÙÙØÙØ§Øª ÙØ¬Ø§ÙØ§ Ø³ÙØ±ÙØ¨Øª"
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.description)
 msgid "How Tor Browser handles add-ons, plugins and JavaScript"
-msgstr "ÙÙÙ ÙØªØ¹Ø§ÙÙ ÙØªØµÙØ ØªÙØ± ÙØ¹ Ø§ÙØ¥Ø¶Ø§ÙØ§Øª ÙØ§ÙÙ
ÙØÙØ§Øª ÙØ¬Ø§ÙØ§Ø³ÙØ±Ø¨Øª"
+msgstr "ÙÙÙ ÙØªØ¹Ø§ÙÙ ÙØªØµÙØ ØªÙØ± ÙØ¹ Ø§ÙØ¥Ø¶Ø§ÙØ§Øª ÙØ§ÙÙ
ÙØÙØ§Øª ÙØ¬Ø§ÙØ§ Ø³ÙØ±ÙØ¨Øª"
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
 msgid "### FLASH PLAYER"
-msgstr ""
+msgstr "### FLASH PLAYER"
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -1853,7 +1859,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
 msgid "### JAVASCRIPT"
-msgstr ""
+msgstr "### Ø¬Ø§ÙØ§ Ø³ÙØ±ÙØ¨Øª "
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -1863,9 +1869,9 @@ msgid ""
 "Unfortunately, JavaScript can also enable attacks on the security of the "
 "browser, which might lead to deanonymization."
 msgstr ""
-"Ø¬Ø§ÙØ§Ø³ÙØ±Ø¨Øª ÙÙ ÙØºØ© Ø¨Ø±ÙØ¬Ø© ØªØ³ØªØ®Ø¯ÙÙØ§ ÙÙØ§ÙØ¹ 
Ø§ÙÙØ¨ ÙØªÙÙÙØ± Ø¹ÙØ§ØµØ± ØªÙØ§Ø¹ÙÙØ© ÙØ«Ù Ø§ÙÚ¤Ø¯ÙÙ "
-"ÙØ§ÙØµÙØª ÙØ§ÙØªØØ±ÙÙ ÙØ§ÙØ®Ø· Ø§ÙØ²ÙÙÙ. ÙÙØ£Ø³Ù 
Ø¬Ø§ÙØ§Ø³ÙØ±Ø¨Øª ÙÙÙÙ Ø£Ù ØªÙØ¹Ù Ø£ÙØ¶Ø§ Ø¨Ø¹Ø¶ ÙØ³Ø§Ø¦Ù "
-"Ø§ÙÙØ¬ÙÙ Ø¹ÙÙ Ø§ØØªÙØ§Ø·Ø§Øª Ø§ÙØ£ÙØ§Ù ÙÙ Ø§ÙÙØªØµÙØØ 
ÙÙÙ ÙØ§ ÙØ¯ ÙØ¤Ø¯Ù Ø¥ÙÙ ÙØ´Ù Ø§ÙÙÙÙØ©."
+"Ø¬Ø§ÙØ§ Ø³ÙØ±ÙØ¨Øª ÙÙ ÙØºØ© Ø¨Ø±ÙØ¬Ø© ØªØ³ØªØ®Ø¯ÙÙØ§ ÙÙØ§ÙØ¹ 
Ø§ÙÙØ¨ ÙØªÙÙÙØ± Ø¹ÙØ§ØµØ± ØªÙØ§Ø¹ÙÙØ© ÙØ«Ù Ø§ÙÚ¤Ø¯ÙÙ"
+" ÙØ§ÙØµÙØª ÙØ§ÙØªØØ±ÙÙ ÙØ§ÙØ®Ø· Ø§ÙØ²ÙÙÙ. ÙÙØ£Ø³Ù ÙÙÙÙ 
ÙØ°ÙÙ ÙØ¬Ø§ÙØ§ Ø³ÙØ±ÙØ¨Øª Ø£Ù ØªÙÙØ¹ÙÙ Ø¨Ø¹Ø¶ "
+"ÙØ³Ø§Ø¦Ù Ø§ÙÙØ¬ÙÙ Ø¹ÙÙ Ø§ØØªÙØ§Ø·Ø§Øª Ø§ÙØ£ÙØ§Ù ÙÙ Ø§ÙÙ
ØªØµÙØØ ÙÙÙ ÙØ§ ÙØ¯ ÙØ¤Ø¯Ù Ø¥ÙÙ ÙØ´Ù Ø§ÙÙÙÙØ©."
 
 #: https//tb-manual.torproject.org/plugins/
 #: (content/plugins/contents+en.lrtopic.body)
@@ -1876,6 +1882,11 @@ msgid ""
 "control the JavaScript (and other scripts) that runs on individual web "
 "pages, or block it entirely."
 msgstr ""
+"ÙØªØ¶ÙÙÙ ÙØªØµÙÙØ ØªÙØ± Ø¥Ø¶Ø§ÙØ© ØªØ¯Ø¹Ù NoScript. ÙÙÙ Ù
ØªØ§ØØ© Ø¹Ø¨Ø± 'Preferences' Ø£Ù "
+"'Ø§ÙØªÙØ¶ÙÙØ§Øª' ÙÙ Ø§ÙÙØ§Ø¦ÙØ© Ø§ÙØ±ÙØ¦ÙØ³ÙÙØ© (ÙØ§Ø¦ÙØ© 
Ø§ÙÙÙØ¨Ø±Ø¬Ø±)Ø Ø«ÙÙ Ø§ØØªØ§Ø±ÙØ§ 'Customize'"
+"  Ø£Ù 'ØªØ¹Ø¯ÙÙ' ÙØ§Ø³ØØ¨ÙØ§ Ø£ÙÙÙÙØ© \"S\" Ø¥ÙÙ Ø£Ø¹ÙÙ ÙÙ
ÙÙ Ø§ÙØ´Ø¨ÙØ§Ù. Ø³ØªØ³ÙØ NoScrip ÙÙÙ "
+"Ø¨Ø§ÙØªØÙÙÙ ÙÙ Ø¨Ø¹Ø¶ Ø³ÙØ±Ø¨ÙØªØ§Øª Ø¬Ø§ÙØ§ (ÙØºÙØ±ÙØ§ ÙÙ

[tor-commits] [styleguide/master] Add onion pattern

2019-12-05 Thread antonela

commit 770c84d077cc9373d6232279c11d111f2cd2c069
Author: Antonela 
Date:   Wed Dec 4 20:41:18 2019 -0300

Add onion pattern
---
 databags/visuals.ini   |  4 
 templates/visuals.html | 37 +++--
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/databags/visuals.ini b/databags/visuals.ini
index cf79438..b2fad4c 100644
--- a/databags/visuals.ini
+++ b/databags/visuals.ini
@@ -17,3 +17,7 @@ label = Icons
 [Illustrations]
 path = #illustrations
 label = Illustrations
+
+[Pattern]
+path = #pattern
+label = Pattern
diff --git a/templates/visuals.html b/templates/visuals.html
index dc6940a..e0d031c 100644
--- a/templates/visuals.html
+++ b/templates/visuals.html
@@ -50,7 +50,7 @@
   
 
   Apps
-  The main Tor Project color is Purple. Use Dark Purple 
as a secondary option.
+  .
   
   
   blueviolet
@@ -479,6 +479,7 @@

  
 
+
   
  
Illustrations
@@ -500,8 +501,40 @@
  


- 
+ https://torproject.org/static/images/download/svg/get-connected.svg; 
alt="get connected"/>
+   
+
+   
+ Tor Browser Onboarding
+   
+   
+ 
+   
+   
+ 
+   
+   
+ https://torproject.org/static/images/download/svg/get-connected.svg; 
alt="get connected"/>
+   
+   
+ 
+   
+   
+ 
+   
+   
+ https://torproject.org/static/images/download/svg/get-connected.svg; 
alt="get connected"/>

+
+ 
+
+
+  
+ 
+   Onion Pattern
+ 
+ 
+
  
 
 {% endblock %}



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

1 2 >

1 - 100 of 113 matches

Mail list logo