date:20190607

[tor-commits] [stem/master] Support additional test torrc options

2019-06-07 Thread atagar

commit 394852cf08e7eb65904918591b503696bcac86de
Author: Damian Johnson 
Date:   Fri Jun 7 15:42:47 2019 -0700

Support additional test torrc options

Teor would like to run stem's integ tests against a Chutnet network...

  https://trac.torproject.org/projects/tor/ticket/30702

Highly unusual use case, but making it possible. Stem now accepts a
STEM_TEST_CONFIG environment variable that overwrites any internal
testing configuration values (see test/settings.cfg), along with
a 'integ.extra_torrc' option.

So to use this...

1. Write a file that overwrites our integ.extra_torrc
   configuration. Available macros include...

   [DATA_DIR]
   [OR_PORT]
   [SOCKS_PORT]

2. Set STEM_TEST_CONFIG to the path of that file.

3. Run our integ tests, and check the beginning of the output where it says
   'writing torrc' to confirm that the torrc looks as you expect.

For example...

  % cat /home/atagar/Desktop/stem/my_test_config
  integ.extra_torrc
  |Nickname Demo[OR_PORT]
  |FetchUselessDescriptors 1

  % export STEM_TEST_CONFIG=/home/atagar/Desktop/stem/my_test_config

  % ./run_tests.py --integ
  ...

  Setting up a test instance...
making test directory (/home/atagar/Desktop/stem/test/data)... done
configuring logger (/home/atagar/Desktop/stem/test/data/log)... done
writing torrc (/home/atagar/Desktop/stem/test/data/torrc)... done
  # Configuration for stem's integration tests

  DataDirectory /home/atagar/Desktop/stem/test/data
  SocksPort 1112
  ORPort 1113
  ExitRelay 0
  PublishServerDescriptor 0
  AssumeReachable 1
  DownloadExtraInfo 1
  Log notice stdout
  Log debug file /home/atagar/Desktop/stem/test/data/tor_log

  # Torrc options for the RUN_OPEN target

  ControlPort 

  # Torrc options from /home/atagar/Desktop/stem/my_test_config

  Nickname Demo1113
  FetchUselessDescriptors 1
---
 run_tests.py  |  3 +++
 test/runner.py| 36 ++--
 test/settings.cfg | 25 +
 3 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/run_tests.py b/run_tests.py
index ef31a05e..77db73b5 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -187,6 +187,9 @@ def main():
   test_config = stem.util.conf.get_config('test')
   test_config.load(os.path.join(test.STEM_BASE, 'test', 'settings.cfg'))
 
+  if 'STEM_TEST_CONFIG' in os.environ:
+test_config.load(os.environ['STEM_TEST_CONFIG'])
+
   try:
 args = test.arguments.parse(sys.argv[1:])
 test.task.TOR_VERSION.args = (args.tor_path,)
diff --git a/test/runner.py b/test/runner.py
index b7da06a4..c343ed57 100644
--- a/test/runner.py
+++ b/test/runner.py
@@ -52,6 +52,8 @@ import test
 from test.output import println, STATUS, ERROR, SUBSTATUS, NO_NL
 
 CONFIG = stem.util.conf.config_dict('test', {
+  'integ.torrc': '',
+  'integ.extra_torrc': '',
   'integ.test_directory': './test/data',
   'integ.log': './test/data/log',
   'target.torrc': {},
@@ -60,18 +62,6 @@ CONFIG = stem.util.conf.config_dict('test', {
 SOCKS_PORT = 1112
 ORPORT = 1113
 
-BASE_TORRC = """# configuration for stem integration tests
-DataDirectory %%s
-SocksPort %i
-ORPort %i
-ExitRelay 0
-PublishServerDescriptor 0
-AssumeReachable 1
-DownloadExtraInfo 1
-Log notice stdout
-Log debug file %%s/tor_log
-""" % (SOCKS_PORT, ORPORT)
-
 # singleton Runner instance
 INTEG_RUNNER = None
 
@@ -221,22 +211,32 @@ class Runner(object):
 data_dir_path = './%s' % os.path.basename(self._test_dir)
 
   config_csv = CONFIG['target.torrc'].get(config_target)
-  extra_torrc_opts = []
+  target_torrc_opts = []
 
   if config_csv:
 for opt in config_csv.split(','):
   opt = opt.strip()
 
   if opt in Torrc.keys():
-extra_torrc_opts.append(Torrc[opt])
+target_torrc_opts.append(Torrc[opt])
   else:
 raise ValueError("'%s' isn't a test.runner.Torrc enumeration" % 
opt)
 
-  self._custom_opts = extra_torrc_opts
-  self._torrc_contents = BASE_TORRC % (data_dir_path, data_dir_path)
+  self._custom_opts = target_torrc_opts
+
+  self._torrc_contents = CONFIG['integ.torrc']
+
+  if target_torrc_opts:
+self._torrc_contents += '\n\n# Torrc options for the %s target\n\n' % 
config_target
+self._torrc_contents += '\n'.join(target_torrc_opts)
+
+  if CONFIG['integ.extra_torrc']:
+self._torrc_contents += '\n\n# Torrc options from %s\n\n' % 
os.environ['STEM_TEST_CONFIG']
+self._torrc_contents += CONFIG['integ.extra_torrc']
 
-  if extra_torrc_opts:
-self._torrc_contents += '\n'.join(extra_torrc_opts) + '\n'
+  self._torrc_contents = self._torrc_contents.replace('[DATA_DIR]', 
data_dir_path)
+

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

2019-06-07 Thread translation

commit 2b97cdf51aa3a3fcd0daba86617d09ee3daa608f
Author: Translation commit bot 
Date:   Fri Jun 7 22:48:05 2019 +

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

diff --git a/contents+es.po b/contents+es.po
index a70419a7e..96f5c0524 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1,6 +1,5 @@
 # Translators:
 # erinm, 2019
-# eulalio barbero espinosa , 2019
 # Zuhualime Akoochimoya, 2019
 # Antonela D , 2019
 # Emma Peel, 2019
@@ -9,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-05-31 11:30+CET\n"
+"POT-Creation-Date: 2019-06-03 14:04+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
 "Last-Translator: Emma Peel, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n"
@@ -63,11 +62,83 @@ msgstr "Complementos"
 msgid "Becoming a Tor translator"
 msgstr "Traducir Tor"
 
-#: https//tb-manual.torproject.org/about/
-#: (content/about/contents+en.lrtopic.title)
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
 msgid "About Tor Browser"
 msgstr "Sobre el Tor Browser"
 
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Downloading"
+msgstr "Descargando"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Running Tor Browser for the first time"
+msgstr "Ejecutar Tor Browser por primera vez"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Pluggable transports"
+msgstr "Transportes conectables"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Circumvention"
+msgstr "EvasiÃ³n"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Bridges"
+msgstr "Puentes"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Managing identities"
+msgstr "Administrar identidades"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Onion Services"
+msgstr "Servicios cebolla"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Secure Connections"
+msgstr "Conexiones seguras"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Security Settings"
+msgstr "ConfiguraciÃ³n de Seguridad"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Updating"
+msgstr "Actualizar"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Troubleshooting"
+msgstr "ResoluciÃ³n de problemas"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Uninstalling"
+msgstr "Desinstalar"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.description)
+msgid "Known issues"
+msgstr "Problemas conocidos"
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.title)
+msgid "ABOUT TOR BROWSER"
+msgstr "ACERCA DEL NAVEGADOR TOR"
+
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.description)
 msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
@@ -132,8 +203,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
-msgid "# How Tor works"
-msgstr "# CÃ³mo funciona Tor"
+msgid "# HOW TOR WORKS"
+msgstr "# CÃMO FUNCIONA TOR"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -174,8 +245,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.title)
-msgid "Downloading"
-msgstr "Descargando"
+msgid "DOWNLOADING"
+msgstr "DESCARGAR"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.description)
@@ -186,10 +257,10 @@ msgstr "CÃ³mo descargar el Tor Browser"
 #: (content/downloading/contents+en.lrtopic.body)
 msgid ""
 "The safest and simplest way to download Tor Browser is from the official Tor"
-" Project website at https://www.torproject.org.;
+" Project website at https://www.torproject.org/download.;
 msgstr ""
 "La forma mÃ¡s fÃ¡cil y simple de descargar Tor es desde el sitio web oficial "
-"del Proyecto Tor en https://www.torproject.org.;
+"del Proyecto Tor en https://www.torproject.org/download.;
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -220,8 +291,8 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
-msgid "#

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

2019-06-07 Thread translation

commit 42838d3a79554910ee038c1bb8416e985bf4df94
Author: Translation commit bot 
Date:   Fri Jun 7 22:47:55 2019 +

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

diff --git a/contents+es.po b/contents+es.po
index 2e4573536..96f5c0524 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -137,7 +137,7 @@ msgstr "Problemas conocidos"
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
-msgstr ""
+msgstr "ACERCA DEL NAVEGADOR TOR"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.description)
@@ -204,7 +204,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
 msgid "# HOW TOR WORKS"
-msgstr ""
+msgstr "# CÃMO FUNCIONA TOR"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -246,7 +246,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.title)
 msgid "DOWNLOADING"
-msgstr ""
+msgstr "DESCARGAR"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.description)
@@ -292,7 +292,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "# MIRRORS"
-msgstr ""
+msgstr "# ESPEJOS"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -310,7 +310,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "# GETTOR"
-msgstr ""
+msgstr "# GETTOR"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -326,7 +326,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "## TO USE GETTOR VIA EMAIL:"
-msgstr ""
+msgstr "# USAR GETTOR VÃA CORREO ELECTRÃNICO:"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -359,7 +359,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "## TO USE GETTOR VIA TWITTER:"
-msgstr ""
+msgstr "# USAR GETTOR VÃA TWITTER:"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -375,7 +375,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "## TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):"
-msgstr ""
+msgstr "# USAR GETTOR VÃA JABBER/XMPP (JITSI, COYIM, ETC.):"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -389,7 +389,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.title)
 msgid "RUNNING TOR BROWSER FOR THE FIRST TIME"
-msgstr ""
+msgstr "Corriendo el Navegador Tor por primera vez"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.description)
@@ -410,7 +410,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
 msgid "# CONNECT"
-msgstr ""
+msgstr "# CONECTAR"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -439,7 +439,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
 msgid "# CONFIGURE"
-msgstr ""
+msgstr "# CONFIGURAR"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -504,7 +504,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.title)
 msgid "BRIDGES"
-msgstr ""
+msgstr "PUENTES"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.description)
@@ -546,7 +546,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid "# GETTING BRIDGE ADDRESSES"
-msgstr ""
+msgstr "# OBTENIENDO DIRECCIONES DE PUENTES"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -574,7 +574,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid "# ENTERING BRIDGE ADDRESSES"
-msgstr ""
+msgstr "# INTRODUCIENDO DIRECCIONES DE PUENTE"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -640,7 +640,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #:

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2019-06-07 Thread translation

commit 19b3ba0c98be8a674ce737b70ff3b00837d4fc16
Author: Translation commit bot 
Date:   Fri Jun 7 18:15:59 2019 +

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

diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd
index 9ce0a377e..5894d6688 100644
--- a/nl/https-everywhere.dtd
+++ b/nl/https-everywhere.dtd
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2019-06-07 Thread translation

commit 96d6df6593490c207d12a4bf01987eb5148a7427
Author: Translation commit bot 
Date:   Fri Jun 7 18:16:07 2019 +

Update translations for https_everywhere_completed
---
 nl/https-everywhere.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nl/https-everywhere.dtd b/nl/https-everywhere.dtd
index d3da676a0..5894d6688 100644
--- a/nl/https-everywhere.dtd
+++ b/nl/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 

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

[tor-commits] [bridgedb/develop] Merge branch 'fix/28496' into develop

2019-06-07 Thread phw

commit 7a42b973828dcab95a8d952ac0d549f2b3e99dea
Merge: e6e02be 688e1ac
Author: Philipp Winter 
Date:   Fri Jun 7 10:11:36 2019 -0700

Merge branch 'fix/28496' into develop

 CHANGELOG   | 9 +
 README.rst  | 7 +++
 bridgedb.conf   | 3 +--
 bridgedb/distributors/https/templates/base.html | 3 +--
 bridgedb/strings.py | 2 +-
 bridgedb/test/test_email_autoresponder.py   | 2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)




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

[tor-commits] [bridgedb/develop] Remove Yahoo from our whitelisted email domains.

2019-06-07 Thread phw

commit 688e1ac015bcfe5a826032e207f9a0f671cd6174
Author: Philipp Winter 
Date:   Thu Jun 6 09:25:07 2019 -0700

Remove Yahoo from our whitelisted email domains.

Yahoo allows you to create up to 500 disposable email addresses, which
BridgeDB interprets as unique:


We could address this issue in BridgeDB but at this point we seem better
off dropping support for Yahoo because the provider likely also fell
behind in Sybil protection.

This fixes bug 28496: 
---
 CHANGELOG   | 9 +
 README.rst  | 7 +++
 bridgedb.conf   | 3 +--
 bridgedb/distributors/https/templates/base.html | 3 +--
 bridgedb/strings.py | 2 +-
 bridgedb/test/test_email_autoresponder.py   | 2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f45f56f..dd460ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,14 @@
 Changes in version 0.6.X - -MM-DD
 
+* FIXES #28496 https://bugs.torproject.org/28496
+Remove Yahoo from the list of allowed email domains.  Yahoo allows you
+to create up to 500 disposable email addresses, which BridgeDB
+interprets as unique:
+https://bugs.torproject.org/28496#comment:8
+We could address this issue in BridgeDB but at this point we seem 
better
+off dropping support for Yahoo because the provider likely also fell
+behind in Sybil protection.
+
 * FIXES #28655 https://bugs.torproject.org/28655
 When a bridge supports an active probing-resistant transport, it should
 not give out flavors that are vulnerable to active probing.  For
diff --git a/README.rst b/README.rst
index feb5227..ea4bc7c 100644
--- a/README.rst
+++ b/README.rst
@@ -401,10 +401,9 @@ Accessing the Email User Interface
 --
 
 Any mail sent to the ``EMAIL_PORT`` with a destination username as defined by
-the ``EMAIL_USERNAME`` configuration option (the default is ``'bridge'``,
-e.g. bridges@...) and sent from an ``@riseup.net``, ``@gmail.com``, or
-``@yahoo.com`` address (by default, but configurable with the
-``EMAIL_DOMAINS`` option).
+the ``EMAIL_USERNAME`` configuration option (the default is ``'bridge'``, e.g.
+bridges@...) and sent from an ``@riseup.net`` or ``@gmail.com`` address (by
+default, but configurable with the ``EMAIL_DOMAINS`` option).
 
 You can email our BridgeDB instance `here `__.
 
diff --git a/bridgedb.conf b/bridgedb.conf
index 73b65b8..900ead1 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -561,7 +561,7 @@ EMAIL_SMTP_PORT = 25
 EMAIL_USERNAME = "bridges"
 
 # Canonical versions of domains that we will reply to.
-EMAIL_DOMAINS = ["gmail.com", "yahoo.com", "riseup.net"]
+EMAIL_DOMAINS = ["gmail.com", "riseup.net"]
 
 # Map from unofficial domain to canonical domain.
 EMAIL_DOMAIN_MAP = {
@@ -582,7 +582,6 @@ EMAIL_DOMAIN_MAP = {
 # Note that unrecognized options are ignored; be sure to spell them right!
 EMAIL_DOMAIN_RULES = {
 'gmail.com': ["ignore_dots", "dkim"],
-'yahoo.com': ["dkim"],
 'riseup.net': ["ignore_dots", "dkim"],
 }
 
diff --git a/bridgedb/distributors/https/templates/base.html 
b/bridgedb/distributors/https/templates/base.html
index 93eb2b5..d7b6045 100644
--- a/bridgedb/distributors/https/templates/base.html
+++ b/bridgedb/distributors/https/templates/base.html
@@ -60,8 +60,7 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)}
   ${_(strings.OTHER_DISTRIBUTORS[1]) % \
  ("""mailto:brid...@torproject.org;>brid...@torproject.org""",
   """https://riseup.net/;>Riseup""",
-  """https://mail.google.com/;>Gmail""",
-  """https://mail.yahoo.com/;>Yahoo""")}
+  """https://mail.google.com/;>Gmail""")}
 
 
 ${_(strings.HELP[0])}
diff --git a/bridgedb/strings.py b/bridgedb/strings.py
index 49bb933..569f339 100644
--- a/bridgedb/strings.py
+++ b/bridgedb/strings.py
@@ -108,7 +108,7 @@ OTHER_DISTRIBUTORS = {
 1: _("""\
 Another way to get bridges is to send an email to %s. Please note that you must
 send the email using an address from one of the following email providers:
-%s, %s or %s."""),
+%s or %s."""),
 }
 
 HELP = {
diff --git a/bridgedb/test/test_email_autoresponder.py 
b/bridgedb/test/test_email_autoresponder.py
index a1e376f..f59e5ef 100644
--- a/bridgedb/test/test_email_autoresponder.py
+++ b/bridgedb/test/test_email_autoresponder.py
@@ -520,7 +520,7 @@ class SMTPAutoresponderTests(unittest.TestCase):
 reported being from an email address at one supported domain and the
 email's 'From:' header reported another domain.
 """
-smtpFrom = 'not.an.evil@yahoo.com'
+smtpFrom =

[tor-commits] [bridgedb/develop] Bump version number to 0.7.1.

2019-06-07 Thread phw

commit 6e7523ba4932cef7a442bdee18d2a6437fdec50d
Author: Philipp Winter 
Date:   Fri Jun 7 10:23:17 2019 -0700

Bump version number to 0.7.1.
---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index ed7d213..1ebd47e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Changes in version 0.7.1 - -MM-DD
+Changes in version 0.7.1 - 2019-06-07
 
 * FIXES #28496 https://bugs.torproject.org/28496
 Remove Yahoo from the list of allowed email domains.  Yahoo allows you



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

[tor-commits] [bridgedb/develop] Merge branch 'release-0.7.1'

2019-06-07 Thread phw

commit 2d86ae0c232a0390bbd891d42e9722a10589fd0e
Merge: a0644df 6e7523b
Author: Philipp Winter 
Date:   Fri Jun 7 10:23:40 2019 -0700

Merge branch 'release-0.7.1'

 CHANGELOG   | 13 -
 README.rst  |  7 +++
 bridgedb.conf   |  3 +--
 bridgedb/distributors/https/templates/base.html |  3 +--
 bridgedb/strings.py |  2 +-
 bridgedb/test/test_email_autoresponder.py   |  2 +-
 6 files changed, 19 insertions(+), 11 deletions(-)



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

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2019-06-07 Thread phw

commit db2aaadcf22edc3485deeb91fbb5931e9c53c593
Merge: 589d6f7 2d86ae0
Author: Philipp Winter 
Date:   Fri Jun 7 10:38:10 2019 -0700

Merge branch 'master' into develop

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

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

[tor-commits] [bridgedb/develop] Fix CHANGELOG.

2019-06-07 Thread phw

commit 589d6f7ce64a4a3d554ff6fe160655a2e56d35e7
Author: Philipp Winter 
Date:   Fri Jun 7 10:12:59 2019 -0700

Fix CHANGELOG.
---
 CHANGELOG | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 49b95dc..ed7d213 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Changes in version 0.6.X - -MM-DD
+Changes in version 0.7.1 - -MM-DD
 
 * FIXES #28496 https://bugs.torproject.org/28496
 Remove Yahoo from the list of allowed email domains.  Yahoo allows you
@@ -9,6 +9,8 @@ Changes in version 0.6.X - -MM-DD
 off dropping support for Yahoo because the provider likely also fell
 behind in Sybil protection.
 
+Changes in version 0.7.0 - 2019-06-07
+
 * FIXES #28655 https://bugs.torproject.org/28655
 When a bridge supports an active probing-resistant transport, it should
 not give out flavors that are vulnerable to active probing.  For



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

[tor-commits] [bridgedb/master] Fix CHANGELOG.

2019-06-07 Thread phw

commit 589d6f7ce64a4a3d554ff6fe160655a2e56d35e7
Author: Philipp Winter 
Date:   Fri Jun 7 10:12:59 2019 -0700

Fix CHANGELOG.
---
 CHANGELOG | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 49b95dc..ed7d213 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Changes in version 0.6.X - -MM-DD
+Changes in version 0.7.1 - -MM-DD
 
 * FIXES #28496 https://bugs.torproject.org/28496
 Remove Yahoo from the list of allowed email domains.  Yahoo allows you
@@ -9,6 +9,8 @@ Changes in version 0.6.X - -MM-DD
 off dropping support for Yahoo because the provider likely also fell
 behind in Sybil protection.
 
+Changes in version 0.7.0 - 2019-06-07
+
 * FIXES #28655 https://bugs.torproject.org/28655
 When a bridge supports an active probing-resistant transport, it should
 not give out flavors that are vulnerable to active probing.  For



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

[tor-commits] [bridgedb/master] Merge branch 'release-0.7.1'

2019-06-07 Thread phw

commit 2d86ae0c232a0390bbd891d42e9722a10589fd0e
Merge: a0644df 6e7523b
Author: Philipp Winter 
Date:   Fri Jun 7 10:23:40 2019 -0700

Merge branch 'release-0.7.1'

 CHANGELOG   | 13 -
 README.rst  |  7 +++
 bridgedb.conf   |  3 +--
 bridgedb/distributors/https/templates/base.html |  3 +--
 bridgedb/strings.py |  2 +-
 bridgedb/test/test_email_autoresponder.py   |  2 +-
 6 files changed, 19 insertions(+), 11 deletions(-)

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

[tor-commits] [bridgedb/master] Merge branch 'master' into develop

2019-06-07 Thread phw

commit e6e02be5e8f1f410441c811bf80b52e518bf7c91
Merge: 1747723 a0644df
Author: Philipp Winter 
Date:   Fri Jun 7 09:35:24 2019 -0700

Merge branch 'master' into develop




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

[tor-commits] [bridgedb/master] Bump version number to 0.7.1.

2019-06-07 Thread phw

commit 6e7523ba4932cef7a442bdee18d2a6437fdec50d
Author: Philipp Winter 
Date:   Fri Jun 7 10:23:17 2019 -0700

Bump version number to 0.7.1.
---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index ed7d213..1ebd47e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Changes in version 0.7.1 - -MM-DD
+Changes in version 0.7.1 - 2019-06-07
 
 * FIXES #28496 https://bugs.torproject.org/28496
 Remove Yahoo from the list of allowed email domains.  Yahoo allows you



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

[tor-commits] [bridgedb/master] Remove Yahoo from our whitelisted email domains.

2019-06-07 Thread phw

commit 688e1ac015bcfe5a826032e207f9a0f671cd6174
Author: Philipp Winter 
Date:   Thu Jun 6 09:25:07 2019 -0700

Remove Yahoo from our whitelisted email domains.

Yahoo allows you to create up to 500 disposable email addresses, which
BridgeDB interprets as unique:


We could address this issue in BridgeDB but at this point we seem better
off dropping support for Yahoo because the provider likely also fell
behind in Sybil protection.

This fixes bug 28496: 
---
 CHANGELOG   | 9 +
 README.rst  | 7 +++
 bridgedb.conf   | 3 +--
 bridgedb/distributors/https/templates/base.html | 3 +--
 bridgedb/strings.py | 2 +-
 bridgedb/test/test_email_autoresponder.py   | 2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f45f56f..dd460ab 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,14 @@
 Changes in version 0.6.X - -MM-DD
 
+* FIXES #28496 https://bugs.torproject.org/28496
+Remove Yahoo from the list of allowed email domains.  Yahoo allows you
+to create up to 500 disposable email addresses, which BridgeDB
+interprets as unique:
+https://bugs.torproject.org/28496#comment:8
+We could address this issue in BridgeDB but at this point we seem 
better
+off dropping support for Yahoo because the provider likely also fell
+behind in Sybil protection.
+
 * FIXES #28655 https://bugs.torproject.org/28655
 When a bridge supports an active probing-resistant transport, it should
 not give out flavors that are vulnerable to active probing.  For
diff --git a/README.rst b/README.rst
index feb5227..ea4bc7c 100644
--- a/README.rst
+++ b/README.rst
@@ -401,10 +401,9 @@ Accessing the Email User Interface
 --
 
 Any mail sent to the ``EMAIL_PORT`` with a destination username as defined by
-the ``EMAIL_USERNAME`` configuration option (the default is ``'bridge'``,
-e.g. bridges@...) and sent from an ``@riseup.net``, ``@gmail.com``, or
-``@yahoo.com`` address (by default, but configurable with the
-``EMAIL_DOMAINS`` option).
+the ``EMAIL_USERNAME`` configuration option (the default is ``'bridge'``, e.g.
+bridges@...) and sent from an ``@riseup.net`` or ``@gmail.com`` address (by
+default, but configurable with the ``EMAIL_DOMAINS`` option).
 
 You can email our BridgeDB instance `here `__.
 
diff --git a/bridgedb.conf b/bridgedb.conf
index 73b65b8..900ead1 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -561,7 +561,7 @@ EMAIL_SMTP_PORT = 25
 EMAIL_USERNAME = "bridges"
 
 # Canonical versions of domains that we will reply to.
-EMAIL_DOMAINS = ["gmail.com", "yahoo.com", "riseup.net"]
+EMAIL_DOMAINS = ["gmail.com", "riseup.net"]
 
 # Map from unofficial domain to canonical domain.
 EMAIL_DOMAIN_MAP = {
@@ -582,7 +582,6 @@ EMAIL_DOMAIN_MAP = {
 # Note that unrecognized options are ignored; be sure to spell them right!
 EMAIL_DOMAIN_RULES = {
 'gmail.com': ["ignore_dots", "dkim"],
-'yahoo.com': ["dkim"],
 'riseup.net': ["ignore_dots", "dkim"],
 }
 
diff --git a/bridgedb/distributors/https/templates/base.html 
b/bridgedb/distributors/https/templates/base.html
index 93eb2b5..d7b6045 100644
--- a/bridgedb/distributors/https/templates/base.html
+++ b/bridgedb/distributors/https/templates/base.html
@@ -60,8 +60,7 @@ ${next.body(strings, rtl=rtl, lang=lang, **kwargs)}
   ${_(strings.OTHER_DISTRIBUTORS[1]) % \
  ("""mailto:brid...@torproject.org;>brid...@torproject.org""",
   """https://riseup.net/;>Riseup""",
-  """https://mail.google.com/;>Gmail""",
-  """https://mail.yahoo.com/;>Yahoo""")}
+  """https://mail.google.com/;>Gmail""")}
 
 
 ${_(strings.HELP[0])}
diff --git a/bridgedb/strings.py b/bridgedb/strings.py
index 49bb933..569f339 100644
--- a/bridgedb/strings.py
+++ b/bridgedb/strings.py
@@ -108,7 +108,7 @@ OTHER_DISTRIBUTORS = {
 1: _("""\
 Another way to get bridges is to send an email to %s. Please note that you must
 send the email using an address from one of the following email providers:
-%s, %s or %s."""),
+%s or %s."""),
 }
 
 HELP = {
diff --git a/bridgedb/test/test_email_autoresponder.py 
b/bridgedb/test/test_email_autoresponder.py
index a1e376f..f59e5ef 100644
--- a/bridgedb/test/test_email_autoresponder.py
+++ b/bridgedb/test/test_email_autoresponder.py
@@ -520,7 +520,7 @@ class SMTPAutoresponderTests(unittest.TestCase):
 reported being from an email address at one supported domain and the
 email's 'From:' header reported another domain.
 """
-smtpFrom = 'not.an.evil@yahoo.com'
+smtpFrom =

[tor-commits] [bridgedb/master] Merge branch 'fix/28496' into develop

2019-06-07 Thread phw

commit 7a42b973828dcab95a8d952ac0d549f2b3e99dea
Merge: e6e02be 688e1ac
Author: Philipp Winter 
Date:   Fri Jun 7 10:11:36 2019 -0700

Merge branch 'fix/28496' into develop

 CHANGELOG   | 9 +
 README.rst  | 7 +++
 bridgedb.conf   | 3 +--
 bridgedb/distributors/https/templates/base.html | 3 +--
 bridgedb/strings.py | 2 +-
 bridgedb/test/test_email_autoresponder.py   | 2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)




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

[tor-commits] [bridgedb/master] Merge branch 'fix/30706' into develop

2019-06-07 Thread phw

commit 41162543a936f258abc4903f98ccd2e705f0f47b
Merge: 5b0a9b2 ea009cf
Author: Philipp Winter 
Date:   Fri Jun 7 08:50:18 2019 -0700

Merge branch 'fix/30706' into develop

 CHANGELOG  | 38 ++
 README.rst |  5 +++--
 bridgedb.conf  |  2 +-
 doc/HACKING.md |  4 ++--
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --cc CHANGELOG
index f45f56f,4810a5e..47f8e0b
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,11 -1,41 +1,49 @@@
 +Changes in version 0.6.X - -MM-DD
 +
 +* FIXES #28655 https://bugs.torproject.org/28655
 +When a bridge supports an active probing-resistant transport, it 
should
 +not give out flavors that are vulnerable to active probing.  For
 +example, if a bridge supports obfs4 and obfs3, it should only give out
 +obfs4.
 +
+ Changes in version 0.6.9 - 2018-11-20
+ 
+ * FIXES #23894 https://bugs.torproject.org/23894
+ Really change the contact address, in the correct place this time.
+ 
+ Changes in version 0.6.8 - 2018-11-19
+ 
+ * FIXES #28528 https://bugs.torproject.org/28528
+ Change maintainer info.
+ 
+ * FIXES #23894 https://bugs.torproject.org/23894
+ Change contact email address.
+ 
+ Changes in version 0.6.7 - 2018-05-21
+ 
+ Print fingerprints in hex thank you very much.
+ 
+ Changes in version 0.6.6 - 2018-05-21
+ 
+ * FIXES #26150 https://bugs.torproject.org/26150
+ Hotfix for strange bridges missing address fields.
+ 
+ Changes in version 0.6.5 - 2018-05-04
+ 
+ * FIXES #26023 https://bugs.torproject.org/26023
+ There's few bridges whose ed25519 certificates contain the year 
491869,
+ which the datetime module (called from Stem) believes "out of range". 
So
+ instead we'll parse the descriptors one at a time and catch the errors
+ as we go.
+ 
+ * FIXES #25246 https://bugs.torproject.org/25246
+ Add script for assigning unallocated bridges to another distributor.
+ 
+ Changes in version 0.6.4 - 2018-02-13
+ 
+ * FIXES #24432 https://bugs.torproject.org/24432
+ Add config option to skip loopback addresses in X-Forwarded-For 
parsing.
+ 
  Changes in version 0.6.3 - 2018-01-23
  
  * FIXES #24432 https://bugs.torproject.org/24432



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

[tor-commits] [bridgedb/master] Add two missing CHANGELOG entries.

2019-06-07 Thread phw

commit 1747723642652a934d5635e169f7745bca47127b
Author: Philipp Winter 
Date:   Fri Jun 7 09:05:10 2019 -0700

Add two missing CHANGELOG entries.
---
 CHANGELOG | 9 +
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 47f8e0b..019ec11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,15 @@ Changes in version 0.6.X - -MM-DD
 example, if a bridge supports obfs4 and obfs3, it should only give out
 obfs4.
 
+* FIXES #30706 https://bugs.torproject.org/30706
+Do some simple BridgeDB housekeeping: Add missing CHANGELOG entries, 
add
+Philipp's contact info to the support section, fix a broken Trac URL,
+and turn HTTP link into HTTPS.
+
+* FIXES #30157: https://bugs.torproject.org/30157
+Update BridgeDB translations.  This ticket both adds new translations
+and updates existing ones.
+
 Changes in version 0.6.9 - 2018-11-20
 
 * FIXES #23894 https://bugs.torproject.org/23894



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

[tor-commits] [bridgedb/master] Fix broken Trac URL.

2019-06-07 Thread phw

commit ff67d2a673896b3436207443034880f76eb14002
Author: Philipp Winter 
Date:   Mon May 20 15:11:31 2019 -0700

Fix broken Trac URL.
---
 doc/HACKING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/HACKING.md b/doc/HACKING.md
index 22f9b2b..0be0aee 100644
--- a/doc/HACKING.md
+++ b/doc/HACKING.md
@@ -69,5 +69,5 @@ tagged release at that point, i.e.:
 
 References
 --
-[trac]: 
https://trac.torproject.org/projects/tor/query?status=accepted=assigned=needs_information=needs_review=needs_revision=new=reopened=BridgeDB=1=priority=id=summary=status=type=priority=changetime=34=priority
+[trac]: 
https://trac.torproject.org/projects/tor/query?status=!closed=Circumvention%2FBridgeDB
 [workflow]: http://nvie.com/posts/a-successful-git-branching-model/



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

[tor-commits] [bridgedb/master] Merge branch 'fix/30157' into develop

2019-06-07 Thread phw

commit 5b0a9b2765de21a61c4ad233ad1a2ffa6d9b6da1
Merge: f279fa0 fa6b206
Author: Philipp Winter 
Date:   Fri Jun 7 08:31:51 2019 -0700

Merge branch 'fix/30157' into develop

 bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po| 352 ---
 bridgedb/i18n/az/LC_MESSAGES/bridgedb.po| 333 --
 bridgedb/i18n/be/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po| 349 ---
 bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po| 385 +
 bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po| 350 +++
 bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po| 396 +-
 bridgedb/i18n/da/LC_MESSAGES/bridgedb.po| 378 
 bridgedb/i18n/de/LC_MESSAGES/bridgedb.po| 353 +++
 bridgedb/i18n/el/LC_MESSAGES/bridgedb.po| 367 +---
 bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 338 +++---
 bridgedb/i18n/es/LC_MESSAGES/bridgedb.po| 406 +-
 bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po | 388 +
 bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po | 387 +
 bridgedb/i18n/et/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po| 370 
 bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po| 343 +++---
 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po| 422 +--
 bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po| 381 +
 bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po| 404 ++
 bridgedb/i18n/he/LC_MESSAGES/bridgedb.po| 418 ++-
 bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 385 -
 bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po| 353 +++
 bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/id/LC_MESSAGES/bridgedb.po| 400 +-
 bridgedb/i18n/is/LC_MESSAGES/bridgedb.po| 381 +
 bridgedb/i18n/it/LC_MESSAGES/bridgedb.po| 351 ---
 bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po| 348 ---
 bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po| 418 +++
 bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po| 342 +++---
 bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po| 410 +-
 bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 414 ++-
 bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po| 366 
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po| 356 +++
 bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po | 381 +
 bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po| 382 +
 bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po| 344 +++---
 bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po| 400 +-
 bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 378 
 bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po | 383 +
 bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po| 378 
 bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po| 427 ++--
 bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po| 345 +++---
 bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po| 341 +++---
 bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po| 374 
 bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po| 379 
 bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po| 328 +++--
 bridgedb/i18n/templates/bridgedb.pot| 184 ++--
 bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po| 403 +-
 bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po| 352 +++
 bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po| 385 +
 bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 350 +++
 bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po | 386 +
 bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 415 ++-
 bridgedb/test/test_https_server.py  |   2 +-
 60 files changed, 15292 insertions(+), 6737 deletions(-)



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

[tor-commits] [bridgedb/master] Fix typo.

2019-06-07 Thread phw

commit ab5b09aa78fea5189e9bd4b28a053aa1894f6c28
Author: Philipp Winter 
Date:   Tue May 7 11:21:03 2019 -0700

Fix typo.
---
 bridgedb.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index 7700917..b67a5e8 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -142,7 +142,7 @@ STATUS_FILE = "networkstatus-bridges"
 # we ignore all errors which have anything to do with networkstatus being
 # wrong, out-of-date, or missing.
 #
-# Otherwise, if ``True``, use the networkstatus to determine which bridges
+# Otherwise, if ``False``, use the networkstatus to determine which bridges
 # should be distributed.
 #
 # See https://bugs.torproject.org/9380#comment:39,



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

[tor-commits] [bridgedb/master] Use HTTPS instead of HTTP URL.

2019-06-07 Thread phw

commit 1d20737517fe138b46f5edfb962096b3eb5394d6
Author: Philipp Winter 
Date:   Mon May 20 15:12:03 2019 -0700

Use HTTPS instead of HTTP URL.
---
 doc/HACKING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/HACKING.md b/doc/HACKING.md
index 0be0aee..5c9c4f5 100644
--- a/doc/HACKING.md
+++ b/doc/HACKING.md
@@ -70,4 +70,4 @@ tagged release at that point, i.e.:
 References
 --
 [trac]: 
https://trac.torproject.org/projects/tor/query?status=!closed=Circumvention%2FBridgeDB
-[workflow]: http://nvie.com/posts/a-successful-git-branching-model/
+[workflow]: https://nvie.com/posts/a-successful-git-branching-model/



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

[tor-commits] [bridgedb/master] Merge branch 'release-0.7.0'

2019-06-07 Thread phw

commit a0644df6d2c39537872c6f4e982cb33ce9374dac
Merge: f279fa0 1747723
Author: Philipp Winter 
Date:   Fri Jun 7 09:35:03 2019 -0700

Merge branch 'release-0.7.0'

 CHANGELOG   |  47 +++
 README.rst  |   5 +-
 bridgedb.conf   |   2 +-
 bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po| 352 ---
 bridgedb/i18n/az/LC_MESSAGES/bridgedb.po| 333 --
 bridgedb/i18n/be/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po| 349 ---
 bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po| 385 +
 bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po| 350 +++
 bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po| 396 +-
 bridgedb/i18n/da/LC_MESSAGES/bridgedb.po| 378 
 bridgedb/i18n/de/LC_MESSAGES/bridgedb.po| 353 +++
 bridgedb/i18n/el/LC_MESSAGES/bridgedb.po| 367 +---
 bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 338 +++---
 bridgedb/i18n/es/LC_MESSAGES/bridgedb.po| 406 +-
 bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po | 388 +
 bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po | 387 +
 bridgedb/i18n/et/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po| 370 
 bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po| 343 +++---
 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po| 422 +--
 bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po| 381 +
 bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po| 404 ++
 bridgedb/i18n/he/LC_MESSAGES/bridgedb.po| 418 ++-
 bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 385 -
 bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po| 353 +++
 bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/id/LC_MESSAGES/bridgedb.po| 400 +-
 bridgedb/i18n/is/LC_MESSAGES/bridgedb.po| 381 +
 bridgedb/i18n/it/LC_MESSAGES/bridgedb.po| 351 ---
 bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po| 348 ---
 bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po| 418 +++
 bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po| 342 +++---
 bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po| 410 +-
 bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 414 ++-
 bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po| 366 
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po| 356 +++
 bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po | 381 +
 bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po| 382 +
 bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po| 344 +++---
 bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po| 400 +-
 bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 378 
 bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po | 383 +
 bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po| 378 
 bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po| 427 ++--
 bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po| 345 +++---
 bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po| 341 +++---
 bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po| 374 
 bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po| 379 
 bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po| 328 +++--
 bridgedb/i18n/templates/bridgedb.pot| 184 ++--
 bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po| 403 +-
 bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po| 352 +++
 bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po| 385 +
 bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 350 +++
 bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po | 386 +
 bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 415 ++-
 bridgedb/test/test_https_server.py  |   2 +-
 doc/HACKING.md  |   4 +-
 64 files changed, 15345 insertions(+), 6742 deletions(-)

[tor-commits] [bridgedb/master] Add missing CHANGELOG entries.

2019-06-07 Thread phw

commit ea009cf66238872871857cbf39665a36ff5714a8
Author: Philipp Winter 
Date:   Mon May 20 17:25:15 2019 -0700

Add missing CHANGELOG entries.
---
 CHANGELOG | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9ffeac1..4810a5e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,41 @@
+Changes in version 0.6.9 - 2018-11-20
+
+* FIXES #23894 https://bugs.torproject.org/23894
+Really change the contact address, in the correct place this time.
+
+Changes in version 0.6.8 - 2018-11-19
+
+* FIXES #28528 https://bugs.torproject.org/28528
+Change maintainer info.
+
+* FIXES #23894 https://bugs.torproject.org/23894
+Change contact email address.
+
+Changes in version 0.6.7 - 2018-05-21
+
+Print fingerprints in hex thank you very much.
+
+Changes in version 0.6.6 - 2018-05-21
+
+* FIXES #26150 https://bugs.torproject.org/26150
+Hotfix for strange bridges missing address fields.
+
+Changes in version 0.6.5 - 2018-05-04
+
+* FIXES #26023 https://bugs.torproject.org/26023
+There's few bridges whose ed25519 certificates contain the year 491869,
+which the datetime module (called from Stem) believes "out of range". 
So
+instead we'll parse the descriptors one at a time and catch the errors
+as we go.
+
+* FIXES #25246 https://bugs.torproject.org/25246
+Add script for assigning unallocated bridges to another distributor.
+
+Changes in version 0.6.4 - 2018-02-13
+
+* FIXES #24432 https://bugs.torproject.org/24432
+Add config option to skip loopback addresses in X-Forwarded-For 
parsing.
+
 Changes in version 0.6.3 - 2018-01-23
 
 * FIXES #24432 https://bugs.torproject.org/24432



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

[tor-commits] [bridgedb/master] Add phw to the support options.

2019-06-07 Thread phw

commit ab4e116a395af99c391c87814c41e6f0cc7bdcb9
Author: Philipp Winter 
Date:   Mon May 20 15:24:28 2019 -0700

Add phw to the support options.
---
 README.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index feb5227..9247f6d 100644
--- a/README.rst
+++ b/README.rst
@@ -590,5 +590,6 @@ Contact & Support
 =
 
 Send your questions, patches, and suggestions to
-`the tor-dev mailing list `__
-or `sysrqb `__.
+`the tor-dev mailing list `__,
+`sysrqb `__, or
+`phw `__.



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

[tor-commits] [bridgedb/develop] Merge branch 'master' into develop

2019-06-07 Thread phw

commit e6e02be5e8f1f410441c811bf80b52e518bf7c91
Merge: 1747723 a0644df
Author: Philipp Winter 
Date:   Fri Jun 7 09:35:24 2019 -0700

Merge branch 'master' into develop

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

[tor-commits] [bridgedb/develop] Merge branch 'release-0.7.0'

2019-06-07 Thread phw

commit a0644df6d2c39537872c6f4e982cb33ce9374dac
Merge: f279fa0 1747723
Author: Philipp Winter 
Date:   Fri Jun 7 09:35:03 2019 -0700

Merge branch 'release-0.7.0'

 CHANGELOG   |  47 +++
 README.rst  |   5 +-
 bridgedb.conf   |   2 +-
 bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po| 352 ---
 bridgedb/i18n/az/LC_MESSAGES/bridgedb.po| 333 --
 bridgedb/i18n/be/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po| 349 ---
 bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po| 385 +
 bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po| 350 +++
 bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po| 396 +-
 bridgedb/i18n/da/LC_MESSAGES/bridgedb.po| 378 
 bridgedb/i18n/de/LC_MESSAGES/bridgedb.po| 353 +++
 bridgedb/i18n/el/LC_MESSAGES/bridgedb.po| 367 +---
 bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 338 +++---
 bridgedb/i18n/es/LC_MESSAGES/bridgedb.po| 406 +-
 bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po | 388 +
 bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po | 387 +
 bridgedb/i18n/et/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po| 370 
 bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po| 343 +++---
 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po| 422 +--
 bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po| 381 +
 bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po| 404 ++
 bridgedb/i18n/he/LC_MESSAGES/bridgedb.po| 418 ++-
 bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 385 -
 bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po| 353 +++
 bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/id/LC_MESSAGES/bridgedb.po| 400 +-
 bridgedb/i18n/is/LC_MESSAGES/bridgedb.po| 381 +
 bridgedb/i18n/it/LC_MESSAGES/bridgedb.po| 351 ---
 bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po| 348 ---
 bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po| 418 +++
 bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po| 342 +++---
 bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po| 410 +-
 bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 414 ++-
 bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po| 366 
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po| 356 +++
 bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po | 381 +
 bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po| 382 +
 bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po| 344 +++---
 bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po| 400 +-
 bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 378 
 bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po | 383 +
 bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po| 378 
 bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po| 427 ++--
 bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po| 345 +++---
 bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po| 341 +++---
 bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po| 374 
 bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po| 379 
 bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po| 328 +++--
 bridgedb/i18n/templates/bridgedb.pot| 184 ++--
 bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po| 403 +-
 bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po| 352 +++
 bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po| 385 +
 bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 350 +++
 bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po | 386 +
 bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 415 ++-
 bridgedb/test/test_https_server.py  |   2 +-
 doc/HACKING.md  |   4 +-
 64 files changed, 15345 insertions(+), 6742 deletions(-)

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2019-06-07 Thread translation

commit be4abf975364b278e2044f15a76072437c2610da
Author: Translation commit bot 
Date:   Fri Jun 7 16:46:06 2019 +

Update translations for https_everywhere_completed
---
 es/https-everywhere.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index fffc0dbea..20ed4197d 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 

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

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2019-06-07 Thread translation

commit 2e9b11352b2bfb80ac2528957f09349693897627
Author: Translation commit bot 
Date:   Fri Jun 7 16:45:58 2019 +

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

diff --git a/es/https-everywhere.dtd b/es/https-everywhere.dtd
index 31dae8675..20ed4197d 100644
--- a/es/https-everywhere.dtd
+++ b/es/https-everywhere.dtd
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [bridgedb/develop] Add two missing CHANGELOG entries.

2019-06-07 Thread phw

commit 1747723642652a934d5635e169f7745bca47127b
Author: Philipp Winter 
Date:   Fri Jun 7 09:05:10 2019 -0700

Add two missing CHANGELOG entries.
---
 CHANGELOG | 9 +
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 47f8e0b..019ec11 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,15 @@ Changes in version 0.6.X - -MM-DD
 example, if a bridge supports obfs4 and obfs3, it should only give out
 obfs4.
 
+* FIXES #30706 https://bugs.torproject.org/30706
+Do some simple BridgeDB housekeeping: Add missing CHANGELOG entries, 
add
+Philipp's contact info to the support section, fix a broken Trac URL,
+and turn HTTP link into HTTPS.
+
+* FIXES #30157: https://bugs.torproject.org/30157
+Update BridgeDB translations.  This ticket both adds new translations
+and updates existing ones.
+
 Changes in version 0.6.9 - 2018-11-20
 
 * FIXES #23894 https://bugs.torproject.org/23894

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

[tor-commits] [bridgedb/develop] Fix broken Trac URL.

2019-06-07 Thread phw

commit ff67d2a673896b3436207443034880f76eb14002
Author: Philipp Winter 
Date:   Mon May 20 15:11:31 2019 -0700

Fix broken Trac URL.
---
 doc/HACKING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/HACKING.md b/doc/HACKING.md
index 22f9b2b..0be0aee 100644
--- a/doc/HACKING.md
+++ b/doc/HACKING.md
@@ -69,5 +69,5 @@ tagged release at that point, i.e.:
 
 References
 --
-[trac]: 
https://trac.torproject.org/projects/tor/query?status=accepted=assigned=needs_information=needs_review=needs_revision=new=reopened=BridgeDB=1=priority=id=summary=status=type=priority=changetime=34=priority
+[trac]: 
https://trac.torproject.org/projects/tor/query?status=!closed=Circumvention%2FBridgeDB
 [workflow]: http://nvie.com/posts/a-successful-git-branching-model/



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

[tor-commits] [bridgedb/develop] Merge branch 'fix/30706' into develop

2019-06-07 Thread phw

commit 41162543a936f258abc4903f98ccd2e705f0f47b
Merge: 5b0a9b2 ea009cf
Author: Philipp Winter 
Date:   Fri Jun 7 08:50:18 2019 -0700

Merge branch 'fix/30706' into develop

 CHANGELOG  | 38 ++
 README.rst |  5 +++--
 bridgedb.conf  |  2 +-
 doc/HACKING.md |  4 ++--
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --cc CHANGELOG
index f45f56f,4810a5e..47f8e0b
--- a/CHANGELOG
+++ b/CHANGELOG
@@@ -1,11 -1,41 +1,49 @@@
 +Changes in version 0.6.X - -MM-DD
 +
 +* FIXES #28655 https://bugs.torproject.org/28655
 +When a bridge supports an active probing-resistant transport, it 
should
 +not give out flavors that are vulnerable to active probing.  For
 +example, if a bridge supports obfs4 and obfs3, it should only give out
 +obfs4.
 +
+ Changes in version 0.6.9 - 2018-11-20
+ 
+ * FIXES #23894 https://bugs.torproject.org/23894
+ Really change the contact address, in the correct place this time.
+ 
+ Changes in version 0.6.8 - 2018-11-19
+ 
+ * FIXES #28528 https://bugs.torproject.org/28528
+ Change maintainer info.
+ 
+ * FIXES #23894 https://bugs.torproject.org/23894
+ Change contact email address.
+ 
+ Changes in version 0.6.7 - 2018-05-21
+ 
+ Print fingerprints in hex thank you very much.
+ 
+ Changes in version 0.6.6 - 2018-05-21
+ 
+ * FIXES #26150 https://bugs.torproject.org/26150
+ Hotfix for strange bridges missing address fields.
+ 
+ Changes in version 0.6.5 - 2018-05-04
+ 
+ * FIXES #26023 https://bugs.torproject.org/26023
+ There's few bridges whose ed25519 certificates contain the year 
491869,
+ which the datetime module (called from Stem) believes "out of range". 
So
+ instead we'll parse the descriptors one at a time and catch the errors
+ as we go.
+ 
+ * FIXES #25246 https://bugs.torproject.org/25246
+ Add script for assigning unallocated bridges to another distributor.
+ 
+ Changes in version 0.6.4 - 2018-02-13
+ 
+ * FIXES #24432 https://bugs.torproject.org/24432
+ Add config option to skip loopback addresses in X-Forwarded-For 
parsing.
+ 
  Changes in version 0.6.3 - 2018-01-23
  
  * FIXES #24432 https://bugs.torproject.org/24432

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

[tor-commits] [bridgedb/develop] Add phw to the support options.

2019-06-07 Thread phw

commit ab4e116a395af99c391c87814c41e6f0cc7bdcb9
Author: Philipp Winter 
Date:   Mon May 20 15:24:28 2019 -0700

Add phw to the support options.
---
 README.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index feb5227..9247f6d 100644
--- a/README.rst
+++ b/README.rst
@@ -590,5 +590,6 @@ Contact & Support
 =
 
 Send your questions, patches, and suggestions to
-`the tor-dev mailing list `__
-or `sysrqb `__.
+`the tor-dev mailing list `__,
+`sysrqb `__, or
+`phw `__.



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

[tor-commits] [bridgedb/develop] Add missing CHANGELOG entries.

2019-06-07 Thread phw

commit ea009cf66238872871857cbf39665a36ff5714a8
Author: Philipp Winter 
Date:   Mon May 20 17:25:15 2019 -0700

Add missing CHANGELOG entries.
---
 CHANGELOG | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9ffeac1..4810a5e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,41 @@
+Changes in version 0.6.9 - 2018-11-20
+
+* FIXES #23894 https://bugs.torproject.org/23894
+Really change the contact address, in the correct place this time.
+
+Changes in version 0.6.8 - 2018-11-19
+
+* FIXES #28528 https://bugs.torproject.org/28528
+Change maintainer info.
+
+* FIXES #23894 https://bugs.torproject.org/23894
+Change contact email address.
+
+Changes in version 0.6.7 - 2018-05-21
+
+Print fingerprints in hex thank you very much.
+
+Changes in version 0.6.6 - 2018-05-21
+
+* FIXES #26150 https://bugs.torproject.org/26150
+Hotfix for strange bridges missing address fields.
+
+Changes in version 0.6.5 - 2018-05-04
+
+* FIXES #26023 https://bugs.torproject.org/26023
+There's few bridges whose ed25519 certificates contain the year 491869,
+which the datetime module (called from Stem) believes "out of range". 
So
+instead we'll parse the descriptors one at a time and catch the errors
+as we go.
+
+* FIXES #25246 https://bugs.torproject.org/25246
+Add script for assigning unallocated bridges to another distributor.
+
+Changes in version 0.6.4 - 2018-02-13
+
+* FIXES #24432 https://bugs.torproject.org/24432
+Add config option to skip loopback addresses in X-Forwarded-For 
parsing.
+
 Changes in version 0.6.3 - 2018-01-23
 
 * FIXES #24432 https://bugs.torproject.org/24432



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

[tor-commits] [bridgedb/develop] Use HTTPS instead of HTTP URL.

2019-06-07 Thread phw

commit 1d20737517fe138b46f5edfb962096b3eb5394d6
Author: Philipp Winter 
Date:   Mon May 20 15:12:03 2019 -0700

Use HTTPS instead of HTTP URL.
---
 doc/HACKING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/HACKING.md b/doc/HACKING.md
index 0be0aee..5c9c4f5 100644
--- a/doc/HACKING.md
+++ b/doc/HACKING.md
@@ -70,4 +70,4 @@ tagged release at that point, i.e.:
 References
 --
 [trac]: 
https://trac.torproject.org/projects/tor/query?status=!closed=Circumvention%2FBridgeDB
-[workflow]: http://nvie.com/posts/a-successful-git-branching-model/
+[workflow]: https://nvie.com/posts/a-successful-git-branching-model/



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

[tor-commits] [bridgedb/develop] Fix typo.

2019-06-07 Thread phw

commit ab5b09aa78fea5189e9bd4b28a053aa1894f6c28
Author: Philipp Winter 
Date:   Tue May 7 11:21:03 2019 -0700

Fix typo.
---
 bridgedb.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridgedb.conf b/bridgedb.conf
index 7700917..b67a5e8 100644
--- a/bridgedb.conf
+++ b/bridgedb.conf
@@ -142,7 +142,7 @@ STATUS_FILE = "networkstatus-bridges"
 # we ignore all errors which have anything to do with networkstatus being
 # wrong, out-of-date, or missing.
 #
-# Otherwise, if ``True``, use the networkstatus to determine which bridges
+# Otherwise, if ``False``, use the networkstatus to determine which bridges
 # should be distributed.
 #
 # See https://bugs.torproject.org/9380#comment:39,



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

[tor-commits] [bridgedb/develop] Merge branch 'fix/30157' into develop

2019-06-07 Thread phw

commit 5b0a9b2765de21a61c4ad233ad1a2ffa6d9b6da1
Merge: f279fa0 fa6b206
Author: Philipp Winter 
Date:   Fri Jun 7 08:31:51 2019 -0700

Merge branch 'fix/30157' into develop

 bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po| 352 ---
 bridgedb/i18n/az/LC_MESSAGES/bridgedb.po| 333 --
 bridgedb/i18n/be/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po| 349 ---
 bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po| 385 +
 bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po| 350 +++
 bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po| 396 +-
 bridgedb/i18n/da/LC_MESSAGES/bridgedb.po| 378 
 bridgedb/i18n/de/LC_MESSAGES/bridgedb.po| 353 +++
 bridgedb/i18n/el/LC_MESSAGES/bridgedb.po| 367 +---
 bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 338 +++---
 bridgedb/i18n/es/LC_MESSAGES/bridgedb.po| 406 +-
 bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po | 388 +
 bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po | 387 +
 bridgedb/i18n/et/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po| 370 
 bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po| 343 +++---
 bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po| 422 +--
 bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po| 381 +
 bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po| 404 ++
 bridgedb/i18n/he/LC_MESSAGES/bridgedb.po| 418 ++-
 bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/hr_HR/LC_MESSAGES/bridgedb.po | 385 -
 bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po| 353 +++
 bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/id/LC_MESSAGES/bridgedb.po| 400 +-
 bridgedb/i18n/is/LC_MESSAGES/bridgedb.po| 381 +
 bridgedb/i18n/it/LC_MESSAGES/bridgedb.po| 351 ---
 bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po| 348 ---
 bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po| 383 +
 bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po| 418 +++
 bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po| 342 +++---
 bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po| 410 +-
 bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 414 ++-
 bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po| 366 
 bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po| 356 +++
 bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po | 381 +
 bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po| 382 +
 bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po| 344 +++---
 bridgedb/i18n/pt/LC_MESSAGES/bridgedb.po| 400 +-
 bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 378 
 bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po | 383 +
 bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po| 378 
 bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po| 427 ++--
 bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po| 345 +++---
 bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po| 384 +
 bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po| 341 +++---
 bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po| 374 
 bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po| 379 
 bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po| 328 +++--
 bridgedb/i18n/templates/bridgedb.pot| 184 ++--
 bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po| 403 +-
 bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po| 352 +++
 bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po| 385 +
 bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 350 +++
 bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po | 386 +
 bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 415 ++-
 bridgedb/test/test_https_server.py  |   2 +-
 60 files changed, 15292 insertions(+), 6737 deletions(-)

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

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2019-06-07 Thread translation

commit acd87a23680abc1bc6fbe9a30de125b76d26b787
Author: Translation commit bot 
Date:   Fri Jun 7 15:16:04 2019 +

Update translations for https_everywhere_completed
---
 ru/https-everywhere.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index 0ddba212d..747ebc2de 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 

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

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2019-06-07 Thread translation

commit 9e3c86fc58b5e2e4915cdd0698940b7b341b56f6
Author: Translation commit bot 
Date:   Fri Jun 7 15:15:56 2019 +

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

diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd
index c3a6e0c57..747ebc2de 100644
--- a/ru/https-everywhere.dtd
+++ b/ru/https-everywhere.dtd
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2019-06-07 Thread translation

commit fef72fb56234acb00a0c562626195236d87aaf8b
Author: Translation commit bot 
Date:   Fri Jun 7 14:46:07 2019 +

Update translations for https_everywhere_completed
---
 eo/https-everywhere.dtd | 1 +
 fr/https-everywhere.dtd | 1 +
 2 files changed, 2 insertions(+)

diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd
index 9f47a737e..3f74d61d2 100644
--- a/eo/https-everywhere.dtd
+++ b/eo/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 
diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd
index 35d6c00e2..0ffa19129 100644
--- a/fr/https-everywhere.dtd
+++ b/fr/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 

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

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2019-06-07 Thread translation

commit 4207ec381bba7328a0e02fb3b6ea451179ac1eb6
Author: Translation commit bot 
Date:   Fri Jun 7 14:45:59 2019 +

Update translations for https_everywhere
---
 eo/https-everywhere.dtd | 2 +-
 fr/https-everywhere.dtd | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd
index bcbe44ee2..3f74d61d2 100644
--- a/eo/https-everywhere.dtd
+++ b/eo/https-everywhere.dtd
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 
diff --git a/fr/https-everywhere.dtd b/fr/https-everywhere.dtd
index cf752f05b..0ffa19129 100644
--- a/fr/https-everywhere.dtd
+++ b/fr/https-everywhere.dtd
@@ -35,7 +35,7 @@
 
 
 
-
+
 
 
 

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

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2019-06-07 Thread translation

commit 01f51de7e654a06ef4070dfbd9c305c614d8ca00
Author: Translation commit bot 
Date:   Fri Jun 7 14:16:53 2019 +

Update translations for https_everywhere_completed
---
 templates/https-everywhere.dtd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/https-everywhere.dtd b/templates/https-everywhere.dtd
index eb5853a0f..70b9a1013 100644
--- a/templates/https-everywhere.dtd
+++ b/templates/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 

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

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2019-06-07 Thread translation

commit 402c73a3ddca63079fb1991493527c69df438162
Author: Translation commit bot 
Date:   Fri Jun 7 14:16:45 2019 +

Update translations for https_everywhere
---
 ach/https-everywhere.dtd   | 1 +
 af/https-everywhere.dtd| 1 +
 ar/https-everywhere.dtd| 1 +
 ast/https-everywhere.dtd   | 1 +
 az/https-everywhere.dtd| 1 +
 be/https-everywhere.dtd| 1 +
 bg/https-everywhere.dtd| 1 +
 bn/https-everywhere.dtd| 1 +
 br/https-everywhere.dtd| 1 +
 bs/https-everywhere.dtd| 1 +
 ca/https-everywhere.dtd| 1 +
 cs/https-everywhere.dtd| 1 +
 cy/https-everywhere.dtd| 1 +
 da/https-everywhere.dtd| 1 +
 de/https-everywhere.dtd| 1 +
 el/https-everywhere.dtd| 1 +
 en_GB/https-everywhere.dtd | 1 +
 eo/https-everywhere.dtd| 1 +
 es/https-everywhere.dtd| 1 +
 es_AR/https-everywhere.dtd | 1 +
 es_MX/https-everywhere.dtd | 1 +
 et/https-everywhere.dtd| 1 +
 eu/https-everywhere.dtd| 1 +
 fa/https-everywhere.dtd| 1 +
 fi/https-everywhere.dtd| 1 +
 fr/https-everywhere.dtd| 1 +
 fy/https-everywhere.dtd| 1 +
 ga/https-everywhere.dtd| 1 +
 gd/https-everywhere.dtd| 1 +
 gl/https-everywhere.dtd| 1 +
 gu/https-everywhere.dtd| 1 +
 he/https-everywhere.dtd| 1 +
 hi/https-everywhere.dtd| 1 +
 hr/https-everywhere.dtd| 1 +
 hu/https-everywhere.dtd| 1 +
 hy/https-everywhere.dtd| 1 +
 id/https-everywhere.dtd| 1 +
 is/https-everywhere.dtd| 1 +
 it/https-everywhere.dtd| 1 +
 ja/https-everywhere.dtd| 1 +
 ka/https-everywhere.dtd| 1 +
 kk/https-everywhere.dtd| 1 +
 km/https-everywhere.dtd| 1 +
 kn/https-everywhere.dtd| 1 +
 ko/https-everywhere.dtd| 1 +
 lt/https-everywhere.dtd| 1 +
 lv/https-everywhere.dtd| 1 +
 mk/https-everywhere.dtd| 1 +
 ml/https-everywhere.dtd| 1 +
 mr/https-everywhere.dtd| 1 +
 ms_MY/https-everywhere.dtd | 1 +
 my/https-everywhere.dtd| 1 +
 nb/https-everywhere.dtd| 1 +
 ne/https-everywhere.dtd| 1 +
 nl/https-everywhere.dtd| 1 +
 nl_BE/https-everywhere.dtd | 1 +
 nn/https-everywhere.dtd| 1 +
 oc/https-everywhere.dtd| 1 +
 or/https-everywhere.dtd| 1 +
 pa/https-everywhere.dtd| 3 ++-
 pl/https-everywhere.dtd| 1 +
 pt_BR/https-everywhere.dtd | 1 +
 pt_PT/https-everywhere.dtd | 1 +
 ro/https-everywhere.dtd| 1 +
 ru/https-everywhere.dtd| 1 +
 si_LK/https-everywhere.dtd | 1 +
 sk/https-everywhere.dtd| 1 +
 sl/https-everywhere.dtd| 1 +
 son/https-everywhere.dtd   | 1 +
 sq/https-everywhere.dtd| 1 +
 sr/https-everywhere.dtd| 1 +
 sv/https-everywhere.dtd| 1 +
 sw/https-everywhere.dtd| 1 +
 ta/https-everywhere.dtd| 1 +
 te/https-everywhere.dtd| 1 +
 templates/https-everywhere.dtd | 1 +
 th/https-everywhere.dtd| 1 +
 tr/https-everywhere.dtd| 1 +
 uk/https-everywhere.dtd| 1 +
 ur/https-everywhere.dtd| 1 +
 uz/https-everywhere.dtd| 1 +
 vi/https-everywhere.dtd| 1 +
 zh_CN/https-everywhere.dtd | 1 +
 zh_HK/https-everywhere.dtd | 1 +
 zh_TW/https-everywhere.dtd | 1 +
 85 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/ach/https-everywhere.dtd b/ach/https-everywhere.dtd
index eb5853a0f..70b9a1013 100644
--- a/ach/https-everywhere.dtd
+++ b/ach/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 
diff --git a/af/https-everywhere.dtd b/af/https-everywhere.dtd
index 2dcc8be6b..7ef982809 100644
--- a/af/https-everywhere.dtd
+++ b/af/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 
diff --git a/ar/https-everywhere.dtd b/ar/https-everywhere.dtd
index cc7c3cc1c..df515e7be 100644
--- a/ar/https-everywhere.dtd
+++ b/ar/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 
diff --git a/ast/https-everywhere.dtd b/ast/https-everywhere.dtd
index 078b87947..ab119b46f 100644
--- a/ast/https-everywhere.dtd
+++ b/ast/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 
diff --git a/az/https-everywhere.dtd b/az/https-everywhere.dtd
index 08a2976a2..2ae9a6517 100644
--- a/az/https-everywhere.dtd
+++ b/az/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 
diff --git a/be/https-everywhere.dtd b/be/https-everywhere.dtd
index 8499d6005..e095575ab 100644
--- a/be/https-everywhere.dtd
+++ b/be/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 
diff --git a/bg/https-everywhere.dtd b/bg/https-everywhere.dtd
index 089b7151b..894e5d542 100644
--- a/bg/https-everywhere.dtd
+++ b/bg/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 
diff --git a/bn/https-everywhere.dtd b/bn/https-everywhere.dtd
index 947299c3c..aff4599db 100644
--- a/bn/https-everywhere.dtd
+++ b/bn/https-everywhere.dtd
@@ -35,6 +35,7 @@
 
 
 
+
 
 
 
diff --git

[tor-commits] [community/master] fix image location

2019-06-07 Thread pili

commit 4f556bd7a8e800957b8e7be29ea2f180014b463e
Author: Pili Guerra 
Date:   Fri Jun 7 15:46:52 2019 +0200

fix image location
---
 content/onion-services/overview/contents.lr | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/content/onion-services/overview/contents.lr 
b/content/onion-services/overview/contents.lr
index 4924c44..1974a0b 100644
--- a/content/onion-services/overview/contents.lr
+++ b/content/onion-services/overview/contents.lr
@@ -51,7 +51,7 @@ The general concept behind the onion service protocol is that 
we use the Tor net
 
 ### Act 1: Where the onion service sets up its introduction points
 
-![Onion Services: Step 
1](/static/images/onion-services/tor-onion-services-1.png)
+![Onion Services: Step 
1](/static/images/onion-services/overview/tor-onion-services-1.png)
 
 As the first step in the protocol, Bob (the onion service) contacts a bunch of 
Tor relays and asks them to act as his _introduction points_, by establishing 
long-term circuits to them. These circuits are anonymized circuits, so Bob does 
not reveal his locations to his introduction points.
 
@@ -59,7 +59,7 @@ As part of this step, Bob gives its introduction point a 
special "authentication
 
 ### Act 2: Where the onion service publishes its descriptors
 
-![Onion Services: Step 
2](/static/images/onion-services/tor-onion-services-2.png)
+![Onion Services: Step 
2](/static/images/onion-services/overview/tor-onion-services-2.png)
 
 Now that the introduction points are setup, we need to create a way for 
clients to be able to find them.
 
@@ -71,7 +71,7 @@ Now, Bob uploads that signed descriptor to a _distributed 
hash table_ which is p
 
 All the previous steps were just setup for the onion service so that it's 
reachable by clients. Now let's fast-forward to the point where an actual 
client wants to visit the service:
 
-![Onion Services: Step 
3](/static/images/onion-services/tor-onion-services-3.png)
+![Onion Services: Step 
3](/static/images/onion-services/overview/tor-onion-services-3.png)
 
 In this case, Alice (the client) has the onion address of Bob and she wants to 
visit it, so she connects to it with her Tor Browser. Now the next thing that 
needs to happen is that Alice goes to the _distributed hash table_ from the 
step above, and ask for the signed descriptor of Bob.
 
@@ -83,13 +83,13 @@ Now before the introduction takes place, Alice picks a Tor 
relay and establishes
 
 ### Act 5: Where the client introduces itself to the onion service
 
-![Onion Services: Step 
4](/static/images/onion-services/tor-onion-services-4.png)
+![Onion Services: Step 
4](/static/images/onion-services/overview/tor-onion-services-4.png)
 
 Now, Alice goes ahead and connects to one of Bob's introduction points and 
introduces herself to Bob. Through this introduction Bob learns Alice's choice 
of rendezvous point and the "one-time secret".
 
 ### Act 6: Where the onion service rendezvous with the client
 
-![Onion Services: Step 
5](/static/images/onion-services/tor-onion-services-5.png)
+![Onion Services: Step 
5](/static/images/onion-services/overview/tor-onion-services-5.png)
 
 In this last act, the onion service is now aware of Alice's rendezvous point. 
The onion service connects to the rendezvous point (through an anonymized 
circuit) and sends the "one-time secret" to it.
 
@@ -97,7 +97,7 @@ Upon the rendezvous point receiving the "one-time secret" 
from Bob, it informs A
 
 In general, the complete connection between client and onion service consists 
of 6 relays: 3 of them were picked by the client with the third being the 
rendezvous point and the other 3 were picked by the onion service. This 
provides _location hiding_ to this connection:
 
-![Onion Services: Step 
6](/static/images/onion-services/tor-onion-services-6.png)
+![Onion Services: Step 
6](/static/images/onion-services/overview/tor-onion-services-6.png)
 
 ## Further resources
 

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

[tor-commits] [community/master] Onion Services section

2019-06-07 Thread emmapeel

commit 5d08c4a0fe3b202659c1b79d171de2c91a6e6a82
Author: Pili Guerra 
Date:   Fri Jun 7 13:28:35 2019 +0200

Onion Services section
---
 .../overview/tor-onion-services-1.png  | Bin 0 -> 17222 bytes
 .../overview/tor-onion-services-2.png  | Bin 0 -> 19207 bytes
 .../overview/tor-onion-services-3.png  | Bin 0 -> 22213 bytes
 .../overview/tor-onion-services-4.png  | Bin 0 -> 21419 bytes
 .../overview/tor-onion-services-5.png  | Bin 0 -> 22165 bytes
 .../overview/tor-onion-services-6.png  | Bin 0 -> 18018 bytes
 content/onion-services/overview/contents.lr| 112 +
 content/onion-services/setup/contents.lr   |  57 ++-
 content/onion-services/ssl-tls/contents.lr |   4 +-
 templates/onion-services.html  |  25 +++--
 10 files changed, 186 insertions(+), 12 deletions(-)

diff --git 
a/assets/static/images/onion-services/overview/tor-onion-services-1.png 
b/assets/static/images/onion-services/overview/tor-onion-services-1.png
new file mode 100644
index 000..75de366
Binary files /dev/null and 
b/assets/static/images/onion-services/overview/tor-onion-services-1.png differ
diff --git 
a/assets/static/images/onion-services/overview/tor-onion-services-2.png 
b/assets/static/images/onion-services/overview/tor-onion-services-2.png
new file mode 100644
index 000..4081cdb
Binary files /dev/null and 
b/assets/static/images/onion-services/overview/tor-onion-services-2.png differ
diff --git 
a/assets/static/images/onion-services/overview/tor-onion-services-3.png 
b/assets/static/images/onion-services/overview/tor-onion-services-3.png
new file mode 100644
index 000..3a948ac
Binary files /dev/null and 
b/assets/static/images/onion-services/overview/tor-onion-services-3.png differ
diff --git 
a/assets/static/images/onion-services/overview/tor-onion-services-4.png 
b/assets/static/images/onion-services/overview/tor-onion-services-4.png
new file mode 100644
index 000..88db970
Binary files /dev/null and 
b/assets/static/images/onion-services/overview/tor-onion-services-4.png differ
diff --git 
a/assets/static/images/onion-services/overview/tor-onion-services-5.png 
b/assets/static/images/onion-services/overview/tor-onion-services-5.png
new file mode 100644
index 000..c171d71
Binary files /dev/null and 
b/assets/static/images/onion-services/overview/tor-onion-services-5.png differ
diff --git 
a/assets/static/images/onion-services/overview/tor-onion-services-6.png 
b/assets/static/images/onion-services/overview/tor-onion-services-6.png
new file mode 100644
index 000..23f9f71
Binary files /dev/null and 
b/assets/static/images/onion-services/overview/tor-onion-services-6.png differ
diff --git a/content/onion-services/overview/contents.lr 
b/content/onion-services/overview/contents.lr
new file mode 100644
index 000..4924c44
--- /dev/null
+++ b/content/onion-services/overview/contents.lr
@@ -0,0 +1,112 @@
+section: onion services
+---
+section_id: onion-services
+---
+color: primary
+---
+_template: layout.html
+---
+title: How do .onion Services work?
+---
+subtitle: Learn how .onion services work.
+---
+key: 0
+---
+html: two-columns-page.html
+---
+body:
+
+Onion services are services that can only be accessed over Tor. Running an 
onion service gives your users all the security of HTTPS with the added privacy 
benefits of Tor Browser.
+
+## Why onion services?
+
+Onion services offer various security benefits to their users, that are not 
usually given on the normal web. In particular:
+
+### Location hiding
+
+An onion service's IP is hidden. Onion services are an overlay network on top 
of TCP/IP/, so in some sense IP addresses are not even meaningful to onion 
services: they are not even used in the protocol.
+
+### End-to-end authentication
+
+When a user visits a particular onion, they know that the content they are 
seeing can only come from that particular onion and that no impersonation is 
possible. This is not the case with the normal web, where reaching a website 
does not mean that a man-in-the-middle did not reroute to some other location 
(e.g. DNS attacks).
+
+### End-to-end encryption
+
+Onion service traffic is encrypted from the client to the onion host. This is 
like getting strong SSL/HTTPS for free.
+
+### NAT punching
+
+Is your network filtered and you can't open ports on your firewall? This could 
happen if you are in a university campus, an office, an airport or pretty much 
anywhere. Onion services don't need open ports because they punch through NAT, 
since they only establish outgoing connections.
+
+
+## The Onion Service Protocol: Overview
+
+Now the question becomes **what kind of protocol do we need to achieve all 
these properties?** In particular, on the normal web, we connect to an IP 
address and we are done, but in this case how do we connect to something that 
does not have an IP address?
+
+In particular, an onion service's

[tor-commits] [tpo/master] typo

2019-06-07 Thread emmapeel

commit 6a95b4adbaf8c101359d82af4ef982cddfd9af33
Author: emma peel 
Date:   Fri Jun 7 15:02:12 2019 +0200

typo
---
 databags/menu+zh-CN.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini
index a720d13..773af15 100644
--- a/databags/menu+zh-CN.ini
+++ b/databags/menu+zh-CN.ini
@@ -15,5 +15,5 @@ path = https://blog.torproject.org
 label = Blog
 
 [donate]
-path = https://donate.torproject.org/zh_CN/
+path = https://donate.torproject.org/zh_CN
 label = Donate

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

[tor-commits] [community/staging] Onion Services section

2019-06-07 Thread pili

commit f186e9f7a88c1edfdfedf4fbb202fdd2c8d334e3
Author: Pili Guerra 
Date:   Fri Jun 7 13:28:35 2019 +0200

Onion Services section
---
 content/onion-services/overview/contents.lr | 18 +-
 content/onion-services/ssl-tls/contents.lr  |  2 +-
 templates/onion-services.html   |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/content/onion-services/overview/contents.lr 
b/content/onion-services/overview/contents.lr
index 1f9b25c..7d6349f 100644
--- a/content/onion-services/overview/contents.lr
+++ b/content/onion-services/overview/contents.lr
@@ -21,11 +21,11 @@ body:
 Onion services are services that can only be accessed over Tor.
 Running an onion service gives your users all the security of HTTPS with the 
added privacy benefits of Tor Browser.
 
-##Â Why onion services?
+## Why onion services?
 
 Onion services offer various security benefits to their users, that are not 
usually given on the normal web. In particular:
 
-###Â Location hiding
+### Location hiding
 
 An onion service's IP is hidden.
 Onion services are an overlay network on top of TCP/IP/, so in some sense IP 
addresses are not even meaningful to onion services: they are not even used in 
the protocol.
@@ -35,7 +35,7 @@ Onion services are an overlay network on top of TCP/IP/, so 
in some sense IP add
 When a user visits a particular onion, they know that the content they are 
seeing can only come from that particular onion and that no impersonation is 
possible.
 This is not the case with the normal web, where reaching a website does not 
mean that a man-in-the-middle did not reroute to some other location (e.g. DNS 
attacks).
 
-###Â End-to-end encryption
+### End-to-end encryption
 
 Onion service traffic is encrypted from the client to the onion host. This is 
like getting strong SSL/HTTPS for free.
 
@@ -58,7 +58,7 @@ This looks weird and random because in reality it's the 
_identity public key_ of
 The general concept behind the onion service protocol is that we use the Tor 
network so that the client (Alice) can introduce itself to the service (Bob), 
and then sets up a rendezvous with the service.
 Here is a detailed breakdown of how this happens:
 
-###Â Act 1: Where the onion service sets up its introduction points
+### Act 1: Where the onion service sets up its introduction points
 
 ![Onion Services: Step 
1](/static/images/onion-services/overview/tor-onion-services-1.png)
 
@@ -67,7 +67,7 @@ These circuits are anonymized circuits, so Bob does not 
reveal his locations to
 
 As part of this step, Bob gives its introduction point a special 
"authentication key", so that if any clients come for introductions later the 
introduction point can use that key to match them to Bob.
 
-###Â Act 2: Where the onion service publishes its descriptors
+### Act 2: Where the onion service publishes its descriptors
 
 ![Onion Services: Step 
2](/static/images/onion-services/overview/tor-onion-services-2.png)
 
@@ -79,7 +79,7 @@ The _identity private key_ used here is the private part of 
the **public key tha
 Now, Bob uploads that signed descriptor to a _distributed hash table_ which is 
part of the Tor network, so that clients can also get it.
 Bob uses an anonymized Tor circuit to do this upload, so that he does not 
reveal his location.
 
-###Â Act 3: Where a client wants to visit the onion service
+### Act 3: Where a client wants to visit the onion service
 
 All the previous steps were just setup for the onion service so that it's 
reachable by clients.
 Now let's fast-forward to the point where an actual client wants to visit the 
service:
@@ -93,12 +93,12 @@ When Alice receives the signed descriptor, she verifies the 
signature of the des
 This provides the _end-to-end authentication_ security property, since we are 
now sure that this descriptor could only be produced by Bob and no one else.
 And inside the descriptor there are the introduction points which allow Alice 
to introduce herself to Bob.
 
-###Â Act 4: Where the client establishes a rendezvous point
+### Act 4: Where the client establishes a rendezvous point
 
 Now before the introduction takes place, Alice picks a Tor relay and 
establishes a circuit to it.
 Alice asks the relay to become her _rendezvous point_ and gives it an 
"one-time secret" that will be used as part of the rendezvous procedure.
 
-###Â Act 5: Where the client introduces itself to the onion service
+### Act 5: Where the client introduces itself to the onion service
 
 ![Onion Services: Step 
4](/static/images/onion-services/overview/tor-onion-services-4.png)
 
@@ -120,7 +120,7 @@ This provides _location hiding_ to this connection:
 
 ![Onion Services: Step 
6](/static/images/onion-services/overview/tor-onion-services-6.png)
 
-##Â Further resources
+## Further resources
 
 This was just a high-level overview of the Tor onion services protocol.
 Here are some more resources for the curious who want to learn more:
diff --git

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

2019-06-07 Thread translation

commit 558e1d60eec6d119b3176ef0a1a5782d299443d6
Author: Translation commit bot 
Date:   Fri Jun 7 11:45:38 2019 +

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

diff --git a/locale/pl/LC_MESSAGES/messages.po 
b/locale/pl/LC_MESSAGES/messages.po
index b3e179dc6..bd7781de3 100644
--- a/locale/pl/LC_MESSAGES/messages.po
+++ b/locale/pl/LC_MESSAGES/messages.po
@@ -9,12 +9,12 @@
 # erinm, 2019
 # Dawid Job , 2019
 # Filip , 2019
-# Dawid Potocki , 2019
 # Waldemar Stoczkowski, 2019
+# Dawid Potocki , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Waldemar Stoczkowski, 2019\n"
+"Last-Translator: Dawid Potocki , 2019\n"
 "Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && 
(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && 
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
@@ -1164,6 +1164,8 @@ msgstr ""
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:178
 msgid "Is what Tor does legal? Can I get in trouble for using it?"
 msgstr ""
+"Czy to, co robi Tor jest legalne? Czy mogÄ mieÄ kÅopoty z powodu 
korzystania"
+" z niego?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:182
 msgid ""
@@ -1701,7 +1703,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:458
 msgid "What is your refund policy?"
-msgstr ""
+msgstr "Jaka jest twoja polityka zwrotu pieniÄdzy?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:462
 msgid ""
@@ -1729,7 +1731,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:474
 msgid "Can I donate by mail?"
-msgstr ""
+msgstr "Czy mogÄ wykonaÄ dotacje przez pocztÄ?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:478
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:584
@@ -1890,7 +1892,7 @@ msgstr "ChciaÅbym, aby moja firma wspieraÅa Tor."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:594
 msgid "What can we do to help?"
-msgstr ""
+msgstr "Co moÅ¼emy zrobiÄ, Å¼eby pomÃ³c?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:598
 msgid ""
@@ -1952,7 +1954,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:632
 msgid "We are happy that a broad range of people use and support Tor."
-msgstr ""
+msgstr "Cieszymy siÄ, Å¼e szerokie grono ludzi korzysta i wspiera Tora."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:638
 msgid "I have more questions."
@@ -1967,6 +1969,8 @@ msgid ""
 "Feel free to send questions to frontdesk(at)rt.torproject.org."
 msgstr ""
+"Zapraszamy do wysyÅania pytaÅ do frontdesk(maÅpa)rt.torproject.org."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:646
 msgid ""
@@ -2032,7 +2036,7 @@ msgstr "XXL"
 
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:145
 msgid "Want to donate cryptocurrency?"
-msgstr ""
+msgstr "Chcesz przekazaÄ kryptowaluty?"
 
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:150
 msgid "Want to donate stock or via postal mail?"

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

[tor-commits] [tpo/master] add Simplified Chinese (zh-CN) lang

2019-06-07 Thread emmapeel

commit cf30d3cfa0c9eab46a25b6a13d8dfa56804ccc9e
Author: emma peel 
Date:   Fri Jun 7 13:37:27 2019 +0200

add Simplified Chinese (zh-CN) lang
---
 configs/i18n.ini  | 2 +-
 databags/alternatives.ini | 6 ++
 tpo.lektorproject | 5 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/configs/i18n.ini b/configs/i18n.ini
index 81d4abd..986169b 100644
--- a/configs/i18n.ini
+++ b/configs/i18n.ini
@@ -1,5 +1,5 @@
 content = en
-translations = de,es,fr,is,it,ka,pt-BR,ru,tr
+translations = de,es,fr,is,it,ka,pt-BR,ru,tr,zh-CN
 i18npath = i18n
 translate_paragraphwise = False
 url_prefix = https://www.torproject.org/
diff --git a/databags/alternatives.ini b/databags/alternatives.ini
index 7603b21..a372d8c 100644
--- a/databags/alternatives.ini
+++ b/databags/alternatives.ini
@@ -57,3 +57,9 @@ direction = text-left
 order = order-last
 url = /tr/
 language = TÃ¼rkÃ§e (tr)
+
+[zh-CN]
+direction = text-left
+order = order-last
+url = /zh-CN/
+language = ç®ä½å (zh-CN)
diff --git a/tpo.lektorproject b/tpo.lektorproject
index 8523e44..633244b 100644
--- a/tpo.lektorproject
+++ b/tpo.lektorproject
@@ -54,3 +54,8 @@ locale = ru
 name = TÃ¼rkÃ§e (tr)
 url_prefix = /tr/
 locale = tr
+
+[alternatives.zh-CN]
+name = ç®ä½å (zh-CN)
+url_prefix = /zh-CN/
+locale = zh-CN

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

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

2019-06-07 Thread translation

commit aae9cd593ac87da2393eac08889abbfb23655c30
Author: Translation commit bot 
Date:   Fri Jun 7 11:18:01 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+pl.po | 5 +
 1 file changed, 5 insertions(+)

diff --git a/contents+pl.po b/contents+pl.po
index 4f0763c98..8dad5fc6d 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -1719,6 +1719,9 @@ msgid ""
 "You can further increase your security by choosing to disable certain web "
 "features that can be used to attack your security and anonymity."
 msgstr ""
+"MoÅ¼esz dodatkowo zwiÄkszyÄ swoje bezpieczeÅstwo, wybierajÄc wyÅÄczenie 
"
+"pewnych funkcji internetowych, ktÃ³re mogÄ byÄ wykorzystane do ataku na 
Twoje"
+" bezpieczeÅstwo i anonimowoÅÄ."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1726,6 +1729,8 @@ msgid ""
 "You can do this by increasing Tor Browser's Security Settings in the shield "
 "menu."
 msgstr ""
+"MoÅ¼esz to zrobiÄ, zwiÄkszajÄc ustawienia bezpieczeÅstwa PrzeglÄdarki 
Tor w "
+"menu tarczy."
 
 #: 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] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-06-07 Thread translation

commit ee9e828c0119ad9d33a05b0007fdf0018479d88a
Author: Translation commit bot 
Date:   Fri Jun 7 11:17:53 2019 +

Update translations for tbmanual-contentspot
---
 contents+pl.po | 5 +
 1 file changed, 5 insertions(+)

diff --git a/contents+pl.po b/contents+pl.po
index 4f0763c98..8dad5fc6d 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -1719,6 +1719,9 @@ msgid ""
 "You can further increase your security by choosing to disable certain web "
 "features that can be used to attack your security and anonymity."
 msgstr ""
+"MoÅ¼esz dodatkowo zwiÄkszyÄ swoje bezpieczeÅstwo, wybierajÄc wyÅÄczenie 
"
+"pewnych funkcji internetowych, ktÃ³re mogÄ byÄ wykorzystane do ataku na 
Twoje"
+" bezpieczeÅstwo i anonimowoÅÄ."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)
@@ -1726,6 +1729,8 @@ msgid ""
 "You can do this by increasing Tor Browser's Security Settings in the shield "
 "menu."
 msgstr ""
+"MoÅ¼esz to zrobiÄ, zwiÄkszajÄc ustawienia bezpieczeÅstwa PrzeglÄdarki 
Tor w "
+"menu tarczy."
 
 #: 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] [translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

2019-06-07 Thread translation

commit db7ca59e346c969f8214e098491124383797c3ec
Author: Translation commit bot 
Date:   Fri Jun 7 10:48:03 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+pl.po | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contents+pl.po b/contents+pl.po
index 0f14a3888..4f0763c98 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -440,7 +440,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
 msgid "# CONFIGURE"
-msgstr ""
+msgstr "# KONFIGURUJ"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -1710,6 +1710,8 @@ msgid ""
 "By default, Tor Browser protects your security by encrypting your browsing "
 "data."
 msgstr ""
+"DomyÅlnie PrzeglÄdarka Tor chroni Twoje bezpieczeÅstwo, szyfrujÄc Twoje 
dane"
+" przeglÄdania."
 
 #: 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] [translation/tbmanual-contentspot] Update translations for tbmanual-contentspot

2019-06-07 Thread translation

commit 46405b001cb87c71ecc55e2316cbf6983772f06b
Author: Translation commit bot 
Date:   Fri Jun 7 10:47:56 2019 +

Update translations for tbmanual-contentspot
---
 contents+pl.po | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contents+pl.po b/contents+pl.po
index 0f14a3888..4f0763c98 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -440,7 +440,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
 msgid "# CONFIGURE"
-msgstr ""
+msgstr "# KONFIGURUJ"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -1710,6 +1710,8 @@ msgid ""
 "By default, Tor Browser protects your security by encrypting your browsing "
 "data."
 msgstr ""
+"DomyÅlnie PrzeglÄdarka Tor chroni Twoje bezpieczeÅstwo, szyfrujÄc Twoje 
dane"
+" przeglÄdania."
 
 #: 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] [translation/tbmanual-contentspot_completed] Update translations for tbmanual-contentspot_completed

2019-06-07 Thread translation

commit ca42758c2aba4f1a82bf5c824622d505b37a4ac1
Author: Translation commit bot 
Date:   Fri Jun 7 10:18:11 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+pl.po | 2586 
 1 file changed, 2586 insertions(+)

diff --git a/contents+pl.po b/contents+pl.po
new file mode 100644
index 0..0f14a3888
--- /dev/null
+++ b/contents+pl.po
@@ -0,0 +1,2586 @@
+# Translators:
+# Filip , 2018
+# Dawid Job , 2019
+# Emma Peel, 2019
+# erinm, 2019
+# Waldemar Stoczkowski, 2019
+# Dawid Potocki , 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-06-03 14:04+CET\n"
+"PO-Revision-Date: 2018-11-14 12:31+\n"
+"Last-Translator: Dawid Potocki , 2019\n"
+"Language-Team: Polish (https://www.transifex.com/otf/teams/1519/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && 
(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && 
n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: https//tb-manual.torproject.org/ (content/contents+en.lrshowcase.title)
+msgid "Tor Browser User Manual"
+msgstr "Instrukcja korzystania z Tor Browser"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "About"
+msgstr "O aplikacji"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Documentation"
+msgstr "Dokumentacja"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Press"
+msgstr "Prasa"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Blog"
+msgstr "Blog"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Newsletter"
+msgstr "Newsletter"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Contact"
+msgstr "Kontakty"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "Wtyczki"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor translator"
+msgstr "ZostaÅ tÅumaczem Tor "
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "About Tor Browser"
+msgstr "O Tor Browser"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Downloading"
+msgstr "ÅciÄganie"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Running Tor Browser for the first time"
+msgstr "Uruchamianie Tor Browser po raz pierwszy"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Pluggable transports"
+msgstr "Wtykowe transporty"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Circumvention"
+msgstr "PodstÄp"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Bridges"
+msgstr "Mostki"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Managing identities"
+msgstr "ZarzÄdzanie toÅ¼samoÅciami"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Onion Services"
+msgstr "UsÅugi Onion"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Secure Connections"
+msgstr "Bezpieczne PoÅÄczenia"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Security Settings"
+msgstr "Ustawienia bezpieczeÅstwa"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Updating"
+msgstr "Aktualizowanie"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Troubleshooting"
+msgstr "RozwiÄzywanie problemÃ³w"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Uninstalling"
+msgstr "Odinstalowanie"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.description)
+msgid "Known issues"
+msgstr "Znane Problemy"
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.title)
+msgid "ABOUT TOR BROWSER"
+msgstr "O PRZEGLÄDARCE TOR"
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.description)
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
+msgstr ""
+"Dowiedz siÄ co Tor Browser moÅ¼e robiÄ aby chroniÄ twojÄ prywatnoÅÄ i "
+"anonimowoÅÄ"
+
+#: https//tb-manual.torproject.org/about/
+#:

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

2019-06-07 Thread translation

commit 495693b60e2b2382acec71d7b3ff40cd7b051ff4
Author: Translation commit bot 
Date:   Fri Jun 7 10:18:03 2019 +

Update translations for tbmanual-contentspot
---
 contents+es.po |  2 +-
 contents+pl.po | 60 ++
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/contents+es.po b/contents+es.po
index 8aac80ad9..2e4573536 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -667,7 +667,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid "# TYPES OF PLUGGABLE TRANSPORT"
-msgstr ""
+msgstr "# TIPOS DE TRANSPORTE CONECTABLE"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
diff --git a/contents+pl.po b/contents+pl.po
index 9ab00413f..0f14a3888 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -1228,6 +1228,8 @@ msgid ""
 "You can also access this option in the new circuit display, in the site "
 "information menu, in the URL bar."
 msgstr ""
+"DostÄp do tej opcji moÅ¼na rÃ³wnieÅ¼ uzyskaÄ w nowym wyÅwietlaczu obwodu, 
w "
+"menu informacji o witrynie, w pasku URL."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.title)
@@ -1273,6 +1275,9 @@ msgid ""
 "so you do not need to worry about connecting"
 " over HTTPS."
 msgstr ""
+"* CaÅy ruch pomiÄdzy uÅ¼ytkownikami Tor i usÅugami cebulowymi jest 
szyfrowany"
+" od-poczÄtku-do-koÅca, wiÄc nie musisz siÄ martwiÄ o ÅÄczenie siÄ poprzez HTTPS."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1282,6 +1287,9 @@ msgid ""
 "Tor ensure that it is connecting to the right location and that the "
 "connection is not being tampered with."
 msgstr ""
+"* Adres usÅugi cebuli jest generowany automatycznie, wiÄc operatorzy nie "
+"muszÄ kupowaÄ nazwy domeny; adres URL .onion pomaga rÃ³wnieÅ¼ Torowi 
zapewniÄ,"
+" Å¼e ÅÄczy siÄ z wÅaÅciwÄ lokalizacjÄ i Å¼e poÅÄczenie nie jest 
naruszane."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1295,6 +1303,10 @@ msgid ""
 "service in order to connect to it. An onion address is a string of 16 (and "
 "in V3 format, 56) mostly random letters and numbers, followed by 
â.onionâ."
 msgstr ""
+"Podobnie jak w przypadku kaÅ¼dej innej strony internetowej, musisz znaÄ 
adres"
+" serwisu cebulowego, aby mÃ³c siÄ z nim poÅÄczyÄ. Adres cebulowy to ciÄg 
16 "
+"(i w formacie V3, 56) najczÄÅciej przypadkowych liter i cyfr, a nastÄpnie "
+"\".onion\"."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1305,6 +1317,11 @@ msgid ""
 "website with https and onion service, it will show an icon of a green onion "
 "and a padlock."
 msgstr ""
+"WchodzÄc na stronÄ internetowÄ, ktÃ³ra korzysta z usÅugi cebulowej, "
+"PrzeglÄdarka Tor pokaÅ¼e na pasku adresu URL ikonÄ maÅej zielonej cebuli "
+"wyÅwietlajÄcej stan Twojego poÅÄczenia: bezpieczny i korzystajÄcy z 
usÅugi "
+"cebulowej. A jeÅli masz wchodzisz na stronÄ internetowÄ z https i usÅugÄ 
"
+"cebulÄ, to pokaÅ¼e ikonÄ zielonej cebuli i kÅÃ³dki."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1318,6 +1335,9 @@ msgid ""
 "entered the onion address correctly: even a small mistake will stop Tor "
 "Browser from being able to reach the site."
 msgstr ""
+"JeÅli nie moÅ¼esz dotrzeÄ do usÅugi cebulowej, ktÃ³rej potrzebujesz, 
upewnij "
+"siÄ, Å¼e wpisaÅeÅ poprawnie adres cebulowy: nawet drobny bÅÄd powstrzyma 
"
+"PrzeglÄdarkÄ Tor przed dotarciem na stronÄ."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1326,6 +1346,9 @@ msgid ""
 "later. There may be a temporary connection issue, or the site operators may "
 "have allowed it to go offline without warning."
 msgstr ""
+"JeÅli nadal nie jesteÅ w stanie podÅÄczyÄ siÄ do serwisu cebulowego, 
sprÃ³buj"
+" ponownie pÃ³Åºniej. MoÅ¼e okazaÄ siÄ to tymczasowy problem z poÅÄczeniem 
lub "
+"operatorzy strony mogli pozwoliÄ na jego wyÅÄczenie bez ostrzeÅ¼enia."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1360,6 +1383,13 @@ msgid ""
 " verify this in the URL bar: if your connection is encrypted, the address "
 "will begin with âhttps://â, rather than âhttp://â.;
 msgstr ""
+"JeÅli dane osobowe, takie jak hasÅo logowania, nie sÄ wysÅane 
zaszyfrowane "
+"przez Internet, mogÄ byÄ bardzo Åatwo przechwycone poprzez 
podsÅuchiwacza. "
+"JeÅli logujesz siÄ na jakÄkolwiek stronÄ internetowÄ, powinieneÅ siÄ "
+"upewniÄ, Å¼e strona oferuje szyfrowanie HTTPS, ktÃ³re chroni przed tego "
+"rodzaju podsÅuchem. MoÅ¼esz to sprawdziÄ w pasku adresu

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

2019-06-07 Thread translation

commit d25186a8aec63696d5aae3f20b88a8ca10620ee0
Author: Translation commit bot 
Date:   Fri Jun 7 09:47:56 2019 +

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

diff --git a/contents+pl.po b/contents+pl.po
index 3625f7f51..9ab00413f 100644
--- a/contents+pl.po
+++ b/contents+pl.po
@@ -1213,6 +1213,14 @@ msgid ""
 " reloaded. This option does not clear any private information or unlink your"
 " activity, nor does it affect your current connections to other websites."
 msgstr ""
+"Opcja ta jest przydatna, jeÅli uÅ¼ywany przekaÅºnik wyjÅciowy nie jest w stanie poÅÄczyÄ siÄ z 
wymaganÄ "
+"stronÄ internetowÄ lub nie Åaduje jej prawidÅowo. Wybranie jej spowoduje "
+"ponowne zaÅadowanie aktualnie aktywnej karty lub okna w nowym obwodzie Tor. "
+"Inne otwarte karty i okna z tej samej strony internetowej bÄdÄ korzystaÄ z 
"
+"nowego obwodu rÃ³wnieÅ¼ po ich ponownym zaÅadowaniu. Ta opcja nie usuwa "
+"Å¼adnych prywatnych informacji ani nie odlinkuje twojej aktywnoÅci, ani nie "
+"wpÅywa na twoje obecne poÅÄczenia z innymi stronami internetowymi."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.body)
@@ -1237,6 +1245,8 @@ msgid ""
 "Onion services (formerly known as âhidden servicesâ) are services (like "
 "websites) that are only accessible through the Tor network."
 msgstr ""
+"UsÅugi cebulowe (wczeÅniej znane jako \"usÅugi ukryte\") to usÅugi (takie 
"
+"jak strony internetowe), ktÃ³re sÄ dostÄpne tylko poprzez sieÄ Tor."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1244,6 +1254,8 @@ msgid ""
 "Onion services offer several advantages over ordinary services on the non-"
 "private web:"
 msgstr ""
+"UsÅugi cebulowe oferujÄ kilka korzyÅci w stosunku do zwykÅych usÅug w 
sieci "
+"nie-prywatnej:"
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)
@@ -1251,6 +1263,8 @@ msgid ""
 "* An onion servicesâs location and IP address are hidden, making it "
 "difficult for adversaries to censor it or identify its operators."
 msgstr ""
+"* Lokalizacja i adres IP usÅug cebulowych jest ukryty, co utrudnia ich "
+"cenzurowanie lub identyfikacjÄ operatorÃ³w przez przeciwnikÃ³w."
 
 #: https//tb-manual.torproject.org/onion-services/
 #: (content/onion-services/contents+en.lrtopic.body)

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

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

2019-06-07 Thread translation

commit 9619fc6afb226f0fb20a3c830136a12bf038f969
Author: Translation commit bot 
Date:   Fri Jun 7 08:48:29 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+zh-CN.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 15de0aed4..4512186ad 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -2054,8 +2054,7 @@ msgid ""
 "with Transifex. Below is an outline of how to sign up and begin."
 msgstr ""
 "å¦ææ¨å¯¹å¸®å©æä»¬å° Tor 
æµè§å¨æè¿ç¯ææ¡£ç¿»è¯ææ¨çè¯è¨æå
´è¶£ï¼éå¸¸æè°¢æ¨çå¸®å©ï¼æ¨æ¬é¡¹ç®æç®¡å¨ç¬¬ä¸æ¹ç½ç« 
Transifex ä¸ç "
-"[Localization Lab](https://www.localizationlab.org) "
-"Hubãä¸é¢æ¯å¦ä½æ³¨ååå¼å§ç¿»è¯çæµç¨çç®åæ¦æ¬ã"
+"[Localization Lab](https://www.localizationlab.org) 
é¡¹ç®ãä¸é¢æ¯å¦ä½æ³¨ååå¼å§ç¿»è¯çæµç¨çç®åæ¦æ¬ã"
 
 #: https//tb-manual.torproject.org/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en.lrtopic.body)
@@ -2065,8 +2064,9 @@ msgid ""
 "There you will find translation guidelines and resources that will help you "
 "contribute to Tor translations."
 msgstr ""
-"å¼å§ç¿»è¯ä¹åï¼è¯·éè¯»[Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor)ä¸çToré¡¹ç®é¡µé¢ãå¨é£éï¼æ¨å¯ä»¥æ¾å°ç¿»è¯åååè½å¤å¸®å©æ¨ç¿»è¯Torçèµæº"
+"å¼å§ç¿»è¯ä¹åï¼è¯·éè¯» [Localization Lab "
+"Wiki](https://wiki.localizationlab.org/index.php/Tor) ä¸ç Tor "
+"é¡¹ç®é¡µé¢ãå¨é£éï¼æ¨å¯ä»¥æ¾å°ç¿»è¯åååè½å¤å¸®å©æ¨ç¿»è¯
 Tor çèµæº"
 
 #: https//tb-manual.torproject.org/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en.lrtopic.body)
@@ -2119,12 +2119,12 @@ msgid ""
 "* You are now signed up! Go to the [Tor Transifex "
 "page](https://www.transifex.com/otf/torproject/)."
 msgstr ""
-"* ä½ ç°å¨å·²ç»ç»å¥ï¼åå¾ [Tor Transifex 
ç½é¡µ](https://www.transifex.com/otf/torproject/)."
+"* ä½ ç°å¨å·²ç»ç»å¥ï¼åå¾ [Tor Transifex 
é¡µé¢](https://www.transifex.com/otf/torproject/)ã"
 
 #: https//tb-manual.torproject.org/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en.lrtopic.body)
 msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* ç¹å»æå³ç«¯çèè² 'Join Team' æé®"
+msgstr "* ç¹å»æå³ç«¯çèè²âJoin Teamâæé®"
 
 #: https//tb-manual.torproject.org/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en.lrtopic.body)

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

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

2019-06-07 Thread translation

commit c48b9e042dca85310c19762481f1cfce098d7b57
Author: Translation commit bot 
Date:   Fri Jun 7 08:48:21 2019 +

Update translations for tbmanual-contentspot
---
 contents+zh-CN.po | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 15de0aed4..4512186ad 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -2054,8 +2054,7 @@ msgid ""
 "with Transifex. Below is an outline of how to sign up and begin."
 msgstr ""
 "å¦ææ¨å¯¹å¸®å©æä»¬å° Tor 
æµè§å¨æè¿ç¯ææ¡£ç¿»è¯ææ¨çè¯è¨æå
´è¶£ï¼éå¸¸æè°¢æ¨çå¸®å©ï¼æ¨æ¬é¡¹ç®æç®¡å¨ç¬¬ä¸æ¹ç½ç« 
Transifex ä¸ç "
-"[Localization Lab](https://www.localizationlab.org) "
-"Hubãä¸é¢æ¯å¦ä½æ³¨ååå¼å§ç¿»è¯çæµç¨çç®åæ¦æ¬ã"
+"[Localization Lab](https://www.localizationlab.org) 
é¡¹ç®ãä¸é¢æ¯å¦ä½æ³¨ååå¼å§ç¿»è¯çæµç¨çç®åæ¦æ¬ã"
 
 #: https//tb-manual.torproject.org/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en.lrtopic.body)
@@ -2065,8 +2064,9 @@ msgid ""
 "There you will find translation guidelines and resources that will help you "
 "contribute to Tor translations."
 msgstr ""
-"å¼å§ç¿»è¯ä¹åï¼è¯·éè¯»[Localization Lab "
-"Wiki](https://wiki.localizationlab.org/index.php/Tor)ä¸çToré¡¹ç®é¡µé¢ãå¨é£éï¼æ¨å¯ä»¥æ¾å°ç¿»è¯åååè½å¤å¸®å©æ¨ç¿»è¯Torçèµæº"
+"å¼å§ç¿»è¯ä¹åï¼è¯·éè¯» [Localization Lab "
+"Wiki](https://wiki.localizationlab.org/index.php/Tor) ä¸ç Tor "
+"é¡¹ç®é¡µé¢ãå¨é£éï¼æ¨å¯ä»¥æ¾å°ç¿»è¯åååè½å¤å¸®å©æ¨ç¿»è¯
 Tor çèµæº"
 
 #: https//tb-manual.torproject.org/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en.lrtopic.body)
@@ -2119,12 +2119,12 @@ msgid ""
 "* You are now signed up! Go to the [Tor Transifex "
 "page](https://www.transifex.com/otf/torproject/)."
 msgstr ""
-"* ä½ ç°å¨å·²ç»ç»å¥ï¼åå¾ [Tor Transifex 
ç½é¡µ](https://www.transifex.com/otf/torproject/)."
+"* ä½ ç°å¨å·²ç»ç»å¥ï¼åå¾ [Tor Transifex 
é¡µé¢](https://www.transifex.com/otf/torproject/)ã"
 
 #: https//tb-manual.torproject.org/becoming-tor-translator/
 #: (content/becoming-tor-translator/contents+en.lrtopic.body)
 msgid "* Click the blue 'Join Team' button on the far right:"
-msgstr "* ç¹å»æå³ç«¯çèè² 'Join Team' æé®"
+msgstr "* ç¹å»æå³ç«¯çèè²âJoin Teamâæé®"
 
 #: https//tb-manual.torproject.org/becoming-tor-translator/
 #: (content/becoming-tor-translator/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-browser-build/master] Preparing -build2 for 9.0a2

2019-06-07 Thread gk

commit d151c053c01eef50f5b304680b61169684ae2c09
Author: Georg Koppen 
Date:   Fri Jun 7 08:22:45 2019 +

Preparing -build2 for 9.0a2
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 --
 projects/tor/config | 2 +-
 rbm.conf| 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt 
b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index c0aad72..bb83d9c 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,4 +1,4 @@
-Tor Browser 9.0a2 -- June 7 2019
+Tor Browser 9.0a2 -- June 11 2019
  * All platforms
* Update Torbutton to 2.2
  * Bug 30565: Sync nocertdb with privatebrowsing.autostart at startup
@@ -11,7 +11,7 @@ Tor Browser 9.0a2 -- June 7 2019
* Bug 30712: Backport fix for Mozilla's bug 1552993
* Bug 30469: Add locale ro
  * Windows + OS X + Linux
-   * Update Tor to 0.4.1.1-alpha
+   * Update Tor to 0.4.1.2-alpha
* Update OpenSSL to 1.1.1c
* Update Tor Launcher to 0.2.19.1
  * Bug 30469: Add locale ro
@@ -30,6 +30,8 @@ Tor Browser 9.0a2 -- June 7 2019
  * Bug 30536: Update Go to 1.12.5
* OS X
  * Bug 30491: Move our macOS builds to Debian Stretch
+   * Linux
+ * Bug 25930: Update GCC to 8.3.0 for our Linux builds
 
 Tor Browser 9.0a1 -- May 21 2019
  * All platforms
diff --git a/projects/tor/config b/projects/tor/config
index 8b02b6c..6f4b5f2 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% 
c("var/build_id") %]'
-version: 0.4.1.1-alpha
+version: 0.4.1.2-alpha
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1
diff --git a/rbm.conf b/rbm.conf
index a7c32a8..6f121c2 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '9.0a2'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
 - 9.0a1
   project_name: tor-browser

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

[tor-commits] [tor-browser-build/master] Bug 30779: Make openssl build reproducible by setting SOURCE_DATE_EPOCH

2019-06-07 Thread gk

commit 3d5f652a3ec9fb44c41e79174f2de28f14ffdbe0
Author: Nicolas Vigier 
Date:   Thu Jun 6 00:25:38 2019 +0200

Bug 30779: Make openssl build reproducible by setting SOURCE_DATE_EPOCH
---
 projects/openssl/build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/projects/openssl/build b/projects/openssl/build
index a3ff092..40dc526 100644
--- a/projects/openssl/build
+++ b/projects/openssl/build
@@ -13,6 +13,7 @@ export CC='gcc -m32'
   ln -s $clangdir/bin/clang $clangdir/bin/x86_64-apple-darwin11-cc
   export CC="cc [% c("var/FLAGS") %]"
 [% END -%]
+export SOURCE_DATE_EPOCH='[% c("timestamp") %]'
 ./Configure --prefix=$distdir [% c('var/configure_opts') %]
 make
 make install



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

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

2019-06-07 Thread translation

commit 79628a7329050e486d666453e7f0134b32e5ae76
Author: Translation commit bot 
Date:   Fri Jun 7 08:18:06 2019 +

Update translations for tbmanual-contentspot_completed
---
 contents+zh-CN.po | 2240 +
 1 file changed, 2240 insertions(+)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
new file mode 100644
index 0..15de0aed4
--- /dev/null
+++ b/contents+zh-CN.po
@@ -0,0 +1,2240 @@
+# Translators:
+# ef082130671b50894cb0f0340a268c8b, 2019
+# MD Rights , 2019
+# erinm, 2019
+# Emma Peel, 2019
+# Yikai Yang , 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-06-03 14:04+CET\n"
+"PO-Revision-Date: 2018-11-14 12:31+\n"
+"Last-Translator: Yikai Yang , 2019\n"
+"Language-Team: Chinese (China) 
(https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: https//tb-manual.torproject.org/ (content/contents+en.lrshowcase.title)
+msgid "Tor Browser User Manual"
+msgstr "Tor æµè§å¨ç¨æ·æå"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "About"
+msgstr "å³äº"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Documentation"
+msgstr "ææ¡£"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Press"
+msgstr "æ°é»"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Blog"
+msgstr "åå®¢"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Newsletter"
+msgstr "æ°é»éè®¯"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Contact"
+msgstr "èç³»æ¹å¼"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Plugins"
+msgstr "æä»¶"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Becoming a Tor translator"
+msgstr "æä¸º Tor ç¿»è¯è"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "About Tor Browser"
+msgstr "å³äº Tor æµè§å¨"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Downloading"
+msgstr "ä¸è½½"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Running Tor Browser for the first time"
+msgstr "åæ¬¡è¿è¡ Tor æµè§å¨"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Pluggable transports"
+msgstr "å¯ææä¼ è¾"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Circumvention"
+msgstr "è§é¿"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Bridges"
+msgstr "ç½æ¡¥"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Managing identities"
+msgstr "ç®¡çèº«ä»½"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Onion Services"
+msgstr "æ´è±æå¡"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Secure Connections"
+msgstr "å®å¨è¿æ¥"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Security Settings"
+msgstr "å®å¨è®¾ç½®"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Updating"
+msgstr "æ´æ°"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Troubleshooting"
+msgstr "æéæé¤"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+msgid "Uninstalling"
+msgstr "å¸è½½"
+
+#: https//tb-manual.torproject.org/menu/
+#: (content/menu/contents+en.lrtopic.body)
+#: https//tb-manual.torproject.org/known-issues/
+#: (content/known-issues/contents+en.lrtopic.description)
+msgid "Known issues"
+msgstr "å·²ç¥é®é¢"
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.title)
+msgid "ABOUT TOR BROWSER"
+msgstr "å³äº Tor æµè§å¨"
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.description)
+msgid "Learn what Tor Browser can do to protect your privacy and anonymity"
+msgstr "äºè§£ Tor æµè§å¨å¦ä½ä¿æ¤æ¨çéç§åå¿åæ§"
+
+#: https//tb-manual.torproject.org/about/
+#: (content/about/contents+en.lrtopic.body)
+msgid ""
+"Tor Browser uses the Tor network to protect your privacy and anonymity. "
+"Using the Tor network has two main properties:"
+msgstr "Tor æµè§å¨ä½¿ç¨ Tor ç½ç»ä¿æ¤æ¨çéç§åå¿åæ§ãä½¿ç¨ 
Tor ç½ç»æä¸¤ä¸ªä¸»è¦å¥½å¤ï¼"
+
+#:

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

2019-06-07 Thread translation

commit f9ea81c7622e3be7f82647d93cd5a31082e7c91c
Author: Translation commit bot 
Date:   Fri Jun 7 08:17:58 2019 +

Update translations for tbmanual-contentspot
---
 contents+zh-CN.po | 84 +++
 1 file changed, 42 insertions(+), 42 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index 3817fb923..15de0aed4 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -283,7 +283,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "# GETTOR"
-msgstr ""
+msgstr "# GetTor"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -298,7 +298,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "## TO USE GETTOR VIA EMAIL:"
-msgstr ""
+msgstr "## éè¿é®ä»¶ä½¿ç¨GetTorï¼"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -327,7 +327,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "## TO USE GETTOR VIA TWITTER:"
-msgstr ""
+msgstr "## éè¿ Twitter ä½¿ç¨GetTorï¼"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -342,7 +342,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "## TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):"
-msgstr ""
+msgstr "## éè¿ Jabber/XMPP ï¼JITSI, COYIMçï¼ä½¿ç¨GetTorï¼"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -356,7 +356,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.title)
 msgid "RUNNING TOR BROWSER FOR THE FIRST TIME"
-msgstr ""
+msgstr "ç¬¬ä¸æ¬¡è¿è¡ Tor æµè§å¨"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.description)
@@ -374,7 +374,7 @@ msgstr "å½æ¨é¦æ¬¡å¯å¨ Tor 
æµè§å¨æ¶ï¼æ¨ä¼çå°æ´è±è·¯ç±ç½ç»ç
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
 msgid "# CONNECT"
-msgstr ""
+msgstr "# è¿æ¥"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -399,7 +399,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
 msgid "# CONFIGURE"
-msgstr ""
+msgstr "# éç½®"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -453,7 +453,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.title)
 msgid "BRIDGES"
-msgstr ""
+msgstr "ç½æ¡¥"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.description)
@@ -487,7 +487,7 @@ msgstr "å¶ä»å¯ææä¼ è¾å±ï¼ä¾å¦ 
meekï¼ä½¿ç¨ä¸åçæå®¡æ¥ææ¯
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid "# GETTING BRIDGE ADDRESSES"
-msgstr ""
+msgstr "# è·åç½æ¡¥å°å"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -511,7 +511,7 @@ msgstr "* ä½¿ç¨ GmailãYahoo æ Riseup 
çé®ç®±æå¡åéçµåé®ä»¶è³ b
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
 msgid "# ENTERING BRIDGE ADDRESSES"
-msgstr ""
+msgstr "# è¾å¥ç½æ¡¥å°å"
 
 #: https//tb-manual.torproject.org/bridges/
 #: (content/bridges/contents+en.lrtopic.body)
@@ -564,7 +564,7 @@ msgstr "å¦æè¿æ¥å¤±è´¥çè¯ï¼å¯è½æ¯å 
ä¸ºæ¨ææå®çç½æ¡¥ç®åå¹¶
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.title)
 msgid "PLUGGABLE TRANSPORTS"
-msgstr ""
+msgstr "å¯ææä¼ è¾"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.description)
@@ -587,7 +587,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
 msgid "# TYPES OF PLUGGABLE TRANSPORT"
-msgstr ""
+msgstr "# å¯ææä¼ è¾ç±»å"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -719,7 +719,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/circumvention/
 #: (content/circumvention/contents+en.lrtopic.body)
 msgid "# USING PLUGGABLE TRANSPORTS"
-msgstr ""
+msgstr "# ä½¿ç¨å¯ææä¼ è¾"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -766,7 +766,7 @@ msgstr "å½ä½ éæ©å¥½å¯ææä¼ 
è¾ï¼ç¹å»âOKâæ¥ä¿åä½ çè®¾ç½®ã"

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

2019-06-07 Thread translation

commit 281123472a38390ae37e9dea8eb5850ca945ada4
Author: Translation commit bot 
Date:   Fri Jun 7 07:47:55 2019 +

Update translations for tbmanual-contentspot
---
 contents+zh-CN.po | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index d311d9e65..3817fb923 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -1,7 +1,7 @@
 # Translators:
 # ef082130671b50894cb0f0340a268c8b, 2019
-# erinm, 2019
 # MD Rights , 2019
+# erinm, 2019
 # Emma Peel, 2019
 # Yikai Yang , 2019
 # 
@@ -190,7 +190,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
 msgid "# HOW TOR WORKS"
-msgstr ""
+msgstr "# Tor å¦ä½å·¥ä½"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -226,7 +226,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.title)
 msgid "DOWNLOADING"
-msgstr ""
+msgstr "æ£å¨ä¸è½½"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.description)
@@ -267,7 +267,7 @@ msgstr "å¦ææ¨ééå°ç±»ä¼¼æ
åµçè¯ï¼å¯ä»¥å©ç¨ä¸åå ç§ä¸åç
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "# MIRRORS"
-msgstr ""
+msgstr "# éå"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -426,8 +426,8 @@ msgid ""
 " You will then be taken to the Circumvention "
 "screen to configure a pluggable transport."
 msgstr ""
-"å¨ç¬¬ä¸ä¸ªç»é¢ä¸æ¨å¿
é¡»åçæ¨æè¦è®¿é®çç½ç»ç¯å¢æ¯å¦ä¼è¿æ»¤é»æ¡éå¾æ´è±è·¯ç±ç½ç»çè¿æ¥ï¼è¥æ¨è®¤ä¸ºä¸ä¼çè¯ï¼è¯·éæ©âå¦âãå¦åè¥æ¨çç½ç»æè¢«è¿æ»¤é»æ¡ï¼ææ¨å·²ç»å°è¯è¿åç§è¿ä¸æ´è±è·¯ç±ç½ç»çæ¹æ³ä½é½å¤±è´¥çè¯ï¼è¯·éæ©âæ¯âï¼æ¬ç¨åºå°ä¼å¸¦é¢æ¨åå¾å®¡æ¥è§é¿ç»é¢è¿è¡å¯ææä¼ è¾å±çç¸å
³è®¾ç½®ã"
+"å¨ç¬¬ä¸ä¸ªçé¢ä¸æ¨éè¦éæ©ï¼æ¨æè¦è®¿é®çç½ç»ç¯å¢æ¯å¦ä¼è¿æ»¤é»æ¡éå¾æ´è±è·¯ç±ç½ç»çè¿æ¥ãè¥æ¨è®¤ä¸ºä¸ä¼çè¯ï¼è¯·éæ©âå¦âãå¦åå½æ¨çç½ç»è¢«è¿æ»¤æå±è½ï¼ææ¨å·²ç»å°è¯è¿åç§è¿ä¸æ´è±è·¯ç±ç½ç»çæ¹æ³ä½é½å¤±è´¥çè¯ï¼è¯·éæ©âæ¯âï¼æ¬ç¨åºå°ä¼å¸¦é¢æ¨åå¾å®¡æ¥è§é¿çé¢ï¼è¿è¡å¯ææä¼ 
è¾å±çç¸å³è®¾ç½®ã"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -686,9 +686,9 @@ msgid ""
 "Web Services; meek-azure makes it look like you are using a Microsoft web "
 "site; and meek-google makes it look like you are using Google search."
 msgstr ""
-"meekä¼ è¾ å¯ä»¥è®©æ¨å¨ä½¿ç¨ Tor æ¥ä¸ç½æ¶ï¼å¨ç½ç»ä¸ä¼ 
è¾çæ°æ®ä¿¡å·çèµ·æ¥å°±åæ¯å¨æµè§æ®éç½ç«ä¸æ ·ãmeek-amazon "
-"å¯ä»¥è®©æ¨çç½ç»ä¿¡å·çèµ·æ¥åæ¯å¨è®¿é®äºé©¬éç½ç»æå¡ä¸æ 
·ï¼meek-azure 
åå¯ä»¥è®©æ¨çç½ç»ä¿¡å·çèµ·æ¥åæ¯æ£å¨ä½¿ç¨å¾®è½¯çç½ç»äºç«¯æå¡ä¸è¬ï¼è
 meek-"
-"google ä¼è®©æ¨çç½ç»ä¿¡å·çèµ·æ¥åæ¯å¨ä½¿ç¨è°·ææç´¢å¼æä¸æ 
·ã"
+"meek å¯ä»¥è®©æ¨å¨ä½¿ç¨ Tor ä¸ç½æ¶ï¼ä¼ è¾çæ°æ®å
åæ¯å¨æµè§æ®éç½ç«ä¸æ ·ãmeek-amazon å¯ä»¥è®©æ¨çæ°æ®å
çèµ·æ¥åæ¯å¨è®¿é®äºé©¬éç½ç»æå¡ä¸æ ·"
+"ï¼meek-azure 
åå¯ä»¥è®©æ¨çç½ç»ä¿¡å·çèµ·æ¥åæ¯æ£å¨ä½¿ç¨å¾®è½¯çç½ç»äºæå¡ä¸æ
 ·ï¼è meek-google "
+"ä¼è®©æ¨çç½ç»ä¿¡å·çèµ·æ¥åæ¯å¨ä½¿ç¨è°·ææç´¢å¼æä¸æ ·ã"
 
 #: https//tb-manual.torproject.org/transports/
 #: (content/transports/contents+en.lrtopic.body)
@@ -783,7 +783,7 @@ msgid ""
 "page for more information on the types of transport that are currently "
 "available."
 msgstr ""
-"ææ¶åæ¨çç½ç»æå¡ä¾åºåææ¿åºåä½ä¼é»æ¡éå¾æ´è±è·¯ç±ç½ç»çç´æ¥è®¿é®ï¼å
 æ¤ Tor "
+"ææ¶åæ¨çç½ç»æå¡ä¾åºåææ¿åºåä½ä¼é»æ¡æ´è±è·¯ç±ç½ç»çç´æ¥è®¿é®ï¼å
 æ¤ Tor "
 "æµè§å¨æåç½®ä¸äºè½å¤ç»è¿è¿ç±»è¿æ»¤æºå¶çè§é¿å·¥å
·ï¼å®ä»¬éå¸¸å«ä½âå¯ææä¼ è¾âï¼æ¨å¯ä»¥åèæ¤ç½é¡µå¯ææä¼ è¾ä»¥è·åæ´å¤å
³äºåç§ç®åå¯ä»¥ä½¿ç¨çè§é¿å·¥å·ã"
 
@@ -2015,7 +2015,7 @@ msgid ""
 "you are running the English Tor Browser."
 msgstr ""
 "1. å»å°ä½ ç Tor æµè§å¨æå¨çæä»¶å¤¹ãWindows 
ä¸é»è®¤çä½ç½®æ¯æ¡é¢ï¼å¨ MacOS é»è®¤ä½ç½®æ¯ Application 
æä»¶å¤¹ãå¨ "
-"Linuxï¼æ²¡æé»è®¤ç®å½ï¼ä½æä»¶å¤¹åç§°é½ä¼å½åä¸º 
âtor-browser_en-USâ å¦æä½ è¿è¡çæ¯è±æç Tor æµè§å¨çè¯ã"
+"Linuxï¼æ²¡æé»è®¤ç®å½ï¼ä½å¦æä½ è¿è¡çæ¯è±æç Tor 
æµè§å¨çè¯,æä»¶å¤¹åç§°é½ä¼å½åä¸ºâtor-browser_en-USâã"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)

___
tor-commits mailing list

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

2019-06-07 Thread translation

commit b2725f5afdf2d9bb3bcdac049ba8c694a3436511
Author: Translation commit bot 
Date:   Fri Jun 7 06:47:56 2019 +

Update translations for tbmanual-contentspot
---
 contents+zh-CN.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/contents+zh-CN.po b/contents+zh-CN.po
index e5e332b43..d311d9e65 100644
--- a/contents+zh-CN.po
+++ b/contents+zh-CN.po
@@ -2,8 +2,8 @@
 # ef082130671b50894cb0f0340a268c8b, 2019
 # erinm, 2019
 # MD Rights , 2019
-# Yikai Yang , 2019
 # Emma Peel, 2019
+# Yikai Yang , 2019
 # 
 msgid ""
 msgstr ""
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-06-03 14:04+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Yikai Yang , 2019\n"
 "Language-Team: Chinese (China) 
(https://www.transifex.com/otf/teams/1519/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: https//tb-manual.torproject.org/ (content/contents+en.lrshowcase.title)
 msgid "Tor Browser User Manual"
-msgstr "Tor Browser ç¨æ·æå"
+msgstr "Tor æµè§å¨ç¨æ·æå"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
@@ -138,7 +138,7 @@ msgstr "å·²ç¥é®é¢"
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.title)
 msgid "ABOUT TOR BROWSER"
-msgstr ""
+msgstr "å³äº Tor æµè§å¨"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.description)

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

65 matches

Mail list logo