date:20191021

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

2019-10-21 Thread translation

commit 137fe463d17b6bc36b8bbb8967bc7aafe0967e3f
Author: Translation commit bot 
Date:   Tue Oct 22 05:45:42 2019 +


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

diff --git a/locale/it/LC_MESSAGES/messages.po 
b/locale/it/LC_MESSAGES/messages.po
index c0d4cb049..72dbe2707 100644
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -667,7 +667,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:483
 msgid "Gift Selected:"
-msgstr ""
+msgstr "Regalo selezionato:"
 
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:487
 msgid "No Gift Selected"

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

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

2019-10-21 Thread translation

commit 1e1ea8e8f74e23218df54bf533422110e6871a55
Author: Translation commit bot 
Date:   Tue Oct 22 04:19:57 2019 +

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

diff --git a/contents+ja.po b/contents+ja.po
index 2dc65a8c5..42e2f455f 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -367,7 +367,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 Browserãå§ãã¦å®è¡"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.description)
@@ -381,6 +381,8 @@ msgid ""
 "Settings window. This offers you the option to connect directly to the Tor "
 "network, or to configure Tor Browser for your connection."
 msgstr ""
+"Tor Browserãåãã¦å®è¡ããã¨ãTor 
Networkè¨å®ã®ã¦ã£ã³ãã¦ãè¡¨ç¤ºããã¾ãã ããã§ã¯ãTor "
+"Networkã«ç´æ¥æ¥ç¶ãããå¥ã®æ¹æ³ãä½¿ããè¨å®ãããã¨ãã§ãã¾ãã"
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/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] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2019-10-21 Thread translation

commit 3db336ad12ca1aea2afc9fbb41035df9946c4b7d
Author: Translation commit bot 
Date:   Tue Oct 22 03:49:56 2019 +

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

diff --git a/contents+ja.po b/contents+ja.po
index 644306c57..2dc65a8c5 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -67,7 +67,7 @@ msgstr "ãã¦ã³ãã¼ã"
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Running Tor Browser for the first time"
-msgstr "Tor Browserãåãã¦æ©å"
+msgstr "Tor Browserãåãã¦å®è¡"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
@@ -77,7 +77,7 @@ msgstr "Pluggable transports"
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Circumvention"
-msgstr ""
+msgstr "è¿å"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
@@ -87,7 +87,7 @@ msgstr "ããªãã¸"
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Managing identities"
-msgstr ""
+msgstr "èå¥åã®ç®¡ç"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
@@ -97,7 +97,7 @@ msgstr "ãªããªã³ãµã¼ãã¹"
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Secure Connections"
-msgstr ""
+msgstr "å®å¨ãªæ¥ç¶"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
@@ -134,12 +134,12 @@ msgstr "æ¢ç¥ã®åé¡"
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Becoming a Tor Translator"
-msgstr ""
+msgstr "Torã®ç¿»è¨³ãå©ãã"
 
 #: 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)
@@ -190,11 +190,14 @@ msgid ""
 " valid for a single session (until Tor Browser is exited or a [New Identity"
 "](/managing-identities/#new-identity) is requested)."
 msgstr ""
+"åæè¨å®ã§ã¯ãTor 
Browserã¯ãã©ã¦ã¸ã³ã°å±¥æ´ãä¸åä¿åããªãè¨å®ã«ãªã£ã¦ãã¾ããã¯ããã¼ã¯ã»ãã·ã§ã³ã®é(Tor
 "
+"Browserãçµäºãããã[æ°ããèå¥å](/managing-identities/#new-"
+"identity)ããªã¯ã¨ã¹ããããã¾ã§)ããä¿åããã¾ããã"
 
 #: 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)
@@ -232,7 +235,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)
@@ -274,7 +277,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)
@@ -284,6 +287,9 @@ msgid ""
 "mirrors, either through [EFF](https://tor.eff.org) or [Calyx "
 "Institute](https://tor.calyxinstitute.org)."
 msgstr ""
+"Torå¬å¼Webãµã¤ãããTor "
+"Browserããã¦ã³ãã¼ãã§ããªãå ´åã¯ãä»£ããã«å
¬å¼ãã©ã¼ã®[EFF](https://tor.eff.org)ã¾ãã¯[Calyx "
+"Institute](https://tor.calyxinstitute.org)ãããã¦ã³ãã¼ããã¦ã¿ã¦ãã
 ããã"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -325,11 +331,14 @@ msgid ""
 "â32-bitâ or â64-bitâ software: this depends on the model of the 
computer you"
 " are using."
 msgstr ""
+"GetTorã¯ãTor "
+"Browserããã¦ã³ãã¼ãã§ãããªã³ã¯ãæå·ç½²å(ãã¦ã³ãã¼ããããã¡ã¤ã«ã®æ¤è¨¼ã«å¿

è¦)ãç½²åã®ä½æã«ä½¿ç¨ãããã¼ã®ãã£ã³ã¬ã¼ããªã³ããããã³ãã¦ã³ãã¼ããããã¡ã¤ã«ã®ãã§ãã¯ãµã
 ãã¡ã¼ã«ã§è¿ä¿¡ãã¾ãã"
+" 
ä½¿ç¨ãã¦ããã³ã³ãã¥ã¼ã¿ã¼ã®ã¢ãã«ã«ãã£ã¦ã32ãããããã64ããããããå
¥åãã¦ãã ããã"
 
 #: 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)
@@ -338,11 +347,13 @@ msgid ""
 " Message to @get_tor with the words

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

2019-10-21 Thread translation

commit 53e2329ea951661caaf3bc7e723375cddd28f53e
Author: Translation commit bot 
Date:   Tue Oct 22 03:20:02 2019 +

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

diff --git a/contents+ja.po b/contents+ja.po
index f61b837f2..644306c57 100644
--- a/contents+ja.po
+++ b/contents+ja.po
@@ -4,6 +4,7 @@
 # ue zaeco, 2019
 # Emma Peel, 2019
 # erinm, 2019
+# h345u37g3 h345u37g3, 2019
 # 
 msgid ""
 msgstr ""
@@ -11,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: h345u37g3 h345u37g3, 2019\n"
 "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,7 +67,7 @@ msgstr "ãã¦ã³ãã¼ã"
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lrtopic.body)
 msgid "Running Tor Browser for the first time"
-msgstr ""
+msgstr "Tor Browserãåãã¦æ©å"
 
 #: https//tb-manual.torproject.org/menu/
 #: (content/menu/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/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed

2019-10-21 Thread translation

commit 99869c647371b8d27f866fbd562acf748952a0c5
Author: Translation commit bot 
Date:   Tue Oct 22 01:46:10 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
---
 templates/bridgedb.pot | 88 --
 1 file changed, 49 insertions(+), 39 deletions(-)

diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot
index b6a4ae6ce..129ca952d 100644
--- a/templates/bridgedb.pot
+++ b/templates/bridgedb.pot
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: 
'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
-"PO-Revision-Date: 2019-10-04 00:54+\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
+"PO-Revision-Date: 2019-10-22 01:44+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: English 
(http://www.transifex.com/otf/torproject/language/en/)\n"
 "MIME-Version: 1.0\n"
@@ -35,8 +35,8 @@ msgstr ""
 #. recompiled). `collection_size` sets the number of compiled templates which
 #. are cached before the least recently used ones are removed. See:
 #. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
-#. : Localisations which BridgeDB supports which should be rendered right-to-
-#. left.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -50,19 +50,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr ""
 
@@ -101,7 +105,8 @@ msgstr ""
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
@@ -123,17 +128,19 @@ msgstr ""
 msgid "Step %s2%s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr ""
@@ -142,27 +149,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -170,7 +177,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/distributors/https/templates/options.html:147
+#:

[tor-commits] [tor/master] scripts: Add git-setup-dirs.sh, which sets up maintainer git repos

2019-10-21 Thread nickm

commit 85d0a458c25e8fcc976f94f40178489497fd64d8
Author: teor 
Date:   Thu Oct 17 13:52:05 2019 +1000

scripts: Add git-setup-dirs.sh, which sets up maintainer git repos

git-setup-dirs.sh sets up an upstream git repository and worktrees,
so that tor maintainers can do merges.

Closes ticket 29603.
---
 scripts/git/git-setup-dirs.sh | 510 ++
 1 file changed, 510 insertions(+)

diff --git a/scripts/git/git-setup-dirs.sh b/scripts/git/git-setup-dirs.sh
new file mode 100755
index 0..87779c730
--- /dev/null
+++ b/scripts/git/git-setup-dirs.sh
@@ -0,0 +1,510 @@
+#!/usr/bin/env bash
+
+SCRIPT_NAME=`basename $0`
+
+function usage()
+{
+  echo "$SCRIPT_NAME [-h] [-n] [-u]"
+  echo
+  echo "  arguments:"
+  echo "   -h: show this help text"
+  echo "   -n: dry run mode"
+  echo "   (default: run commands)"
+  echo "   -u: if a directory or worktree already exists, use it"
+  echo "   (default: fail and exit on existing directories)"
+  echo
+  echo " env vars:"
+  echo "   required:"
+  echo "   TOR_FULL_GIT_PATH: where the git repository directories reside."
+  echo "   You must set this env var, we recommend \$HOME/git/"
+  echo "   (default: fail if this env var is not set;"
+  echo "   current: $GIT_PATH)"
+  echo
+  echo "   optional:"
+  echo "   TOR_MASTER: the name of the directory containing the tor.git clone"
+  echo "   The tor master git directory is \$GIT_PATH/\$TOR_MASTER"
+  echo "   (default: tor; current: $TOR_MASTER_NAME)"
+  echo "   TOR_WKT_NAME: the name of the directory containing the tor"
+  echo "   worktrees. The tor worktrees are:"
+  echo "   \$GIT_PATH/\$TOR_WKT_NAME/{maint-*,release-*}"
+  echo "   (default: tor-wkt; current: $TOR_WKT_NAME)"
+  echo "   TOR_GIT_ORIGIN_PULL: the origin remote pull URL."
+  echo "   (current: $GIT_ORIGIN_PULL)"
+  echo "   TOR_GIT_ORIGIN_PUSH: the origin remote push URL"
+  echo "   (current: $GIT_ORIGIN_PUSH)"
+  echo "   TOR_UPSTREAM_REMOTE_NAME: the default upstream remote."
+  echo "   If \$TOR_UPSTREAM_REMOTE_NAME is not 'origin', we have a"
+  echo "   separate upstream remote, and we don't push to origin."
+  echo "   (default: $DEFAULT_UPSTREAM_REMOTE)"
+  echo "   TOR_GITHUB_PULL: the tor-github remote pull URL"
+  echo "   (current: $GITHUB_PULL)"
+  echo "   TOR_GITHUB_PUSH: the tor-github remote push URL"
+  echo "   (current: $GITHUB_PUSH)"
+  echo "   we recommend that you set these env vars in your ~/.profile"
+}
+
+#
+# Configuration #
+#
+
+# Don't change this configuration - set the env vars in your .profile
+
+# Where are all those git repositories?
+GIT_PATH=${TOR_FULL_GIT_PATH:-"FULL_PATH_TO_GIT_REPOSITORY_DIRECTORY"}
+# The tor master git repository directory from which all the worktree have
+# been created.
+TOR_MASTER_NAME=${TOR_MASTER_NAME:-"tor"}
+# The worktrees location (directory).
+TOR_WKT_NAME=${TOR_WKT_NAME:-"tor-wkt"}
+
+# Origin repositories
+GIT_ORIGIN_PULL=${TOR_GIT_ORIGIN_PULL:-"https://git.torproject.org/tor.git"}
+GIT_ORIGIN_PUSH=${TOR_GIT_ORIGIN_PUSH:-"g...@git-rw.torproject.org:tor.git"}
+# The upstream remote which git.torproject.org/tor.git points to.
+DEFAULT_UPSTREAM_REMOTE=${TOR_UPSTREAM_REMOTE_NAME:-"upstream"}
+# Copy the URLs from origin
+GIT_UPSTREAM_PULL="$GIT_ORIGIN_PULL"
+GIT_UPSTREAM_PUSH="$GIT_ORIGIN_PUSH"
+# And avoid pushing to origin if we have an upstream
+if [ "$DEFAULT_UPSTREAM_REMOTE" != "origin" ]; then
+  GIT_ORIGIN_PUSH="No pushes to origin, if there is an upstream"
+fi
+# GitHub repositories
+GITHUB_PULL=${TOR_GITHUB_PULL:-"https://github.com/torproject/tor.git"}
+GITHUB_PUSH=${TOR_GITHUB_PUSH:-"No pushes to GitHub"}
+
+##
+# Git branches to manage #
+##
+
+# The branches and worktrees need to be modified when there is a new branch,
+# and when an old branch is no longer supported.
+
+# Configuration of the branches that needs merging. The values are in order:
+#   (0) current maint/release branch name
+#   (1) Full path of the git worktree
+#
+# First set of arrays are the maint-* branch and then the release-* branch.
+# New arrays need to be in the WORKTREE= array else they aren't considered.
+MAINT_029=( "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/maint-0.2.9" )
+MAINT_035=( "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/maint-0.3.5" )
+MAINT_040=( "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.0" )
+MAINT_041=( "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" )
+MAINT_042=( "maint-0.4.2" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" )
+MAINT_MASTER=( "master" "$GIT_PATH/$TOR_MASTER_NAME" )
+
+RELEASE_029=( "release-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" )
+RELEASE_035=( "release-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" )
+RELEASE_040=( "release-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.0" )
+RELEASE_041=( "release-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/release-0.4.1" )

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

2019-10-21 Thread nickm

commit b4e1dc747e996c5e0ee56930fec09d090eace032
Merge: 65c0df4db 85d0a458c
Author: Nick Mathewson 
Date:   Mon Oct 21 18:45:34 2019 -0400

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

 scripts/git/git-setup-dirs.sh | 510 ++
 1 file changed, 510 insertions(+)

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

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

2019-10-21 Thread nickm

commit 53aa159632ea5138614e974a2709c378dfe53cde
Merge: 400e31ad1 89ead08ee
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)



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

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

2019-10-21 Thread nickm

commit 7a35c8d8bec8243820149b4560429c3b91c35f74
Merge: 04e9e74f1 53aa15963
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)




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

[tor-commits] [tor/release-0.4.0] Appveyor: Use Windows Server 2019

2019-10-21 Thread nickm

commit f420b60c1918c1983ee940c4150e94ae9ead862e
Author: teor 
Date:   Sun Oct 20 19:39:48 2019 +1000

Appveyor: Use Windows Server 2019

Instead of Windows Server 2016.

Closes ticket 32086.
---
 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9913bf3bd..12713b751 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,8 +6,8 @@ clone_depth: 50
 # But we compile using MinGW, not Visual Studio.
 # We use these images because they have different Windows versions.
 image:
-  # Windows Server 2016
-  - Visual Studio 2017
+  # Windows Server 2019
+  - Visual Studio 2019
   # Windows Server 2012 R2
   - Visual Studio 2015
 
@@ -28,11 +28,11 @@ environment:
 matrix:
   # Don't keep building failing jobs
   fast_finish: true
-  # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server
+  # Skip the 32-bit Windows Server 2019 job, and the 64-bit Windows Server
   # 2012 R2 job, to speed up the build.
   # The environment variables must be listed without the 'environment' tag.
   exclude:
-- image: Visual Studio 2017
+- image: Visual Studio 2019
   target: i686-w64-mingw32
   compiler_path: mingw32
   mingw_prefix: mingw-w64-i686
diff --git a/changes/ticket32086 b/changes/ticket32086
new file mode 100644
index 0..b9312c2be
--- /dev/null
+++ b/changes/ticket32086
@@ -0,0 +1,3 @@
+  o Testing:
+- Use Windows Server 2019 instead of Windows Server 2016 in our
+  Appveyor builds. Closes ticket 32086.



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

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

2019-10-21 Thread nickm

commit 65c0df4dbf84cd5f72d43f6a200fc5c59c0bf19f
Merge: 8378ad29e 7a35c8d8b
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.2'

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

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

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

2019-10-21 Thread nickm

commit 53aa159632ea5138614e974a2709c378dfe53cde
Merge: 400e31ad1 89ead08ee
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)



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

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

2019-10-21 Thread nickm

commit f20e6102016df70db4d5f8d2d821457b881e3697
Merge: faecdace8 7a35c8d8b
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

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

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

2019-10-21 Thread nickm

commit 53aa159632ea5138614e974a2709c378dfe53cde
Merge: 400e31ad1 89ead08ee
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)



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

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

2019-10-21 Thread nickm

commit 89ead08eefbb2ab4201bc8286afcf99b1286bafc
Merge: e483257e1 f420b60c1
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)




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

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

2019-10-21 Thread nickm

commit 89ead08eefbb2ab4201bc8286afcf99b1286bafc
Merge: e483257e1 f420b60c1
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)




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

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

2019-10-21 Thread nickm

commit 89ead08eefbb2ab4201bc8286afcf99b1286bafc
Merge: e483257e1 f420b60c1
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)




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

[tor-commits] [tor/master] Appveyor: Use Windows Server 2019

2019-10-21 Thread nickm

commit f420b60c1918c1983ee940c4150e94ae9ead862e
Author: teor 
Date:   Sun Oct 20 19:39:48 2019 +1000

Appveyor: Use Windows Server 2019

Instead of Windows Server 2016.

Closes ticket 32086.
---
 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9913bf3bd..12713b751 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,8 +6,8 @@ clone_depth: 50
 # But we compile using MinGW, not Visual Studio.
 # We use these images because they have different Windows versions.
 image:
-  # Windows Server 2016
-  - Visual Studio 2017
+  # Windows Server 2019
+  - Visual Studio 2019
   # Windows Server 2012 R2
   - Visual Studio 2015
 
@@ -28,11 +28,11 @@ environment:
 matrix:
   # Don't keep building failing jobs
   fast_finish: true
-  # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server
+  # Skip the 32-bit Windows Server 2019 job, and the 64-bit Windows Server
   # 2012 R2 job, to speed up the build.
   # The environment variables must be listed without the 'environment' tag.
   exclude:
-- image: Visual Studio 2017
+- image: Visual Studio 2019
   target: i686-w64-mingw32
   compiler_path: mingw32
   mingw_prefix: mingw-w64-i686
diff --git a/changes/ticket32086 b/changes/ticket32086
new file mode 100644
index 0..b9312c2be
--- /dev/null
+++ b/changes/ticket32086
@@ -0,0 +1,3 @@
+  o Testing:
+- Use Windows Server 2019 instead of Windows Server 2016 in our
+  Appveyor builds. Closes ticket 32086.



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

[tor-commits] [tor/maint-0.4.2] Appveyor: Use Windows Server 2019

2019-10-21 Thread nickm

commit f420b60c1918c1983ee940c4150e94ae9ead862e
Author: teor 
Date:   Sun Oct 20 19:39:48 2019 +1000

Appveyor: Use Windows Server 2019

Instead of Windows Server 2016.

Closes ticket 32086.
---
 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9913bf3bd..12713b751 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,8 +6,8 @@ clone_depth: 50
 # But we compile using MinGW, not Visual Studio.
 # We use these images because they have different Windows versions.
 image:
-  # Windows Server 2016
-  - Visual Studio 2017
+  # Windows Server 2019
+  - Visual Studio 2019
   # Windows Server 2012 R2
   - Visual Studio 2015
 
@@ -28,11 +28,11 @@ environment:
 matrix:
   # Don't keep building failing jobs
   fast_finish: true
-  # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server
+  # Skip the 32-bit Windows Server 2019 job, and the 64-bit Windows Server
   # 2012 R2 job, to speed up the build.
   # The environment variables must be listed without the 'environment' tag.
   exclude:
-- image: Visual Studio 2017
+- image: Visual Studio 2019
   target: i686-w64-mingw32
   compiler_path: mingw32
   mingw_prefix: mingw-w64-i686
diff --git a/changes/ticket32086 b/changes/ticket32086
new file mode 100644
index 0..b9312c2be
--- /dev/null
+++ b/changes/ticket32086
@@ -0,0 +1,3 @@
+  o Testing:
+- Use Windows Server 2019 instead of Windows Server 2016 in our
+  Appveyor builds. Closes ticket 32086.



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

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

2019-10-21 Thread nickm

commit 7a35c8d8bec8243820149b4560429c3b91c35f74
Merge: 04e9e74f1 53aa15963
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

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

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

2019-10-21 Thread nickm

commit 89ead08eefbb2ab4201bc8286afcf99b1286bafc
Merge: e483257e1 f420b60c1
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)




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

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

2019-10-21 Thread nickm

commit 7a35c8d8bec8243820149b4560429c3b91c35f74
Merge: 04e9e74f1 53aa15963
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.1' into maint-0.4.2

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)




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

[tor-commits] [tor/release-0.4.2] Appveyor: Use Windows Server 2019

2019-10-21 Thread nickm

commit f420b60c1918c1983ee940c4150e94ae9ead862e
Author: teor 
Date:   Sun Oct 20 19:39:48 2019 +1000

Appveyor: Use Windows Server 2019

Instead of Windows Server 2016.

Closes ticket 32086.
---
 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9913bf3bd..12713b751 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,8 +6,8 @@ clone_depth: 50
 # But we compile using MinGW, not Visual Studio.
 # We use these images because they have different Windows versions.
 image:
-  # Windows Server 2016
-  - Visual Studio 2017
+  # Windows Server 2019
+  - Visual Studio 2019
   # Windows Server 2012 R2
   - Visual Studio 2015
 
@@ -28,11 +28,11 @@ environment:
 matrix:
   # Don't keep building failing jobs
   fast_finish: true
-  # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server
+  # Skip the 32-bit Windows Server 2019 job, and the 64-bit Windows Server
   # 2012 R2 job, to speed up the build.
   # The environment variables must be listed without the 'environment' tag.
   exclude:
-- image: Visual Studio 2017
+- image: Visual Studio 2019
   target: i686-w64-mingw32
   compiler_path: mingw32
   mingw_prefix: mingw-w64-i686
diff --git a/changes/ticket32086 b/changes/ticket32086
new file mode 100644
index 0..b9312c2be
--- /dev/null
+++ b/changes/ticket32086
@@ -0,0 +1,3 @@
+  o Testing:
+- Use Windows Server 2019 instead of Windows Server 2016 in our
+  Appveyor builds. Closes ticket 32086.



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

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

2019-10-21 Thread nickm

commit 1bdab681938d11bda40c700a99656f64add3f9aa
Merge: e5bce3a74 53aa15963
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

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

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

2019-10-21 Thread nickm

commit 53aa159632ea5138614e974a2709c378dfe53cde
Merge: 400e31ad1 89ead08ee
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

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

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

2019-10-21 Thread nickm

commit 53aa159632ea5138614e974a2709c378dfe53cde
Merge: 400e31ad1 89ead08ee
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)



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

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

2019-10-21 Thread nickm

commit f05cfda3e2744bad25588c47aa56c9c2a96a2f85
Merge: 3ab58706f 89ead08ee
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.4.0' into release-0.4.0

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/release-0.3.5] Appveyor: Use Windows Server 2019

2019-10-21 Thread nickm

commit f420b60c1918c1983ee940c4150e94ae9ead862e
Author: teor 
Date:   Sun Oct 20 19:39:48 2019 +1000

Appveyor: Use Windows Server 2019

Instead of Windows Server 2016.

Closes ticket 32086.
---
 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9913bf3bd..12713b751 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,8 +6,8 @@ clone_depth: 50
 # But we compile using MinGW, not Visual Studio.
 # We use these images because they have different Windows versions.
 image:
-  # Windows Server 2016
-  - Visual Studio 2017
+  # Windows Server 2019
+  - Visual Studio 2019
   # Windows Server 2012 R2
   - Visual Studio 2015
 
@@ -28,11 +28,11 @@ environment:
 matrix:
   # Don't keep building failing jobs
   fast_finish: true
-  # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server
+  # Skip the 32-bit Windows Server 2019 job, and the 64-bit Windows Server
   # 2012 R2 job, to speed up the build.
   # The environment variables must be listed without the 'environment' tag.
   exclude:
-- image: Visual Studio 2017
+- image: Visual Studio 2019
   target: i686-w64-mingw32
   compiler_path: mingw32
   mingw_prefix: mingw-w64-i686
diff --git a/changes/ticket32086 b/changes/ticket32086
new file mode 100644
index 0..b9312c2be
--- /dev/null
+++ b/changes/ticket32086
@@ -0,0 +1,3 @@
+  o Testing:
+- Use Windows Server 2019 instead of Windows Server 2016 in our
+  Appveyor builds. Closes ticket 32086.



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

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

2019-10-21 Thread nickm

commit 89ead08eefbb2ab4201bc8286afcf99b1286bafc
Merge: e483257e1 f420b60c1
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)




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

[tor-commits] [tor/release-0.4.1] Appveyor: Use Windows Server 2019

2019-10-21 Thread nickm

commit f420b60c1918c1983ee940c4150e94ae9ead862e
Author: teor 
Date:   Sun Oct 20 19:39:48 2019 +1000

Appveyor: Use Windows Server 2019

Instead of Windows Server 2016.

Closes ticket 32086.
---
 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9913bf3bd..12713b751 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,8 +6,8 @@ clone_depth: 50
 # But we compile using MinGW, not Visual Studio.
 # We use these images because they have different Windows versions.
 image:
-  # Windows Server 2016
-  - Visual Studio 2017
+  # Windows Server 2019
+  - Visual Studio 2019
   # Windows Server 2012 R2
   - Visual Studio 2015
 
@@ -28,11 +28,11 @@ environment:
 matrix:
   # Don't keep building failing jobs
   fast_finish: true
-  # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server
+  # Skip the 32-bit Windows Server 2019 job, and the 64-bit Windows Server
   # 2012 R2 job, to speed up the build.
   # The environment variables must be listed without the 'environment' tag.
   exclude:
-- image: Visual Studio 2017
+- image: Visual Studio 2019
   target: i686-w64-mingw32
   compiler_path: mingw32
   mingw_prefix: mingw-w64-i686
diff --git a/changes/ticket32086 b/changes/ticket32086
new file mode 100644
index 0..b9312c2be
--- /dev/null
+++ b/changes/ticket32086
@@ -0,0 +1,3 @@
+  o Testing:
+- Use Windows Server 2019 instead of Windows Server 2016 in our
+  Appveyor builds. Closes ticket 32086.



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

[tor-commits] [tor/maint-0.4.1] Appveyor: Use Windows Server 2019

2019-10-21 Thread nickm

commit f420b60c1918c1983ee940c4150e94ae9ead862e
Author: teor 
Date:   Sun Oct 20 19:39:48 2019 +1000

Appveyor: Use Windows Server 2019

Instead of Windows Server 2016.

Closes ticket 32086.
---
 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9913bf3bd..12713b751 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,8 +6,8 @@ clone_depth: 50
 # But we compile using MinGW, not Visual Studio.
 # We use these images because they have different Windows versions.
 image:
-  # Windows Server 2016
-  - Visual Studio 2017
+  # Windows Server 2019
+  - Visual Studio 2019
   # Windows Server 2012 R2
   - Visual Studio 2015
 
@@ -28,11 +28,11 @@ environment:
 matrix:
   # Don't keep building failing jobs
   fast_finish: true
-  # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server
+  # Skip the 32-bit Windows Server 2019 job, and the 64-bit Windows Server
   # 2012 R2 job, to speed up the build.
   # The environment variables must be listed without the 'environment' tag.
   exclude:
-- image: Visual Studio 2017
+- image: Visual Studio 2019
   target: i686-w64-mingw32
   compiler_path: mingw32
   mingw_prefix: mingw-w64-i686
diff --git a/changes/ticket32086 b/changes/ticket32086
new file mode 100644
index 0..b9312c2be
--- /dev/null
+++ b/changes/ticket32086
@@ -0,0 +1,3 @@
+  o Testing:
+- Use Windows Server 2019 instead of Windows Server 2016 in our
+  Appveyor builds. Closes ticket 32086.



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

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

2019-10-21 Thread nickm

commit b106467052f2549510bac0d4b0938be2d45dfdb9
Merge: a2af6e2b1 f420b60c1
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

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

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

2019-10-21 Thread nickm

commit 89ead08eefbb2ab4201bc8286afcf99b1286bafc
Merge: e483257e1 f420b60c1
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)




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

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

2019-10-21 Thread nickm

commit 89ead08eefbb2ab4201bc8286afcf99b1286bafc
Merge: e483257e1 f420b60c1
Author: Nick Mathewson 
Date:   Mon Oct 21 18:44:44 2019 -0400

Merge branch 'maint-0.3.5' into maint-0.4.0

 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

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

[tor-commits] [tor/maint-0.3.5] Appveyor: Use Windows Server 2019

2019-10-21 Thread nickm

commit f420b60c1918c1983ee940c4150e94ae9ead862e
Author: teor 
Date:   Sun Oct 20 19:39:48 2019 +1000

Appveyor: Use Windows Server 2019

Instead of Windows Server 2016.

Closes ticket 32086.
---
 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9913bf3bd..12713b751 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,8 +6,8 @@ clone_depth: 50
 # But we compile using MinGW, not Visual Studio.
 # We use these images because they have different Windows versions.
 image:
-  # Windows Server 2016
-  - Visual Studio 2017
+  # Windows Server 2019
+  - Visual Studio 2019
   # Windows Server 2012 R2
   - Visual Studio 2015
 
@@ -28,11 +28,11 @@ environment:
 matrix:
   # Don't keep building failing jobs
   fast_finish: true
-  # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server
+  # Skip the 32-bit Windows Server 2019 job, and the 64-bit Windows Server
   # 2012 R2 job, to speed up the build.
   # The environment variables must be listed without the 'environment' tag.
   exclude:
-- image: Visual Studio 2017
+- image: Visual Studio 2019
   target: i686-w64-mingw32
   compiler_path: mingw32
   mingw_prefix: mingw-w64-i686
diff --git a/changes/ticket32086 b/changes/ticket32086
new file mode 100644
index 0..b9312c2be
--- /dev/null
+++ b/changes/ticket32086
@@ -0,0 +1,3 @@
+  o Testing:
+- Use Windows Server 2019 instead of Windows Server 2016 in our
+  Appveyor builds. Closes ticket 32086.

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

[tor-commits] [tor/maint-0.4.0] Appveyor: Use Windows Server 2019

2019-10-21 Thread nickm

commit f420b60c1918c1983ee940c4150e94ae9ead862e
Author: teor 
Date:   Sun Oct 20 19:39:48 2019 +1000

Appveyor: Use Windows Server 2019

Instead of Windows Server 2016.

Closes ticket 32086.
---
 .appveyor.yml   | 8 
 changes/ticket32086 | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 9913bf3bd..12713b751 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -6,8 +6,8 @@ clone_depth: 50
 # But we compile using MinGW, not Visual Studio.
 # We use these images because they have different Windows versions.
 image:
-  # Windows Server 2016
-  - Visual Studio 2017
+  # Windows Server 2019
+  - Visual Studio 2019
   # Windows Server 2012 R2
   - Visual Studio 2015
 
@@ -28,11 +28,11 @@ environment:
 matrix:
   # Don't keep building failing jobs
   fast_finish: true
-  # Skip the 32-bit Windows Server 2016 job, and the 64-bit Windows Server
+  # Skip the 32-bit Windows Server 2019 job, and the 64-bit Windows Server
   # 2012 R2 job, to speed up the build.
   # The environment variables must be listed without the 'environment' tag.
   exclude:
-- image: Visual Studio 2017
+- image: Visual Studio 2019
   target: i686-w64-mingw32
   compiler_path: mingw32
   mingw_prefix: mingw-w64-i686
diff --git a/changes/ticket32086 b/changes/ticket32086
new file mode 100644
index 0..b9312c2be
--- /dev/null
+++ b/changes/ticket32086
@@ -0,0 +1,3 @@
+  o Testing:
+- Use Windows Server 2019 instead of Windows Server 2016 in our
+  Appveyor builds. Closes ticket 32086.



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

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

2019-10-21 Thread translation

commit 1b7a59e636e93d63efb1ae0d27f95cd20407f23b
Author: Translation commit bot 
Date:   Mon Oct 21 21:46:48 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+he.po | 17 +
 1 file changed, 17 insertions(+)

diff --git a/code_of_conduct+he.po b/code_of_conduct+he.po
index 5402e6eb0..1e83aa460 100644
--- a/code_of_conduct+he.po
+++ b/code_of_conduct+he.po
@@ -490,6 +490,9 @@ msgid ""
 "authority.  People in formal or informal leadership roles must model the "
 "highest standards of behavior."
 msgstr ""
+"×× × ××ª× ×× ×××ª× ××××ª ×× ××§××××ª, ×××£ ×××¨/×ª 
×§××××, ××¨×××ª × ××ª× × ××¡××ª ×××× ×¢× "
+"×¡××××ª ××§×××ª ××××××ª. ×× ×©×× ××ª×¤×§×××× ×× 
×××××× ×¨×©××××/×× ×¨×©×××× ×¦×¨××××/××ª ××©××© "
+"××××× ×××ª× ××××ª ××××× ××××ª×¨."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:192
@@ -498,6 +501,8 @@ msgid ""
 "expected to comply immediately. Please don't step in on someone else's "
 "behalf without their consent."
 msgstr ""
+"××¦××¤× ××× ×× ×©××ª××§×© ×¢\"× ×××¨/×ª ×§×××× ×××¨/×ª 
×××¤×¡××§ ×××ª× ×× ××¦××¨× ×× ××§××××ª "
+"×××¤×¡××§ ×××. ×× ×, ×× ×ª×××× ××©××× ×××©××/× 
×××¨/×ª ××× ××¡×××ª×/×."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:195
@@ -506,6 +511,8 @@ msgid ""
 "5. Where to go for help\n"
 "\n"
 msgstr ""
+"5. ××× ××××ª ××©××× ×¢××¨×\n"
+"\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:201
@@ -515,6 +522,9 @@ msgid ""
 "and information can be found on the Community Council wiki [1].  You can "
 "contact the whole Community council:"
 msgstr ""
+"×××¢×¦×ª ××§××××, ××× ×××£ × ×××¨ ××××¨×× ××ª××¨×× 
×××× ×-tor, ×©××××× ××¢×××¨ ×¢× "
+"×§×× ×¤×××§××× ××¨×× ×ª×ª-×§××××ª××ª. ×¤××××¡×××ª 
××××¢×¦× ×××××¢ × ××¡×£ ××× ×××××¦×¢ ×××××§× ×©× "
+"×××¢×ª ××§×××× [1]. ×ª×××× ×××¦××¨ ×§×©×¨ ×¢× ×× ×××¢×¦×:"
 
 #. type: Bullet: '  - '
 #: ../code_of_conduct.txt:203
@@ -536,6 +546,11 @@ msgid ""
 "involved in any discussion or documentation of the incident. More about the "
 "Community Council can be found in the guidelines [2]."
 msgstr ""
+"××¢×××ª ×××ª, ×× ××ª/× ××¨×××©/× ×©××© × ×××× ××× 
××¨×¡×× ××× ×××¨×/××ª ××××¢×¦×, ×ª×××× "
+"×××¦××¨ ×§×©×¨ ×¢× ×××¨×/××ª ××××¢×¦× ××××¤× × ×¤×¨×. 
××¤×ª×××ª ×-gpg ×©× ×××¨×/××ª ×××¢×¦×ª ××§××××"
+" × ××¦××× ×××××§× ×©× ×××¢×¦×ª ××§××××. ×× ××© × ×××× 
××× ××¨×¡××, ×××¨×/××ª ××××¢×¦× ××× ×××"
+" × ×××¢ ××¤×¨×©× ××ª×¤×§×××/×. ××/× ×× ×××× 
××¢××¨×××/××ª ××××× ×× ×× ×ª××¢×× ×× ×××¢ "
+"××ª×§×¨××ª. ×¢×× ×× ×××¢ ××××¢×¦×ª ××§×××× × ××¦× 
××§×××× ××× ××× [2]."
 
 #. type: Plain text
 #: ../code_of_conduct.txt:215
@@ -544,6 +559,8 @@ msgid ""
 "6. What to do if you witness unacceptable behavior\n"
 "\n"
 msgstr ""
+"6. ×× ××¢×©××ª ×× ×¨××××/××ª ××ª× ××××ª ×××ª× 
××§××××ª\n"
+"\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:230

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

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

2019-10-21 Thread translation

commit 663cf1a306c77f24c405983a8f7f51a87573e882
Author: Translation commit bot 
Date:   Mon Oct 21 21:16:50 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+he.po | 42 --
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/code_of_conduct+he.po b/code_of_conduct+he.po
index eecd479ca..5402e6eb0 100644
--- a/code_of_conduct+he.po
+++ b/code_of_conduct+he.po
@@ -242,7 +242,7 @@ msgstr "× ×¡× ×©××ª××£ ×¤×¢××× ××××××× ××¤× 
× ×§×× ×¤×××§×"
 #: ../code_of_conduct.txt:89
 msgid ""
 "Refrain from demeaning, discriminatory, or harassing behavior and speech."
-msgstr ""
+msgstr "×××× ×¢× ×××ª× ××××ª ×× ×©×× ××¤××× ×× ×ª××§×¤× 
×××."
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:92
@@ -250,6 +250,7 @@ msgid ""
 "Be mindful of your surroundings and of your fellow participants. Alert "
 "community leaders if you notice:"
 msgstr ""
+"××ª××©×× ××¡××××ª××/× ×××××¨×/××ª ××§××××. ×××××¨× 
××ª ×× ×××× ××§×××× ×× ×©××ª×/× ×× ×:"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:94
@@ -272,11 +273,13 @@ msgid ""
 "Remember that community event venues may be shared with members of the "
 "public. Please be respectful to everyone using these locations."
 msgstr ""
+"×ª×××¨× ×©×¨××××× ××××¨××¢×× ×§××××ª××× ×¢××××× 
×××ª×××§ ××× ××¦××××¨.  ×× × ×××× ××ª ××× "
+"×©× ××¦××× ×××§××××ª ×××. "
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:103
 msgid "Respect the privacy of your fellow community members."
-msgstr ""
+msgstr "×ª×××× ××ª ××¤×¨××××ª ×©× ×××¨×/××ª ××§××××"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:106
@@ -285,11 +288,13 @@ msgid ""
 "3. Unacceptable behaviors\n"
 "\n"
 msgstr ""
+"3. ××ª× ××××××ª ×× ××§×××××ª\n"
+"\n"
 
 #. type: Plain text
 #: ../code_of_conduct.txt:109
 msgid "The following behaviors are unacceptable within our community:"
-msgstr ""
+msgstr "××ª× ××××××ª ×× \"× ×× ××ª×§××× ××§×××× ×××:"
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:114
@@ -299,6 +304,9 @@ msgid ""
 "on a protected characteristic. (Display of weapons may constitute "
 "intimidation or a threat of violence.)"
 msgstr ""
+"××××××ª, ×ª×§××¤× ××× ××ª, ×××××× ×××××××ª ×× ×©×¤× 
××××× ×©××××× ×ª ×××× ×××¨, ×××××× "
+"××××××ª × ×× ××× ×× ×§×××¦× ×©××××¡×¡×ª ×¢× ×××¤××× 
×× ×©×××¨××. (××¦××ª × ×©×§ ×¢×××× ×××××©× "
+"×××××.)"
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:117
@@ -306,6 +314,8 @@ msgid ""
 "Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory"
 " jokes and language."
 msgstr ""
+"×©×¤× ×¡×§×¡××¡×××ª, ×××¢× ××ª, ×××××¤××××ª, ××¨× 
×¡××¤××××ª, ××××ª× ××ª (××¤××× ××××××¥  ××¢××ª "
+"×§×××××ª × ×× ×× ×©×× × ×××), ×× ×× ×©×¤×/××××× 
××¤×× ×××¨×ª."
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:122
@@ -314,6 +324,9 @@ msgid ""
 "(If it is necessary to share such material when working on Tor's mission, do"
 " so with sensitivity. Be aware that many people don't want to see it.)"
 msgstr ""
+"××¦××ª × ××¢×××ª ×ª××× ××× × ×× ×××× ××××. (×× × 
×××¥ ××©×ª×£ ××××¨×× ×××× ××©×¢××××× ×¢× "
+"×××©××× ×©× tor, ×× × ×¢×©× ×× ××¨×××©××ª. ×©××× ×× 
×©××¡' ×××ª× ××××× ×©× ×× ×©×× ×× ×¨××¦× "
+"××¨×××ª ×××ª)"
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:125
@@ -321,11 +334,12 @@ msgid ""
 "Posting or threatening to post other peopleâs personally identifying "
 "information (\"doxing\") without their consent."
 msgstr ""
+"××¢××× ×× ×××× ×××¢×××ª ××××¢ ×××× ×××©× ×©× ×× 
×©×× ×××¨×× (×××§×¡×× ×) ××× ××¡×××ª×/×."
 
 #. type: Bullet: '  * '
 #: ../code_of_conduct.txt:127
 msgid "Personal insults or attacks, particularly those related to:"
-msgstr ""
+msgstr "×ª×§××¤××ª ×× ××¢××××ª ×××©×××ª, ×××××× ××× 
×××ª××××¡××ª ×:"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:129
@@ -335,7 +349,7 @@ msgstr "×××××"
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:131
 msgid "gender identity or expression"
-msgstr ""
+msgstr "××××ª ×× ××××× ××××¨×"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:133
@@ -355,7 +369,7 @@ msgstr "××¢×¨×××ª ×××¡××"
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:139
 msgid "ability (whether bodily or mental)"
-msgstr ""
+msgstr "×××××ª (×¤××××ª ×× ×× ××××ª)"
 
 #. type: Bullet: '- '
 #: ../code_of_conduct.txt:141
@@ -400,7 +414,7 @@

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

2019-10-21 Thread translation

commit cc0b05475cfec4223c95b7d065572599e9663562
Author: Translation commit bot 
Date:   Mon Oct 21 20:46:51 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=policies-code_of_conducttxtpot
---
 code_of_conduct+he.po | 667 ++
 1 file changed, 667 insertions(+)

diff --git a/code_of_conduct+he.po b/code_of_conduct+he.po
new file mode 100644
index 0..eecd479ca
--- /dev/null
+++ b/code_of_conduct+he.po
@@ -0,0 +1,667 @@
+# Code of conduct of the tor project
+# Copyright (C) 2019 tor project.
+# This Code of Conduct is licensed under a Creative Commons CC-BY-SA 4.0
+# International license.e.
+# FIRST AUTHOR , YEAR.
+# 
+# Translators:
+# ION, 2019
+# ido vasserman , 2019
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: Code of conduct of the Tor Project\n"
+"POT-Creation-Date: 2019-08-02 12:00+\n"
+"PO-Revision-Date: 2019-08-27 18:54+\n"
+"Last-Translator: ido vasserman , 2019\n"
+"Language-Team: Hebrew (https://www.transifex.com/otf/teams/1519/he/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 
1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:1 ../code_of_conduct.txt:24
+#: ../code_of_conduct.txt:51 ../code_of_conduct.txt:75
+#: ../code_of_conduct.txt:104 ../code_of_conduct.txt:180
+#: ../code_of_conduct.txt:193 ../code_of_conduct.txt:213
+#: ../code_of_conduct.txt:231 ../code_of_conduct.txt:243
+#: ../code_of_conduct.txt:253 ../code_of_conduct.txt:278
+#, no-wrap
+msgid "\n"
+msgstr "\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:3
+#, no-wrap
+msgid ""
+"Tor Project Code of Conduct\n"
+"\n"
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:6
+msgid "Statement of Intent:"
+msgstr "××¦××¨×ª ×××× ××ª:"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:10
+msgid ""
+"The Tor Project is committed to fostering an inclusive environment and "
+"community. Tor is a place where people should feel safe to engage, share "
+"their point of view, and participate."
+msgstr ""
+"×¤×¨×××§× tor  ××××× ×××¤× ×§×××× ××¡××× ×××××. tor 
××× ××§×× ×× ×× ×©×× ××××¨×× "
+"×××¨×××© ×××××× ×××××, ×××××§ × ×§×××ª ×××, 
×××§××ª ×××§."
+
+#. type: Plain text
+#: ../code_of_conduct.txt:15
+msgid ""
+"This code of conduct applies to The Tor Project as a whole. It is intended "
+"to provide guidelines for contributors. Employees and contractors of The Tor"
+" Project, Inc. (TPI) are also subject to company policies and procedures. "
+"Those people should feel free to contact HR with questions or concerns."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:23
+msgid ""
+"This code of conduct is not exhaustive or complete. It is an ongoing effort "
+"to summarize our shared understanding. We want to provide a welcoming, safe "
+"environment, so we can work together to pursue powerful solutions. We "
+"reserve the right to deviate from strictly enforcing this code. Any "
+"deviations must produce an outcome which is fairer, and aligned with our "
+"values. We understand that keeping a living document relevant and 
âpatchedâ "
+"involves sustained effort."
+msgstr ""
+
+#. type: Plain text
+#: ../code_of_conduct.txt:26
+#, no-wrap
+msgid ""
+"0. Summary: Don't be a jerk. Be awesome instead.\n"
+"\n"
+msgstr "0. ××¡××××: ×× ×ª××× ×× ×××§. ×ª××× ×××××.\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:29
+msgid "The Tor community should be a good place where people are glad to be."
+msgstr "×§××××ª tor ××××¨× ×××××ª ××§×× ××× ×× ×× ×©×× 
×©×××× ×××××ª."
+
+#. type: Plain text
+#: ../code_of_conduct.txt:31
+#, no-wrap
+msgid "  DO: Be kind, thoughtful, and considerate.\n"
+msgstr "×ª××× × ××××× ×××ª××©×××.\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:33
+#, no-wrap
+msgid "  DO: Make Tor a place where people are happy and comfortable.\n"
+msgstr "×ª××¤×× ××ª tor ×××§×× ×× ×× ×©×× ×©×××× ×× ×× 
××× ×××××ª ××.\n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:36
+#, no-wrap
+msgid ""
+"  DO: Remember: We are all contributing; we are all learning. Nobody was 
born\n"
+"an expert.\n"
+msgstr "×ª×××¨×, ×××× × ×ª××¨×××; ×××× × ××××××. ××£ 
××× ×× × ××× ×××××. \n"
+
+#. type: Plain text
+#: ../code_of_conduct.txt:38
+#, no-wrap
+msgid "  DO: Yield the floor. Listen. Make sure everyone gets heard.\n"
+msgstr ""
+
+#. type: Plain text
+#:

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

2019-10-21 Thread translation

commit 91f850a5004f205623e336ab45a3970d9e51eb90
Author: Translation commit bot 
Date:   Mon Oct 21 19:45:41 2019 +


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

diff --git a/locale/nl/LC_MESSAGES/messages.po 
b/locale/nl/LC_MESSAGES/messages.po
index d331778c8..a5a67f990 100644
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/locale/nl/LC_MESSAGES/messages.po
@@ -8,12 +8,12 @@
 # kwadronaut , 2018
 # Ash , 2019
 # Nathan Follens, 2019
-# Tonnes , 2019
 # Meteor 0id, 2019
+# Tonnes , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Meteor 0id, 2019\n"
+"Last-Translator: Tonnes , 2019\n"
 "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -135,11 +135,11 @@ msgstr "Wilt u doneren via creditcard of PayPal?"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:92
 msgid "Donate using BTCPayServer"
-msgstr "doneren met BTCPayServer"
+msgstr "Doneren met BTCPayServer"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:126
 msgid "Donate using wallet addresses"
-msgstr "Doneren met portefeuille-adres"
+msgstr "Doneren met portefeuilleadressen"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:133
 msgid ""
@@ -158,8 +158,8 @@ msgstr ""
 msgid ""
 "Below you will find the cryptocurrencies we accept and our wallet addresses."
 msgstr ""
-"Hieronder vind je de cryptovaluta die we ondersteunen en ons portefeuille-"
-"adres."
+"Hieronder vindt u de cryptovaluta die we ondersteunen, en onze "
+"portefeuilleadressen."
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:143
 msgid ""
@@ -234,7 +234,7 @@ msgstr "Stuur me vanaf nu nieuws over het Tor Project per 
e-mail."
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:208
 #: 
tmp/cache_locale/a1/a1384b9a21e3d43e946972b01389567dff845ee982dcf05228aa3e5096a74210.php:105
 msgid "Wallet Addresses"
-msgstr "Portefeuille-adressen"
+msgstr "Portefeuilleadressen"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:212
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:333

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

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

2019-10-21 Thread translation

commit 8508420e65c25e1c22ec29262fbcd10ca0ba81d3
Author: Translation commit bot 
Date:   Mon Oct 21 19:19:57 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index dd08d1fd7..d7b09774b 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2,8 +2,6 @@
 # Emma Peel, 2018
 # Curtis Baltimore , 2019
 # erinm, 2019
-# Simon-Olivier Morneau , 2019
-# robin Amielh , 2019
 # AO , 2019
 # 
 msgid ""
@@ -207,7 +205,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
 msgid "# HOW TOR WORKS"
-msgstr "# COMMENT FONCTIONNE TOR"
+msgstr "# LE FONCTIONNEMENT DE TOR"
 
 #: https//tb-manual.torproject.org/about/
 #: (content/about/contents+en.lrtopic.body)
@@ -481,8 +479,9 @@ msgstr ""
 "votre connexion. Si vous ne pensez pas que câest le cas, sÃ©lectionnez Â«Â 
NonÂ "
 "Â». Si vous savez que votre connexion est censurÃ©e ou si vous avez tentÃ© 
sans"
 " succÃ¨s de vous connecter au rÃ©seauÂ Tor et quâaucune autre solution 
nâa "
-"fonctionnÃ©, sÃ©lectionnez Â«Â OuiÂ Â». LâÃ©cran 
[Contournement](/circumvention) "
-"apparaÃ®tra alors afin que vous configuriez un transport enfichable."
+"fonctionnÃ©, sÃ©lectionnez Â«Â OuiÂ Â». LâÃ©cran "
+"[Contournement](/fr/circumvention/) apparaÃ®tra alors afin que vous "
+"configuriez un transport enfichable."
 
 #: https//tb-manual.torproject.org/running-tor-browser/
 #: (content/running-tor-browser/contents+en.lrtopic.body)
@@ -533,7 +532,7 @@ msgid ""
 "so an adversary cannot identify them easily. Using bridges in combination "
 "with pluggable transports helps to disguise the fact that you are using Tor."
 msgstr ""
-"La plupart des [transports enfichables](/transports), tels quâobfs3 et "
+"La plupart des [transports enfichables](/fr/transports), tels quâobfs3 et "
 "obfs4, comptent sur lâutilisation de relais-ponts. Comme les relais Tor "
 "ordinaires, les ponts sont gÃ©rÃ©s par des bÃ©nÃ©volesâ; cependant, "
 "contrairement aux relais ordinaires, ils ne sont pas rÃ©pertoriÃ©s "
@@ -1188,14 +1187,14 @@ msgid ""
 " does not clear any private information or unlink your activity, nor does it"
 " affect your current connections to other websites."
 msgstr ""
-"Cette option est utile si la [sortie](#exit) que vous utilisez nâarrive pas 
"
-"Ã  se connecter au site Web dont vous avez besoin ou ne le charge pas "
-"correctement. En la sÃ©lectionnant, la fenÃªtre ou lâonglet actif sera "
-"rechargÃ© sur un nouveau [circuitÂ Tor](#circuit). Les autres fenÃªtres et "
-"onglets ouverts du mÃªme site Web utiliseront aussi le nouveau circuit quand "
-"ils seront rechargÃ©s. Cette option nâefface aucun renseignement personnel, 
"
-"ni ne dissocie votre activitÃ©, ni nâaffectera vos connexions actuelles Ã  "
-"dâautres sites Web."
+"Cette option est utile si le [relais de sortie](/fr/about/#le-"
+"fonctionnemment-de-tor) que vous utilisez nâarrive pas Ã  se connecter au "
+"site Web dont vous avez besoin ou ne le charge pas correctement. En la "
+"sÃ©lectionnant, la fenÃªtre ou lâonglet actif sera rechargÃ© sur un nouveau 
"
+"circuitÂ Tor. Les autres fenÃªtres et onglets ouverts du mÃªme site Web "
+"utiliseront aussi le nouveau circuit quand ils seront rechargÃ©s. Cette "
+"option nâefface aucun renseignement personnel, ni ne dissocie votre "
+"activitÃ©, ni nâaffectera vos connexions actuelles Ã  dâautres sites Web."
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/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/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed

2019-10-21 Thread translation

commit 3cb0c0a8474bb2776d6de33ee43923428f2c61f2
Author: Translation commit bot 
Date:   Mon Oct 21 18:53:12 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
---
 contents+fr.po | 1582 
 1 file changed, 1582 insertions(+)

diff --git a/contents+fr.po b/contents+fr.po
new file mode 100644
index 0..43e65b073
--- /dev/null
+++ b/contents+fr.po
@@ -0,0 +1,1582 @@
+# Translators:
+# Martus Translations , 2019
+# ducki2p , 2019
+# Curtis Baltimore , 2019
+# erinm, 2019
+# Emma Peel, 2019
+# AO , 2019
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-10-18 16:11+CET\n"
+"PO-Revision-Date: 2019-03-09 10:41+\n"
+"Last-Translator: AO , 2019\n"
+"Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.title)
+msgid "Anonymity Online"
+msgstr "Lâanonymat en ligne"
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.section)
+msgid "home"
+msgstr "accueil"
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.body)
+msgid "## ABOUT US ##"
+msgstr "## Ã PROPOS DE NOUS ##"
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.body)
+msgid ""
+"We believe everyone should be able to explore the internet with privacy."
+msgstr ""
+"Nous pensons que tout le monde devrait pouvoir explorer Internet en toute "
+"confidentialitÃ©, avec lâassurance que leurs donnÃ©es personnelles seront "
+"protÃ©gÃ©es."
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.body)
+msgid "We are the Tor Project, a 501(c)3 US nonprofit."
+msgstr ""
+"Nous sommes le ProjetÂ Tor, un organisme Ã©tats-unien sans but lucratifÂ "
+"501(c)(3)."
+
+#: https//www.torproject.org/ (content/contents+en.lrpage.body)
+msgid ""
+"We advance human rights and defend your privacy online through free software"
+" and open networks. [Meet our team](about/people)."
+msgstr ""
+"Nous faisons progresser les droits de la personne et dÃ©fendons la protection"
+" sur Internet de votre vie privÃ©e et de vos donnÃ©es personnelles grÃ¢ce Ã  
des"
+" logiciels gratuits et Ã  des rÃ©seaux ouverts. [Rencontrez notre "
+"Ã©quipe](about/people)."
+
+#: https//www.torproject.org/contact/
+#: (content/contact/contents+en.lrpage.title)
+msgid "Contact"
+msgstr "Contact"
+
+#: https//www.torproject.org/contact/
+#: (content/contact/contents+en.lrpage.section)
+#: https//www.torproject.org/thank-you/
+#: (content/thank-you/contents+en.lrpage.section)
+msgid "The Tor Project"
+msgstr "Le ProjetÂ Tor"
+
+#: https//www.torproject.org/contact/
+#: (content/contact/contents+en.lrpage.body)
+msgid "### Get Support"
+msgstr "### Obtenir de lâassistance"
+
+#: https//www.torproject.org/contact/
+#: (content/contact/contents+en.lrpage.body)
+msgid ""
+"Need help? Visit our [Support Portal](https://support.torproject.org) for "
+"answers to frequently asked questions about connecting to Tor, circumventing"
+" censorship, using onion services, and more."
+msgstr ""
+"Avez-vous besoin dâaideâ? Visitez notre [portail "
+"dâassistance](https://support.torproject.org/fr/) pour obtenir des 
rÃ©ponses "
+"aux questions les plus frÃ©quentes sur la connexion Ã  Tor, le contournement "
+"de la censure, lâutilisation des services onion et plus encore."
+
+#: https//www.torproject.org/download/
+#: (content/download/contents+en.lrpage.title)
+#: (content/download/contents+en.lrpage.section)
+#: https//www.torproject.org/download/alpha/
+#: (content/download/alpha/contents+en.lrpage.section)
+#: https//www.torproject.org/download/languages/
+#: (content/download/languages/contents+en.lrpage.section)
+#: https//www.torproject.org/download/tor/
+#: (content/download/tor/contents+en.lrpage.section)
+msgid "Download"
+msgstr "TÃ©lÃ©chargement"
+
+#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.title)
+msgid "Sponsors"
+msgstr "Commanditaires"
+
+#: https//www.torproject.org/menu/ (content/menu/contents+en.lrpage.section)
+#: https//www.torproject.org/about/ (content/about/contents+en.lrpage.section)
+#: https//www.torproject.org/about/cy-pres/
+#: (content/about/cy-pres/contents+en.lrpage.section)
+#: https//www.torproject.org/about/trademark/
+#: (content/about/trademark/contents+en.lrtrademark.section)
+#: https//www.torproject.org/about/history/
+#: (content/about/history/contents+en.lrpage.section)
+#: https//www.torproject.org/about/people/
+#: (content/about/people/contents+en.lrpeople.section)
+#: https//www.torproject.org/about/sponsors/
+#: (content/about/sponsors/contents+en.lrsponsors.section)
+#: https//www.torproject.org/about/reports/
+#: (content/about/reports/contents+en.lrreports.section)
+#:

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

2019-10-21 Thread translation

commit 37365b1f40a4744698a62db9a3caff5d3fa7b6da
Author: Translation commit bot 
Date:   Mon Oct 21 18:53:02 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 03a205b32..43e65b073 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -4,7 +4,6 @@
 # Curtis Baltimore , 2019
 # erinm, 2019
 # Emma Peel, 2019
-# Thomas PrÃ©vost , 2019
 # AO , 2019
 # 
 msgid ""
@@ -914,7 +913,7 @@ msgstr "Le site que vous visitez."
 
 #: lego/templates/secure-connections.html:44
 msgid "user / pw"
-msgstr "user / pw"
+msgstr "utilisat./mdp"
 
 #: lego/templates/secure-connections.html:47
 msgid "Username and password used for authentication."
@@ -923,11 +922,11 @@ msgstr ""
 
 #: lego/templates/secure-connections.html:51
 msgid "data"
-msgstr "data"
+msgstr "donnÃ©es"
 
 #: lego/templates/secure-connections.html:54
 msgid "Data being transmitted."
-msgstr "Les donnÃ©es qui sont transmises."
+msgstr "Les donnÃ©es transmises."
 
 #: lego/templates/secure-connections.html:58
 msgid "location"
@@ -947,7 +946,7 @@ msgstr "Si Tor est utilisÃ© ou non."
 
 #: templates/contact.html:8
 msgid "Chat with us on"
-msgstr "Clavardez avec nous sur"
+msgstr "Dialoguez en ligne avec nous sur"
 
 #: templates/contact.html:9
 msgid "Ask questions about using Tor."
@@ -1056,14 +1055,14 @@ msgid ""
 "infrastructure, please email tor-secur...@lists.torproject.org. If you've "
 "found a security bug in Tor or Tor Browser, feel free to submit it for our"
 msgstr ""
-"Si vous trouvez une faille de sÃ©curitÃ© dans l'un de nos projets ou notre "
-"infrastructure, envoyez un courriel Ã  tor-secur...@lists.torproject.org. Si "
-"vous trouvez une faille de sÃ©curitÃ© dans Tor ou le Navigateur Tor, 
n'hÃ©sitez"
-" pas Ã  le signaler pour notre "
+"Si vous avez trouvÃ© un problÃ¨me de sÃ©curitÃ© dans lâun de nos projets ou 
dans"
+" notre infrastructure, veuillez envoyer un courriel Ã  tor-"
+"secur...@lists.torproject.org.Â  Si vous avez trouvÃ© une bogue de sÃ©curitÃ© 
"
+"dans Tor ou dans le NavigateurÂ Tor, n'hÃ©sitez pas Ã  le soumettre pour 
notre "
 
 #: templates/contact.html:80
 msgid "bug bounty program."
-msgstr ""
+msgstr "programme de prime aux bogues"
 
 #: templates/contact.html:80
 msgid ""
@@ -1071,6 +1070,10 @@ msgid ""
 "list by contacting tor-security-send...@lists.torproject.org or from pool"
 ".sks-keyservers.net. Here is the fingerprint:"
 msgstr ""
+"Si vous souhaitez chiffrer votre courriel, vous pouvez obtenir la clÃ© "
+"publique GPG de la liste en contactant tor-security-"
+"send...@lists.torproject.org ou sur pool.sks-keyservers.net. En voici "
+"lâempreinte numÃ©riqueÂ :"
 
 #: templates/contact.html:100
 msgid "Email us"
@@ -1083,6 +1086,11 @@ msgid ""
 "email frontd...@torproject.org. For donor-related questions, contact "
 "giv...@torproject.org"
 msgstr ""
+"Pour les questions et les commentaires Ã  propos de Tor, lâorganisme sans 
but"
+" lucratifÂ : questions sur la marque de commerce, affiliation et "
+"coordination, demandes de contrat, etc., veuillez envoyer un courriel Ã  "
+"frontd...@torproject.org. Pour toute question concernant les donateurs, "
+"veuillez contacter giv...@torproject.org"
 
 #: templates/contact.html:107
 msgid "Send us Mail"

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

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

2019-10-21 Thread translation

commit d7729cc65f22f2678febdceb0d41d5882fcfba2f
Author: Translation commit bot 
Date:   Mon Oct 21 18:50:06 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index dbd1771ca..dd08d1fd7 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -3,8 +3,8 @@
 # Curtis Baltimore , 2019
 # erinm, 2019
 # Simon-Olivier Morneau , 2019
-# AO , 2019
 # robin Amielh , 2019
+# AO , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +12,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: robin Amielh , 2019\n"
+"Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1473,7 +1473,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/contents+en.lrtopic.body)
 msgid "data"
-msgstr "data"
+msgstr "donnÃ©es"
 
 #: https//tb-manual.torproject.org/secure-connections/
 #: (content/secure-connections/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/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-10-21 Thread translation

commit 8f23c5c51e72ff51304166a2c02c1ca553a5c02c
Author: Translation commit bot 
Date:   Mon Oct 21 17:54:14 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+pt-BR.po | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index e6506434a..d5149ec29 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -1043,6 +1043,9 @@ msgid ""
 "list by contacting tor-security-send...@lists.torproject.org or from pool"
 ".sks-keyservers.net. Here is the fingerprint:"
 msgstr ""
+"Se vocÃª quiser criptografar seu e-mail, poderÃ¡ obter a chave pÃºblica GPG 
da "
+"lista entrando em contato tor-security-send...@lists.torproject.org ou em "
+"pool.sks-keyservers.net. Aqui estÃ¡ a impressÃ£o digital:"
 
 #: templates/contact.html:100
 msgid "Email us"
@@ -1055,6 +1058,10 @@ msgid ""
 "email frontd...@torproject.org. For donor-related questions, contact "
 "giv...@torproject.org"
 msgstr ""
+"Para perguntas e comentÃ¡rios sobre a organizaÃ§Ã£o sem fins lucrativos Tor: "
+"perguntas sobre marcas registradas, afiliaÃ§Ã£o e coordenaÃ§Ã£o, consultas de 
"
+"contratos, etc., envie um email frontd...@torproject.org. Para perguntas "
+"relacionadas a doadores, entre em contato com giv...@torproject.org"
 
 #: templates/contact.html:107
 msgid "Send us Mail"

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

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

2019-10-21 Thread translation

commit be540e60545890841c22a542f1737084d8f86191
Author: Translation commit bot 
Date:   Mon Oct 21 17:22:56 2019 +

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

diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index c6048db77..0fa2345c4 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -10,9 +10,9 @@
 # Communia , 2019
 # Greg Strider , 2019
 # Danihells , 2019
-# Eduardo Addad de Oliveira , 2019
 # erinm, 2019
 # Emma Peel, 2019
+# Eduardo Addad de Oliveira , 2019
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-18 16:11+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

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

2019-10-21 Thread translation

commit b3f8388f613b431d14c0cbad944b208e85c4e410
Author: Translation commit bot 
Date:   Mon Oct 21 17:22:47 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
 contents+fr.po|  8 
 contents+pt-BR.po | 12 
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/contents+fr.po b/contents+fr.po
index ca4240a05..03a205b32 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -2,10 +2,10 @@
 # Martus Translations , 2019
 # ducki2p , 2019
 # Curtis Baltimore , 2019
-# AO , 2019
 # erinm, 2019
 # Emma Peel, 2019
 # Thomas PrÃ©vost , 2019
+# AO , 2019
 # 
 msgid ""
 msgstr ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-18 16:11+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Thomas PrÃ©vost , 2019\n"
+"Last-Translator: AO , 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -862,7 +862,7 @@ msgid ""
 "Click the âTorâ button to see what data is visible to observers when 
you're "
 "using Tor. The button will turn green to indicate that Tor is on."
 msgstr ""
-"Cliquez sur le bouton Â« Tor Â» pour voir quelles donnÃ©es sont visibles pour 
"
+"Cliquez sur le bouton Â«Â TorÂ Â» pour voir quelles donnÃ©es sont visibles 
pour "
 "les observateurs quand vous utilisez Tor. Le bouton deviendra vert pour "
 "indiquer que Tor est activÃ©."
 
@@ -871,7 +871,7 @@ msgid ""
 "Click the âHTTPSâ button to see what data is visible to observers when "
 "you're using HTTPS. The button will turn green to indicate that HTTPS is on."
 msgstr ""
-"Cliquez sur le bouton Â« HTTPS Â» pour voir quelles donnÃ©es sont visibles 
pour"
+"Cliquez sur le bouton Â«Â HTTPSÂ Â» pour voir quelles donnÃ©es sont visibles 
pour"
 " les observateurs quand vous utilisez HTTPS. Le bouton deviendra vert pour "
 "indiquer que HTTPS est activÃ©."
 
diff --git a/contents+pt-BR.po b/contents+pt-BR.po
index 53e88dfdd..e6506434a 100644
--- a/contents+pt-BR.po
+++ b/contents+pt-BR.po
@@ -10,9 +10,9 @@
 # Communia , 2019
 # Greg Strider , 2019
 # Danihells , 2019
-# Eduardo Addad de Oliveira , 2019
 # erinm, 2019
 # Emma Peel, 2019
+# Eduardo Addad de Oliveira , 2019
 # 
 msgid ""
 msgstr ""
@@ -20,7 +20,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-10-18 16:11+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: Eduardo Addad de Oliveira , 2019\n"
 "Language-Team: Portuguese (Brazil) 
(https://www.transifex.com/otf/teams/1519/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -876,7 +876,7 @@ msgstr "Tor"
 
 #: lego/templates/secure-connections.html:32
 msgid "POTENTIALLY VISIBLE DATA"
-msgstr ""
+msgstr "DADOS POTENCIALMENTE VISÃVEIS"
 
 #: lego/templates/secure-connections.html:37
 msgid "Site.com"
@@ -1028,10 +1028,14 @@ msgid ""
 "infrastructure, please email tor-secur...@lists.torproject.org. If you've "
 "found a security bug in Tor or Tor Browser, feel free to submit it for our"
 msgstr ""
+"Se vocÃª encontrou um problema de seguranÃ§a em um de nossos projetos ou em "
+"nossa infraestrutura, envie um e-mail tor-secur...@lists.torproject.org. Se "
+"vocÃª encontrou um erro de seguranÃ§a no Tor ou no Navegador Tor, sinta-se Ã  
"
+"vontade para enviÃ¡-lo para nosso"
 
 #: templates/contact.html:80
 msgid "bug bounty program."
-msgstr ""
+msgstr "programa de recompensa de erros."
 
 #: templates/contact.html:80
 msgid ""

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

[tor-commits] [tor/master] routermode.h: turn a comment into a doxygen comment.

2019-10-21 Thread nickm

commit 8378ad29e6454b92f9a48f05c1d7dbdf2ae8cfe3
Author: Nick Mathewson 
Date:   Mon Oct 21 12:47:17 2019 -0400

routermode.h: turn a comment into a doxygen comment.
---
 src/feature/relay/routermode.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/feature/relay/routermode.h b/src/feature/relay/routermode.h
index ddf621e5c..f6195a869 100644
--- a/src/feature/relay/routermode.h
+++ b/src/feature/relay/routermode.h
@@ -22,7 +22,7 @@ MOCK_DECL(int, advertised_server_mode, (void));
 
 void set_server_advertised(int s);
 
-/* Is the relay module enabled? */
+/** Is the relay module enabled? */
 #define have_module_relay() (1)
 
 #else

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

[tor-commits] [tor/master] dirauth: Add a macro comment to have_module_dirauth()

2019-10-21 Thread nickm

commit 475dffee424610593e9433b78a1fbb5bbabe69a4
Author: teor 
Date:   Sun Oct 20 18:01:52 2019 +1000

dirauth: Add a macro comment to have_module_dirauth()
---
 src/feature/dirauth/authmode.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/feature/dirauth/authmode.h b/src/feature/dirauth/authmode.h
index bfd5f4dc0..11bc40d8d 100644
--- a/src/feature/dirauth/authmode.h
+++ b/src/feature/dirauth/authmode.h
@@ -27,6 +27,7 @@ authdir_mode_v3(const or_options_t *options)
   return authdir_mode(options) && options->V3AuthoritativeDir != 0;
 }
 
+/* Is the dirauth module enabled? */
 #define have_module_dirauth() (1)
 
 #else /* !defined(HAVE_MODULE_DIRAUTH) */



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

[tor-commits] [tor/master] test: Skip test scripts that require the relay module

2019-10-21 Thread nickm

commit 012c44538ce15a3e45d6cdea0935062bdcaf5bf4
Author: teor 
Date:   Fri Oct 18 18:00:00 2019 +1000

test: Skip test scripts that require the relay module

When tor is built without the relay module.

Part of 32123.
---
 src/test/test_key_expiration.sh   | 5 +
 src/test/test_keygen.sh   | 5 -
 src/test/test_zero_length_keys.sh | 5 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh
index 54abb4a2f..9d42c1cc4 100755
--- a/src/test/test_key_expiration.sh
+++ b/src/test/test_key_expiration.sh
@@ -28,6 +28,11 @@ else
   TOR_BINARY="${TESTING_TOR_BINARY}"
 fi
 
+if "$TOR_BINARY" --list-modules | grep -q "relay: no"; then
+  echo "This test requires the relay module. Skipping." >&2
+  exit 77
+fi
+
 if [ $# -ge 1 ]; then
   dflt=0
 else
diff --git a/src/test/test_keygen.sh b/src/test/test_keygen.sh
index cbdfd1909..57df88827 100755
--- a/src/test/test_keygen.sh
+++ b/src/test/test_keygen.sh
@@ -28,7 +28,10 @@ else
   TOR_BINARY="${TESTING_TOR_BINARY}"
 fi
 
-
+if "$TOR_BINARY" --list-modules | grep -q "relay: no"; then
+  echo "This test requires the relay module. Skipping." >&2
+  exit 77
+fi
 
   if [ $# -ge 1 ]; then
   dflt=0
diff --git a/src/test/test_zero_length_keys.sh 
b/src/test/test_zero_length_keys.sh
index 84ca513b0..eeabab352 100755
--- a/src/test/test_zero_length_keys.sh
+++ b/src/test/test_zero_length_keys.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 # Check that tor regenerates keys when key files are zero-length
 
+if "${builddir:-.}/src/app/tor" --list-modules | grep -q "relay: no"; then
+  echo "This test requires the relay module. Skipping." >&2
+  exit 77
+fi
+
 exitcode=0
 
 "${SHELL:-sh}" "${abs_top_srcdir:-.}/src/test/zero_length_keys.sh" 
"${builddir:-.}/src/app/tor" -z || exitcode=1



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

[tor-commits] [tpo/master] Patch for color in header

2019-10-21 Thread hiro

commit 866f3e24fcff82b48569f1441480bc234a45cd22
Author: hiro 
Date:   Mon Oct 21 18:43:41 2019 +0200

Patch for color in header
---
 models/job.ini | 4 
 1 file changed, 4 insertions(+)

diff --git a/models/job.ini b/models/job.ini
index b3b90e4..4e85f7b 100644
--- a/models/job.ini
+++ b/models/job.ini
@@ -18,6 +18,10 @@ type = boolean
 label = Summary
 type = markdown
 
+[fields.color]
+label = Color
+type = string
+
 [fields.description]
 label = Description
 type = markdown

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

[tor-commits] [tor/master] changes: file for 32123

2019-10-21 Thread nickm

commit b1f71eeed66e2c3f352a6f7f61884c088281fab6
Author: teor 
Date:   Fri Oct 18 18:14:18 2019 +1000

changes: file for 32123

Create an optional relay module, which can be disabled using the
--disable-module-relay configure option. When it is set, also disable
the dirauth module.

Add a minimal implemention, which disables the relay and dircache modes
in tor.

Closes ticket 32123.
---
 changes/ticket32123 | 5 +
 1 file changed, 5 insertions(+)

diff --git a/changes/ticket32123 b/changes/ticket32123
new file mode 100644
index 0..8200f5fca
--- /dev/null
+++ b/changes/ticket32123
@@ -0,0 +1,5 @@
+  o Major features (build system):
+- Create an optional relay module, which can be disabled using the
+  --disable-module-relay configure option. When it is set, also disable
+  the dirauth module. Add a minimal implemention, which disables the
+  relay and dircache modes in tor. Closes ticket 32123.



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

[tor-commits] [tor/master] relay: Silence compiler warnings when relay mode is disabled

2019-10-21 Thread nickm

commit e2280d6f849ea6e00fccc704e91d48a2f6924135
Author: teor 
Date:   Fri Oct 18 14:16:24 2019 +1000

relay: Silence compiler warnings when relay mode is disabled

Part of 32123.
---
 src/feature/relay/router.c | 4 
 src/feature/relay/router.h | 6 ++
 2 files changed, 10 insertions(+)

diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index ab0762e17..92803f88a 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -372,6 +372,8 @@ assert_identity_keys_ok(void)
   }
 }
 
+#ifdef HAVE_MODULE_RELAY
+
 /** Returns the current server identity key; requires that the key has
  * been set, and that we are running as a Tor server.
  */
@@ -384,6 +386,8 @@ get_server_identity_key,(void))
   return server_identitykey;
 }
 
+#endif
+
 /** Return true iff we are a server and the server identity key
  * has been set. */
 int
diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h
index 55b9ef9e6..a708b2488 100644
--- a/src/feature/relay/router.h
+++ b/src/feature/relay/router.h
@@ -28,7 +28,13 @@ struct ed25519_keypair_t;
 MOCK_DECL(crypto_pk_t *,get_onion_key,(void));
 time_t get_onion_key_set_at(void);
 void set_server_identity_key(crypto_pk_t *k);
+/* Some compilers are clever enough to know that when relay mode is disabled,
+ * this function never returns. */
+#ifdef HAVE_MODULE_RELAY
 MOCK_DECL(crypto_pk_t *,get_server_identity_key,(void));
+#else
+#define get_server_identity_key() (tor_abort_(),NULL)
+#endif
 int server_identity_key_is_set(void);
 void set_client_identity_key(crypto_pk_t *k);
 crypto_pk_t *get_tlsclient_identity_key(void);



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

[tor-commits] [tor/master] feature: Move proxy_mode() into new files

2019-10-21 Thread nickm

commit 7944b55ad1dbadaeb2a4f72b959d23bdc15b8d20
Author: teor 
Date:   Fri Oct 18 13:21:36 2019 +1000

feature: Move proxy_mode() into new files

proxy_mode() was in routermode.[ch], but it's actually a client
mode. Move it into client/proxymode.[ch].

Part of 32123.
---
 src/core/include.am|  2 ++
 src/core/mainloop/mainloop.c   |  1 +
 src/core/or/circuituse.c   |  1 +
 src/feature/client/proxymode.c | 27 +++
 src/feature/client/proxymode.h | 17 +
 src/feature/relay/routermode.c | 17 -
 src/feature/relay/routermode.h |  1 -
 7 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/src/core/include.am b/src/core/include.am
index a5d11c24f..1c97f65f9 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -71,6 +71,7 @@ LIBTOR_APP_A_SOURCES =\
src/feature/client/circpathbias.c   \
src/feature/client/dnsserv.c\
src/feature/client/entrynodes.c \
+   src/feature/client/proxymode.c  \
src/feature/client/transports.c \
src/feature/control/btrack.c\
src/feature/control/btrack_circuit.c\
@@ -305,6 +306,7 @@ noinst_HEADERS +=   \
src/feature/client/circpathbias.h   \
src/feature/client/dnsserv.h\
src/feature/client/entrynodes.h \
+   src/feature/client/proxymode.h  \
src/feature/client/transports.h \
src/feature/control/btrack_circuit.h\
src/feature/control/btrack_orconn.h \
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 2f8be9961..d58f263bd 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -71,6 +71,7 @@
 #include "feature/client/bridges.h"
 #include "feature/client/dnsserv.h"
 #include "feature/client/entrynodes.h"
+#include "feature/client/proxymode.h"
 #include "feature/client/transports.h"
 #include "feature/control/control.h"
 #include "feature/control/control_events.h"
diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c
index 606c5e2dd..a74ecbfd5 100644
--- a/src/core/or/circuituse.c
+++ b/src/core/or/circuituse.c
@@ -42,6 +42,7 @@
 #include "feature/client/bridges.h"
 #include "feature/client/circpathbias.h"
 #include "feature/client/entrynodes.h"
+#include "feature/client/proxymode.h"
 #include "feature/control/control_events.h"
 #include "feature/dircommon/directory.h"
 #include "feature/hs/hs_circuit.h"
diff --git a/src/feature/client/proxymode.c b/src/feature/client/proxymode.c
new file mode 100644
index 0..3b5fba5cd
--- /dev/null
+++ b/src/feature/client/proxymode.c
@@ -0,0 +1,27 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2019, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#include "core/or/or.h"
+
+#include "app/config/config.h"
+#include "core/mainloop/connection.h"
+#include "core/or/port_cfg_st.h"
+#include "feature/client/proxymode.h"
+
+/** Return true iff we are trying to proxy client connections. */
+int
+proxy_mode(const or_options_t *options)
+{
+  (void)options;
+  SMARTLIST_FOREACH_BEGIN(get_configured_ports(), const port_cfg_t *, p) {
+if (p->type == CONN_TYPE_AP_LISTENER ||
+p->type == CONN_TYPE_AP_TRANS_LISTENER ||
+p->type == CONN_TYPE_AP_DNS_LISTENER ||
+p->type == CONN_TYPE_AP_NATD_LISTENER)
+  return 1;
+  } SMARTLIST_FOREACH_END(p);
+  return 0;
+}
diff --git a/src/feature/client/proxymode.h b/src/feature/client/proxymode.h
new file mode 100644
index 0..f8352922c
--- /dev/null
+++ b/src/feature/client/proxymode.h
@@ -0,0 +1,17 @@
+/* Copyright (c) 2001 Matej Pfajfar.
+ * Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2019, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/**
+ * \file proxymode.h
+ * \brief Header file for proxymode.c.
+ **/
+
+#ifndef TOR_PROXYMODE_H
+#define TOR_PROXYMODE_H
+
+int proxy_mode(const or_options_t *options);
+
+#endif
diff --git a/src/feature/relay/routermode.c b/src/feature/relay/routermode.c
index 2a9ddeac4..3613841b1 100644
--- a/src/feature/relay/routermode.c
+++ b/src/feature/relay/routermode.c
@@ -7,8 +7,6 @@
 #include "core/or/or.h"
 
 #include "app/config/config.h"
-#include "core/mainloop/connection.h"
-#include "core/or/port_cfg_st.h"
 #include "feature/relay/router.h"
 #include "feature/relay/routermode.h"
 
@@ -25,21 +23,6 @@ dir_server_mode(const or_options_t *options)
 (server_mode(options) && router_has_bandwidth_to_be_dirserver(options));
 }
 
-/** Return true iff we are trying to proxy client connections. */
-int

[tor-commits] [tor/master] test/parseconf: Add basic dirauth and bridgeauth tests

2019-10-21 Thread nickm

commit b266a804e96113a9a087bf2395ff54d72a81a082
Author: teor 
Date:   Fri Oct 18 16:00:02 2019 +1000

test/parseconf: Add basic dirauth and bridgeauth tests

Part of 32123.
---
 src/test/conf_examples/bridgeauth_1/expected  | 7 +++
 src/test/conf_examples/bridgeauth_1/expected_no_dirauth   | 7 +++
 src/test/conf_examples/bridgeauth_1/expected_no_dirauth_relay | 6 ++
 src/test/conf_examples/bridgeauth_1/torrc | 8 
 src/test/conf_examples/dirauth_1/expected | 8 
 src/test/conf_examples/dirauth_1/expected_no_dirauth  | 7 +++
 src/test/conf_examples/dirauth_1/expected_no_dirauth_relay| 6 ++
 src/test/conf_examples/dirauth_1/torrc| 8 
 8 files changed, 57 insertions(+)

diff --git a/src/test/conf_examples/bridgeauth_1/expected 
b/src/test/conf_examples/bridgeauth_1/expected
new file mode 100644
index 0..d43aaf2c8
--- /dev/null
+++ b/src/test/conf_examples/bridgeauth_1/expected
@@ -0,0 +1,7 @@
+Address 198.51.100.123
+AuthoritativeDirectory 1
+BridgeAuthoritativeDir 1
+ContactInfo tor_parse_t...@example.com
+DirPort 80
+Nickname Unnamed
+ORPort 443
diff --git a/src/test/conf_examples/bridgeauth_1/expected_no_dirauth 
b/src/test/conf_examples/bridgeauth_1/expected_no_dirauth
new file mode 100644
index 0..d43aaf2c8
--- /dev/null
+++ b/src/test/conf_examples/bridgeauth_1/expected_no_dirauth
@@ -0,0 +1,7 @@
+Address 198.51.100.123
+AuthoritativeDirectory 1
+BridgeAuthoritativeDir 1
+ContactInfo tor_parse_t...@example.com
+DirPort 80
+Nickname Unnamed
+ORPort 443
diff --git a/src/test/conf_examples/bridgeauth_1/expected_no_dirauth_relay 
b/src/test/conf_examples/bridgeauth_1/expected_no_dirauth_relay
new file mode 100644
index 0..e059d7997
--- /dev/null
+++ b/src/test/conf_examples/bridgeauth_1/expected_no_dirauth_relay
@@ -0,0 +1,6 @@
+Address 198.51.100.123
+AuthoritativeDirectory 1
+BridgeAuthoritativeDir 1
+ContactInfo tor_parse_t...@example.com
+DirPort 80
+ORPort 443
diff --git a/src/test/conf_examples/bridgeauth_1/torrc 
b/src/test/conf_examples/bridgeauth_1/torrc
new file mode 100644
index 0..740bc6c2e
--- /dev/null
+++ b/src/test/conf_examples/bridgeauth_1/torrc
@@ -0,0 +1,8 @@
+AuthoritativeDirectory 1
+BridgeAuthoritativeDir 1
+
+ContactInfo tor_parse_t...@example.com
+
+Address 198.51.100.123
+ORPort 443
+DirPort 80
diff --git a/src/test/conf_examples/dirauth_1/expected 
b/src/test/conf_examples/dirauth_1/expected
new file mode 100644
index 0..901f7d947
--- /dev/null
+++ b/src/test/conf_examples/dirauth_1/expected
@@ -0,0 +1,8 @@
+Address 192.0.2.1
+AuthoritativeDirectory 1
+ContactInfo tor_parse_t...@example.net
+DirPort 9030
+DownloadExtraInfo 1
+Nickname Unnamed
+ORPort 9001
+V3AuthoritativeDirectory 1
diff --git a/src/test/conf_examples/dirauth_1/expected_no_dirauth 
b/src/test/conf_examples/dirauth_1/expected_no_dirauth
new file mode 100644
index 0..f006c6f8f
--- /dev/null
+++ b/src/test/conf_examples/dirauth_1/expected_no_dirauth
@@ -0,0 +1,7 @@
+Address 192.0.2.1
+AuthoritativeDirectory 1
+ContactInfo tor_parse_t...@example.net
+DirPort 9030
+Nickname Unnamed
+ORPort 9001
+V3AuthoritativeDirectory 1
diff --git a/src/test/conf_examples/dirauth_1/expected_no_dirauth_relay 
b/src/test/conf_examples/dirauth_1/expected_no_dirauth_relay
new file mode 100644
index 0..4b9ad49bb
--- /dev/null
+++ b/src/test/conf_examples/dirauth_1/expected_no_dirauth_relay
@@ -0,0 +1,6 @@
+Address 192.0.2.1
+AuthoritativeDirectory 1
+ContactInfo tor_parse_t...@example.net
+DirPort 9030
+ORPort 9001
+V3AuthoritativeDirectory 1
diff --git a/src/test/conf_examples/dirauth_1/torrc 
b/src/test/conf_examples/dirauth_1/torrc
new file mode 100644
index 0..b870e6e8e
--- /dev/null
+++ b/src/test/conf_examples/dirauth_1/torrc
@@ -0,0 +1,8 @@
+AuthoritativeDirectory 1
+V3AuthoritativeDirectory 1
+
+ContactInfo tor_parse_t...@example.net
+
+Address 192.0.2.1
+ORPort 9001
+DirPort 9030



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

[tor-commits] [tor/master] test/parseconf: Expect different outputs when relay mode is disabled

2019-10-21 Thread nickm

commit 0501ce9f13d4a622c24433843fce3d7d30291788
Author: teor 
Date:   Fri Oct 18 15:44:15 2019 +1000

test/parseconf: Expect different outputs when relay mode is disabled

Part of 32123.
---
 .../conf_examples/ops_1/expected_no_dirauth_relay  |  1 +
 .../conf_examples/ops_3/expected_no_dirauth_relay  |  2 +
 .../conf_examples/ops_4/expected_no_dirauth_relay  |  1 +
 .../conf_examples/ops_5/expected_no_dirauth_relay  |  2 +
 src/test/test_parseconf.sh | 64 ++
 5 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/src/test/conf_examples/ops_1/expected_no_dirauth_relay 
b/src/test/conf_examples/ops_1/expected_no_dirauth_relay
new file mode 100644
index 0..2bb9bfa13
--- /dev/null
+++ b/src/test/conf_examples/ops_1/expected_no_dirauth_relay
@@ -0,0 +1 @@
+ORPort 1000
diff --git a/src/test/conf_examples/ops_3/expected_no_dirauth_relay 
b/src/test/conf_examples/ops_3/expected_no_dirauth_relay
new file mode 100644
index 0..93dea50ee
--- /dev/null
+++ b/src/test/conf_examples/ops_3/expected_no_dirauth_relay
@@ -0,0 +1,2 @@
+ORPort 
+ORPort 1000
diff --git a/src/test/conf_examples/ops_4/expected_no_dirauth_relay 
b/src/test/conf_examples/ops_4/expected_no_dirauth_relay
new file mode 100644
index 0..56b3a5b71
--- /dev/null
+++ b/src/test/conf_examples/ops_4/expected_no_dirauth_relay
@@ -0,0 +1 @@
+ORPort 9099
diff --git a/src/test/conf_examples/ops_5/expected_no_dirauth_relay 
b/src/test/conf_examples/ops_5/expected_no_dirauth_relay
new file mode 100644
index 0..834a78509
--- /dev/null
+++ b/src/test/conf_examples/ops_5/expected_no_dirauth_relay
@@ -0,0 +1,2 @@
+ORPort 9000
+ORPort 9099
diff --git a/src/test/test_parseconf.sh b/src/test/test_parseconf.sh
index eeb80cdfa..d46be5e5c 100755
--- a/src/test/test_parseconf.sh
+++ b/src/test/test_parseconf.sh
@@ -36,6 +36,27 @@
 #  matched by some line in the output of "--verify-config", which must
 #  fail. Exactly one of "expected" or "error" must be present, or the
 #  test will fail.
+#
+# {expected,error}_no_${TOR_MODULES_DISABLED} -- If this file is present,
+#  then the outcome is different when some modules are disabled. If there
+#  is no result file matching the exact list of disabled modules, the
+#  standard result file is used.
+#
+#  For example:
+#  A test that succeeds, regardless of any disabled modules:
+#   - expected
+#  A test that has a different result if the relay module is disabled
+#  (but the same result if just the dirauth module is disabled):
+#   - expected
+#   - expected_no_relay_dirauth
+#  A test that fails if the dirauth module is disabled:
+#   - expected
+#   - error_no_dirauth
+#   - error_no_relay_dirauth
+#  (Disabling the relay module also disables dirauth module. But we don't
+#  want to encode that knowledge in this test script, so we supply a
+#  separate result file for every combination of disabled modules that
+#  has a different result.)
 
 umask 077
 set -e
@@ -64,6 +85,11 @@ fi
 
 TOR_BINARY="$(abspath "$TOR_BINARY")"
 
+TOR_MODULES_DISABLED="$("$TOR_BINARY" --list-modules | grep ": no" \
+| cut -d ":" -f1 | sort | tr "\n" "_")"
+# Remove the last underscore, if there is one
+TOR_MODULES_DISABLED=${TOR_MODULES_DISABLED%_}
+
 # make a safe space for temporary files
 DATA_DIR=$(mktemp -d -t tor_parseconf_tests.XX)
 trap 'rm -rf "$DATA_DIR"' 0
@@ -125,12 +151,30 @@ for dir in "${EXAMPLEDIR}"/*; do
 CMDLINE=""
 fi
 
-if test -f "./expected"; then
-if test -f "./error"; then
-echo "FAIL: Found both ${dir}/expected and ${dir}/error."
-echo "(Only one of these files should exist.)"
-exit $EXITCODE
+# If tor has some modules disabled, search for a custom result file for
+# the disabled modules
+for suffix in "_no_$TOR_MODULES_DISABLED" ""; do
+
+if test -f "./expected${suffix}"; then
+
+# Check for broken configs
+if test -f "./error${suffix}"; then
+echo "FAIL: Found both ${dir}/expected${suffix}"
+echo "and ${dir}/error${suffix}."
+echo "(Only one of these files should exist.)"
+exit $EXITCODE
+fi
+
+EXPECTED="./expected${suffix}"
+break
+
+elif test -f "./error${suffix}"; then
+ERROR="./error${suffix}"
+break
 fi
+done
+
+if test -f "$EXPECTED"; then
 
 # This case should succeed: run dump-config and see if it does.
 
@@ -141,7 +185,7 @@ for dir in "${EXAMPLEDIR}"/*; do
 | "${FILTER}" > "${DATA_DIR}/output.${testname}" \
 || die "Failure: Tor exited."
 
-if cmp "./expected" "${DATA_DIR}/output.${testname}">/dev/null ; then
+if cmp "$EXPECTED" "${DATA_DIR}/output.${testname}">/dev/null ; then

[tor-commits] [tor/master] Travis: Add a --disable-module-relay job

2019-10-21 Thread nickm

commit bf45b6cf0c2e25bfa0d629ce6dfb44115cc8a473
Author: teor 
Date:   Fri Oct 18 14:22:36 2019 +1000

Travis: Add a --disable-module-relay job

Part of 32123.
---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index c65923d2c..1d4f4bee1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -54,6 +54,8 @@ matrix:
 - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
 ## We check asciidoc with distcheck, to make sure we remove doc products
 - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes"
+## We check disable module relay
+- env: MODULES_OPTIONS="--disable-module-relay"
 ## We check disable module dirauth
 - env: MODULES_OPTIONS="--disable-module-dirauth"
 ## We run rust on macOS, because we have seen macOS rust failures before



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

[tor-commits] [tor/master] configure: Add a relay module, with --disable-module-relay

2019-10-21 Thread nickm

commit 2e2e1ed765e8aa42b31d5df92b59850f7db95a00
Author: teor 
Date:   Thu Oct 17 16:07:52 2019 +1000

configure: Add a relay module, with --disable-module-relay

The Makefile and C defines don't actually do anything yet.

Part of 32123.
---
 configure.ac | 11 ++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index c0db30e60..dcb8b1e38 100644
--- a/configure.ac
+++ b/configure.ac
@@ -255,7 +255,16 @@ dnl Tor modules options. These options are namespaced with 
--disable-module-XXX
 dnl ---
 
 dnl All our modules.
-m4_define(MODULES, dirauth)
+m4_define(MODULES, relay dirauth)
+
+dnl Relay module.
+AC_ARG_ENABLE([module-relay],
+  AS_HELP_STRING([--disable-module-relay],
+ [Build tor without the Relay modules: tor can not 
run as a relay, bridge, or authority]))
+AM_CONDITIONAL(BUILD_MODULE_RELAY, [test "x$enable_module_relay" != "xno"])
+AM_COND_IF(BUILD_MODULE_RELAY,
+   AC_DEFINE([HAVE_MODULE_RELAY], [1],
+ [Compile with Relay feature support]))
 
 dnl Directory Authority module.
 AC_ARG_ENABLE([module-dirauth],



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

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

2019-10-21 Thread nickm

commit 7dc78aca2997c89c2bcf4f05cbb93ee326580488
Merge: 7a72e71f7 475dffee4
Author: Nick Mathewson 
Date:   Mon Oct 21 12:43:26 2019 -0400

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

 .travis.yml|  2 +
 changes/ticket32123|  5 ++
 configure.ac   | 13 -
 doc/HACKING/Module.md  | 29 +-
 src/app/config/config.c|  1 +
 src/core/include.am| 12 +++-
 src/core/mainloop/mainloop.c   |  1 +
 src/core/or/circuituse.c   |  1 +
 src/feature/client/proxymode.c | 27 +
 src/feature/client/proxymode.h | 17 ++
 src/feature/dirauth/authmode.h |  1 +
 src/feature/relay/router.c |  4 ++
 src/feature/relay/router.h |  6 ++
 src/feature/relay/routermode.c | 17 --
 src/feature/relay/routermode.h | 20 ++-
 src/test/conf_examples/bridgeauth_1/expected   |  7 +++
 .../conf_examples/bridgeauth_1/expected_no_dirauth |  7 +++
 .../bridgeauth_1/expected_no_dirauth_relay |  6 ++
 src/test/conf_examples/bridgeauth_1/torrc  |  8 +++
 src/test/conf_examples/dirauth_1/expected  |  8 +++
 .../conf_examples/dirauth_1/expected_no_dirauth|  7 +++
 .../dirauth_1/expected_no_dirauth_relay|  6 ++
 src/test/conf_examples/dirauth_1/torrc |  8 +++
 .../conf_examples/ops_1/expected_no_dirauth_relay  |  1 +
 .../conf_examples/ops_3/expected_no_dirauth_relay  |  2 +
 .../conf_examples/ops_4/expected_no_dirauth_relay  |  1 +
 .../conf_examples/ops_5/expected_no_dirauth_relay  |  2 +
 src/test/test_key_expiration.sh|  5 ++
 src/test/test_keygen.sh|  5 +-
 src/test/test_parseconf.sh | 64 ++
 src/test/test_zero_length_keys.sh  |  5 ++
 31 files changed, 252 insertions(+), 46 deletions(-)

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

[tor-commits] [tor/master] relay: Implement HAVE_MODULE_RELAY for routermode.c

2019-10-21 Thread nickm

commit 57e86a6d749f487d81787439ac84d9bed8a70941
Author: teor 
Date:   Fri Oct 18 13:28:02 2019 +1000

relay: Implement HAVE_MODULE_RELAY for routermode.c

Part of 32123.
---
 src/app/config/config.c|  1 +
 src/core/include.am| 10 +-
 src/feature/relay/routermode.h | 19 +++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/app/config/config.c b/src/app/config/config.c
index 37eab2291..c7ae453d5 100644
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@ -2757,6 +2757,7 @@ list_deprecated_options(void)
 static void
 list_enabled_modules(void)
 {
+  printf("%s: %s\n", "relay", have_module_relay() ? "yes" : "no");
   printf("%s: %s\n", "dirauth", have_module_dirauth() ? "yes" : "no");
 }
 
diff --git a/src/core/include.am b/src/core/include.am
index 1c97f65f9..17bfb2799 100644
--- a/src/core/include.am
+++ b/src/core/include.am
@@ -146,7 +146,6 @@ LIBTOR_APP_A_SOURCES =  \
src/feature/relay/relay_sys.c   \
src/feature/relay/router.c  \
src/feature/relay/routerkeys.c  \
-   src/feature/relay/routermode.c  \
src/feature/relay/selftest.c\
src/feature/rend/rendcache.c\
src/feature/rend/rendclient.c   \
@@ -170,6 +169,10 @@ endif
 #
 LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES)
 
+# The Relay module.
+MODULE_RELAY_SOURCES = \
+   src/feature/relay/routermode.c
+
 # The Directory Authority module.
 MODULE_DIRAUTH_SOURCES =   \
src/feature/dirauth/authmode.c  \
@@ -189,6 +192,10 @@ MODULE_DIRAUTH_SOURCES =   
\
src/feature/dirauth/shared_random_state.c   \
src/feature/dirauth/voteflags.c
 
+if BUILD_MODULE_RELAY
+LIBTOR_APP_A_SOURCES += $(MODULE_RELAY_SOURCES)
+endif
+
 if BUILD_MODULE_DIRAUTH
 LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
 endif
@@ -197,6 +204,7 @@ src_core_libtor_app_a_SOURCES = $(LIBTOR_APP_A_SOURCES)
 if UNITTESTS_ENABLED
 
 # Add the sources of the modules that are needed for tests to work here.
+LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_RELAY_SOURCES)
 LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)
 
 src_core_libtor_app_testing_a_SOURCES = $(LIBTOR_APP_TESTING_A_SOURCES)
diff --git a/src/feature/relay/routermode.h b/src/feature/relay/routermode.h
index a391a6485..ddf621e5c 100644
--- a/src/feature/relay/routermode.h
+++ b/src/feature/relay/routermode.h
@@ -12,6 +12,8 @@
 #ifndef TOR_ROUTERMODE_H
 #define TOR_ROUTERMODE_H
 
+#ifdef HAVE_MODULE_RELAY
+
 int dir_server_mode(const or_options_t *options);
 
 MOCK_DECL(int, server_mode, (const or_options_t *options));
@@ -20,4 +22,21 @@ MOCK_DECL(int, advertised_server_mode, (void));
 
 void set_server_advertised(int s);
 
+/* Is the relay module enabled? */
+#define have_module_relay() (1)
+
+#else
+
+#define dir_server_mode(options) (((void)(options)),0)
+#define server_mode(options) (((void)(options)),0)
+#define public_server_mode(options) (((void)(options)),0)
+#define advertised_server_mode() (0)
+
+/* We shouldn't be publishing descriptors when relay mode is disabled. */
+#define set_server_advertised(s) tor_assert_nonfatal(!(s))
+
+#define have_module_relay() (0)
+
+#endif
+
 #endif /* !defined(TOR_ROUTERMODE_H) */



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

[tor-commits] [tor/master] doc/HACKING: Update Module.md for the relay module

2019-10-21 Thread nickm

commit 0973575737be20c20897bf674704689478092f38
Author: teor 
Date:   Thu Oct 17 16:12:24 2019 +1000

doc/HACKING: Update Module.md for the relay module

Also fix some typos, and delete some obsolete instructions.

Part of 32123.
---
 doc/HACKING/Module.md | 29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/doc/HACKING/Module.md b/doc/HACKING/Module.md
index 9cf36090b..3a07d0c63 100644
--- a/doc/HACKING/Module.md
+++ b/doc/HACKING/Module.md
@@ -8,13 +8,18 @@ module in Tor.
 In the context of the tor code base, a module is a subsystem that we can
 selectively enable or disable, at `configure` time.
 
-Currently, there is only one module:
+Currently, tor has these modules:
 
+  - Relay subsystem (relay)
   - Directory Authority subsystem (dirauth)
 
-It is located in its own directory in `src/feature/dirauth/`. To disable it,
-one need to pass `--disable-module-dirauth` at configure time. All modules
-are currently enabled by default.
+dirauth is located in its own directory in `src/feature/dirauth/`.
+
+Relay is located in directories named `src/*/*relay` and `src/*/*dircache`,
+which are being progressively refactored and disabled.
+
+To disable a module, pass `--disable-module-{dirauth,relay}` at configure
+time. All modules are currently enabled by default.
 
 ## Build System ##
 
@@ -24,7 +29,7 @@ The changes to the build system are pretty straightforward.
contains a list (white-space separated) of the module in tor. Add yours to
the list.
 
-2. Use the `AC_ARG_ENABLE([module-dirauth]` template for your new module. We
+2. Use the `AC_ARG_ENABLE([module-relay]` template for your new module. We
use the "disable module" approach instead of enabling them one by one. So,
by default, tor will build all the modules.
 
@@ -32,7 +37,7 @@ The changes to the build system are pretty straightforward.
the C code to conditionally compile things for your module. And the
`BUILD_MODULE_` is also defined for automake files (e.g: include.am).
 
-3. In the `src/core/include.am` file, locate the `MODULE_DIRAUTH_SOURCES`
+3. In the `src/core/include.am` file, locate the `MODULE_RELAY_SOURCES`
value.  You need to create your own `_SOURCES` variable for your module
and then conditionally add the it to `LIBTOR_A_SOURCES` if you should
build the module.
@@ -40,18 +45,14 @@ The changes to the build system are pretty straightforward.
It is then **very** important to add your SOURCES variable to
`src_or_libtor_testing_a_SOURCES` so the tests can build it.
 
-4. Do the same for header files, locate `ORHEADERS +=` which always add all
-   headers of all modules so the symbol can be found for the module entry
-   points.
-
 Finally, your module will automatically be included in the
-`TOR_MODULES_ALL_ENABLED` variable which is used to build the unit tests. They
-always build everything in order to tests everything.
+`TOR_MODULES_ALL_ENABLED` variable which is used to build the unit tests.
+They always build everything in order to test everything.
 
 ## Coding ##
 
-As mentioned above, a module must be isolated in its own directory (name of
-the module) in `src/feature/`.
+As mentioned above, a module should be isolated in its own directories,
+suffixed with the name of the module, in `src/*/`.
 
 There are couples of "rules" you want to follow:
 



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

[tor-commits] [tor/master] configure: Make --disable-module-relay imply --disable-module-dirauth

2019-10-21 Thread nickm

commit fdf47e0f0b82c10b943ed69717f4f62c0bdff402
Author: teor 
Date:   Thu Oct 17 16:10:45 2019 +1000

configure: Make --disable-module-relay imply --disable-module-dirauth

Part of 32123.
---
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index dcb8b1e38..9a903fb11 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,7 +260,7 @@ m4_define(MODULES, relay dirauth)
 dnl Relay module.
 AC_ARG_ENABLE([module-relay],
   AS_HELP_STRING([--disable-module-relay],
- [Build tor without the Relay modules: tor can not 
run as a relay, bridge, or authority]))
+ [Build tor without the Relay modules: tor can not 
run as a relay, bridge, or authority. Implies --disable-module-dirauth]))
 AM_CONDITIONAL(BUILD_MODULE_RELAY, [test "x$enable_module_relay" != "xno"])
 AM_COND_IF(BUILD_MODULE_RELAY,
AC_DEFINE([HAVE_MODULE_RELAY], [1],
@@ -270,7 +270,7 @@ dnl Directory Authority module.
 AC_ARG_ENABLE([module-dirauth],
   AS_HELP_STRING([--disable-module-dirauth],
  [Build tor without the Directory Authority 
module: tor can not run as a directory authority or bridge authority]))
-AM_CONDITIONAL(BUILD_MODULE_DIRAUTH,[test "x$enable_module_dirauth" != "xno"])
+AM_CONDITIONAL(BUILD_MODULE_DIRAUTH,[test "x$enable_module_dirauth" != "xno" 
&& test "x$enable_module_relay" != "xno"])
 AM_COND_IF(BUILD_MODULE_DIRAUTH,
AC_DEFINE([HAVE_MODULE_DIRAUTH], [1],
  [Compile with Directory Authority feature support]))



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

[tor-commits] [community/master] update content

2019-10-21 Thread antonela

commit 6652dc35ef9451ffcccfa45a9f5662bfdde4
Author: Antonela 
Date:   Mon Oct 21 13:40:23 2019 -0300

update content
---
 content/user-research/become-tester/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/user-research/become-tester/contents.lr 
b/content/user-research/become-tester/contents.lr
index 46b41fb..de0ef97 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -4,7 +4,7 @@ section_id: user-research
 ---
 title: Become a Tester
 ---
-subtitle: We regularly release Tor Browser Alpha versions to allow users to 
test software improvements and new ideas. [Sign up to be in our testing 
pool](https://survey.torproject.org/alpha-tester).
+subtitle: We regularly release Tor Browser early versions to allow users to 
test software improvements and new ideas. Sign up to be in our testing pool.
 ---
 key: 1
 ---

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

[tor-commits] [community/master] Use id not title

2019-10-21 Thread hiro

commit 1fd10281307c8a07d9945e7881e517c1824551aa
Author: hiro 
Date:   Mon Oct 21 18:23:45 2019 +0200

Use id not title
---
 templates/user-research.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/user-research.html b/templates/user-research.html
index 9f29641..339cca3 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -14,7 +14,7 @@
   
 
   
-{% if child.title == "Become a Tester" %}
+{% if child._id == "become-tester" %}
   https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-qa;>{{ 
_(child.title) }}
 {% else %}
   {{ 
_(child.title) }}

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

[tor-commits] [community/master] Revert previous commit and fix conflicts

2019-10-21 Thread hiro

commit 89f7bff151c6fda4611c2b5351f35bbea6052350
Author: hiro 
Date:   Mon Oct 21 18:21:09 2019 +0200

Revert previous commit and fix conflicts
---
 content/user-research/become-tester/contents.lr | 4 
 content/user-research/guidelines/contents.lr| 1 +
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/content/user-research/become-tester/contents.lr 
b/content/user-research/become-tester/contents.lr
index 5dfa354..46b41fb 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -10,8 +10,4 @@ key: 1
 ---
 _hidden: yes
 ---
-_template: layout.html

-html: two-columns-page.html

 body:
diff --git a/content/user-research/guidelines/contents.lr 
b/content/user-research/guidelines/contents.lr
index 247654c..66ad447 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -8,6 +8,7 @@ title: User Research Guidelines
 ---
 subtitle: We collect only necessary data to improve our services.
 ---
+>>> parent of 1e624ba... update content status
 key: 3
 ---
 html: two-columns-page.html

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

[tor-commits] [community/master] Not all pages are hidden

2019-10-21 Thread hiro

commit b2df2aa3ca13e86af733e8b1c4257df83e8a8415
Author: hiro 
Date:   Mon Oct 21 18:16:26 2019 +0200

Not all pages are hidden
---
 content/user-research/become-tester/contents.lr | 2 ++
 templates/user-research.html| 8 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/content/user-research/become-tester/contents.lr 
b/content/user-research/become-tester/contents.lr
index 7025245..5dfa354 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -8,6 +8,8 @@ subtitle: We regularly release Tor Browser Alpha versions to 
allow users to test
 ---
 key: 1
 ---
+_hidden: yes
+---
 _template: layout.html
 ---
 html: two-columns-page.html
diff --git a/templates/user-research.html b/templates/user-research.html
index e12fa62..9f29641 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -8,13 +8,17 @@
 
   
   
-{% for child in this.children|sort(attribute='key') %}
+{% for child in 
site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %}
   
 
   
 
   
-{{ _(child.title) 
}}
+{% if child.title == "Become a Tester" %}
+  https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-qa;>{{ 
_(child.title) }}
+{% else %}
+  {{ 
_(child.title) }}
+{% endif %}
   
   {{ _(child.subtitle) }}
 



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

[tor-commits] [community/master] Revert "Update user-research section to include hidden content"

2019-10-21 Thread hiro

commit 2d275464a50e6a4ba69614609df0be3e3d871325
Author: hiro 
Date:   Mon Oct 21 18:07:17 2019 +0200

Revert "Update user-research section to include hidden content"

This reverts commit c7309bc6e56a51d5e648fc7990671b2d589de1e6.
---
 content/user-research/become-tester/contents.lr | 4 +++-
 content/user-research/contents.lr   | 2 --
 content/user-research/guidelines/contents.lr| 4 ++--
 content/user-research/open/contents.lr  | 4 ++--
 templates/two-columns-page.html | 2 +-
 templates/user-research.html| 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/content/user-research/become-tester/contents.lr 
b/content/user-research/become-tester/contents.lr
index 9540db2..7025245 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -8,6 +8,8 @@ subtitle: We regularly release Tor Browser Alpha versions to 
allow users to test
 ---
 key: 1
 ---
-discoverable: no
+_template: layout.html
+---
+html: two-columns-page.html
 ---
 body:
diff --git a/content/user-research/contents.lr 
b/content/user-research/contents.lr
index e6fb45d..2ad1aeb 100644
--- a/content/user-research/contents.lr
+++ b/content/user-research/contents.lr
@@ -21,5 +21,3 @@ body:
 ## We respect our users' privacy when we conduct research.
 
 We practice human-centered design when we build tools for internet freedom. 
The way we build tools also builds community. Our user research is founded on 
the premises of consent, respect, and empathy. You can make an impact in your 
community by learning from our methods and helping us with user research.

-_discoverable: yes
diff --git a/content/user-research/guidelines/contents.lr 
b/content/user-research/guidelines/contents.lr
index d6256ca..247654c 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -8,10 +8,10 @@ title: User Research Guidelines
 ---
 subtitle: We collect only necessary data to improve our services.
 ---
-_discoverable: yes

 key: 3
 ---
+html: two-columns-page.html
+---
 body:
 
 Congrats! You're going to run your first User Research for Tor - and we are 
delighted to have you on board!
diff --git a/content/user-research/open/contents.lr 
b/content/user-research/open/contents.lr
index 5aacad2..c1f5c1a 100644
--- a/content/user-research/open/contents.lr
+++ b/content/user-research/open/contents.lr
@@ -12,10 +12,10 @@ title: Open User Research
 ---
 subtitle: We put our users in the center of our development process. That is 
how we bring privacy-enhancing technology to the ones who more need it. Explore 
what we are working on and start to run user research with your local community.
 ---
-_discoverable: yes

 key: 2
 ---
+html: two-columns-page.html
+---
 body:
 These are our current needs for testing Tor products, as well as methodologies 
and testing scripts. Before running Tor user research, be sure you read our 
[Guidelines to becoming a user researcher with 
Tor](https://community.torproject.org/user-research/guidelines).
 
diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index 3c6832b..5151905 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -6,7 +6,7 @@
   
 {{ this.body }}
 
-{% for child in this.children.include_hidden(true)|sort(attribute='key') %}
+{% for child in this.children|sort(attribute='key') %}
 
 
 
diff --git a/templates/user-research.html b/templates/user-research.html
index 7d6bd13..e12fa62 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -8,13 +8,13 @@
 
   
   
-{% for child in 
site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %}
+{% for child in this.children|sort(attribute='key') %}
   
 
   
 
   
-{{ _(child.title) }}
+{{ _(child.title) 
}}
   
   {{ _(child.subtitle) }}
 



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

[tor-commits] [tpo/master] Update color info in jobs

2019-10-21 Thread hiro

commit 7bb83ee64487057ef868739081987b5001e729e4
Author: hiro 
Date:   Mon Oct 21 18:03:10 2019 +0200

Update color info in jobs
---
 content/about/jobs/backend-engineer-ooni/contents.lr   | 2 ++
 content/about/jobs/browser-developer/contents.lr   | 2 ++
 content/about/jobs/developer-data-architect/contents.lr| 2 ++
 content/about/jobs/senior-system-administrator/contents.lr | 2 ++
 content/about/jobs/shadow-simulation-developer/contents.lr | 2 ++
 5 files changed, 10 insertions(+)

diff --git a/content/about/jobs/backend-engineer-ooni/contents.lr 
b/content/about/jobs/backend-engineer-ooni/contents.lr
index 280e9a5..21772ed 100644
--- a/content/about/jobs/backend-engineer-ooni/contents.lr
+++ b/content/about/jobs/backend-engineer-ooni/contents.lr
@@ -10,6 +10,8 @@ active: False
 ---
 title: Backend Engineer for OONI
 ---
+color: primary
+---
 summary:
 The Tor Project, Inc. is looking for a dedicated backend engineer to work on 
OONI (https://ooni.torproject.org/). OONI is the Open Observatory of Network 
Interference: a free and open source software, global observation network for 
detecting censorship, surveillance, and traffic manipulation on the internet.
 
diff --git a/content/about/jobs/browser-developer/contents.lr 
b/content/about/jobs/browser-developer/contents.lr
index 8bbb489..888f4aa 100644
--- a/content/about/jobs/browser-developer/contents.lr
+++ b/content/about/jobs/browser-developer/contents.lr
@@ -10,6 +10,8 @@ section_id: about
 ---
 title: Browser Developer
 ---
+color: primary
+---
 summary:
 
 The Tor Project is looking for a Browser Developer (C++ and Javascript)!
diff --git a/content/about/jobs/developer-data-architect/contents.lr 
b/content/about/jobs/developer-data-architect/contents.lr
index d3ec5e0..88706bb 100644
--- a/content/about/jobs/developer-data-architect/contents.lr
+++ b/content/about/jobs/developer-data-architect/contents.lr
@@ -8,6 +8,8 @@ active: False
 ---
 title: Developer Data Architect
 ---
+color: primary
+---
 
 description:
 
diff --git a/content/about/jobs/senior-system-administrator/contents.lr 
b/content/about/jobs/senior-system-administrator/contents.lr
index 1598dae..113d4bf 100644
--- a/content/about/jobs/senior-system-administrator/contents.lr
+++ b/content/about/jobs/senior-system-administrator/contents.lr
@@ -8,6 +8,8 @@ section_id: about
 ---
 active: False
 ---
+color: primary
+---
 title: Senior System Administrator
 ---
 summary:
diff --git a/content/about/jobs/shadow-simulation-developer/contents.lr 
b/content/about/jobs/shadow-simulation-developer/contents.lr
index 338da9b..8fe07b5 100644
--- a/content/about/jobs/shadow-simulation-developer/contents.lr
+++ b/content/about/jobs/shadow-simulation-developer/contents.lr
@@ -8,6 +8,8 @@ section: about
 ---
 section_id: about
 ---
+color: primary
+---
 title: Shadow Simulation Developer
 ---
 summary:

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

[tor-commits] [community/master] update content status

2019-10-21 Thread antonela

commit 1e624ba4452939bf3b78fdba217e60b51d0d5949
Author: Antonela 
Date:   Mon Oct 21 13:02:33 2019 -0300

update content status
---
 content/user-research/become-tester/contents.lr | 2 +-
 content/user-research/guidelines/contents.lr| 2 +-
 content/user-research/open/contents.lr  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/user-research/become-tester/contents.lr 
b/content/user-research/become-tester/contents.lr
index 46b41fb..9540db2 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -8,6 +8,6 @@ subtitle: We regularly release Tor Browser Alpha versions to 
allow users to test
 ---
 key: 1
 ---
-_hidden: yes
+discoverable: no
 ---
 body:
diff --git a/content/user-research/guidelines/contents.lr 
b/content/user-research/guidelines/contents.lr
index 0958fe9..d6256ca 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -8,7 +8,7 @@ title: User Research Guidelines
 ---
 subtitle: We collect only necessary data to improve our services.
 ---
-_hidden: yes
+_discoverable: yes
 ---
 key: 3
 ---
diff --git a/content/user-research/open/contents.lr 
b/content/user-research/open/contents.lr
index 252fbea..5aacad2 100644
--- a/content/user-research/open/contents.lr
+++ b/content/user-research/open/contents.lr
@@ -12,7 +12,7 @@ title: Open User Research
 ---
 subtitle: We put our users in the center of our development process. That is 
how we bring privacy-enhancing technology to the ones who more need it. Explore 
what we are working on and start to run user research with your local community.
 ---
-_hidden: yes
+_discoverable: yes
 ---
 key: 2
 ---

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

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

2019-10-21 Thread translation

commit 43861d7fccc5dc037d86fd4dd19831e3fabdd73a
Author: Translation commit bot 
Date:   Mon Oct 21 15:53:15 2019 +

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

diff --git a/contents+fr.po b/contents+fr.po
index 98fefc03a..6cc0fc4af 100644
--- a/contents+fr.po
+++ b/contents+fr.po
@@ -225,9 +225,9 @@ msgid ""
 "Installing new add-ons may affect Tor Browser in unforeseen ways and "
 "potentially make your Tor Browser fingerprint unique."
 msgstr ""
-"Lâinstallation de nouveaux modules pourrait affecter le NavigateurÂ Tor de "
-"faÃ§on imprÃ©vue et potentiellement rendre lâempreinte de votre NavigateurÂ 
Tor"
-" unique."
+"Lâinstallation de nouvelles extensions pourrait affecter le NavigateurÂ Tor 
"
+"de faÃ§on imprÃ©vue et potentiellement rendre lâempreinte de votre 
NavigateurÂ "
+"Tor unique."
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -238,9 +238,9 @@ msgid ""
 "activities can be deanonymized and tracked even though you are using Tor "
 "Browser."
 msgstr ""
-"Si votre installation du navigateur Tor possÃ¨de une empreinte unique, votre "
-"activitÃ© de navigation peut Ãªtre rendue non-anonyme et tracÃ©e, mÃªme si 
vous "
-"utilisez le navigateur Tor."
+"Si lâempreinte de votre exemplaire du NavigateurÂ Tor est unique, 
lâanonymat "
+"de vos activitÃ©s de navigation peut Ãªtre levÃ© et vos activitÃ©s peuvent 
Ãªtre "
+"suivies Ã  la trace mÃªme si vous utilisez le NavigateurÂ Tor."
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -250,8 +250,8 @@ msgid ""
 "Basically, each browser's settings and features create what is called a "
 "\"browser fingerprint\"."
 msgstr ""
-"Fondamentalement, les rÃ©glages et fonctionnalitÃ©s de chaque navigateur "
-"permettent de crÃ©er ce que l'on appelle \"empreinte de navigateur\"."
+"Essentiellement, les rÃ©glages et fonctions de chaque navigateur crÃ©ent ce "
+"que lâon appelle une Â«Â empreinte de navigateurÂ Â»."
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -261,8 +261,8 @@ msgid ""
 "Most browsers inadvertently create a unique fingerprint for each user which "
 "can be tracked across the internet."
 msgstr ""
-"La plupart des navigateurs crÃ©ent involontairement une empreinte unique pour"
-" chaque utilisateur, qui peut Ãªtre tracÃ©e sur Internet."
+"La plupart des navigateurs crÃ©ent par inadvertance une empreinte unique pour"
+" chaque utilisateur, empreinte qui peut Ãªtre suivie Ã  la trace sur 
Internet."
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -272,9 +272,9 @@ msgid ""
 "Tor Browser is specifically engineered to have a nearly identical (we're not"
 " perfect!) fingerprint across it's users."
 msgstr ""
-"Le navigateur Tor est spÃ©cialement conÃ§u pour avoir une empreinte de "
-"navigateur quasiment identique (nous ne sommes pas parfaits !) pour tous ses"
-" utilisateurs."
+"Le NavigateurÂ Tor est spÃ©cialement conÃ§u pour prÃ©senter une empreinte "
+"presque identique (nous ne sommes pas parfaitsâ!) pour tous ses "
+"utilisateurs."
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.description)
@@ -4766,7 +4766,7 @@ msgstr "## A"
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
 msgid "### add-on, extension, or plugin"
-msgstr "### extension, greffon ou addiciel"
+msgstr "### greffon, extension ou addiciel"
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)
@@ -4774,8 +4774,9 @@ msgid ""
 "Add-ons, extensions, and plugins are components that can be added to [web "
 "browsers](#web-browser) to give them new features."
 msgstr ""
-"Les extensions et greffons sont des composants qui peuvent Ãªtre ajoutÃ©s Ã  "
-"des [navigateurs Web](#Web-browser) pour leur donner de nouvelles fonctions."
+"Les extensions, greffons et addiciels sont des composants qui peuvent Ãªtre "
+"ajoutÃ©s Ã  des [navigateurs Web](#Web-browser) pour leur donner de nouvelles 
"
+"fonctions."
 
 #: https//support.torproject.org/misc/glossary/
 #: (content/misc/glossary/contents+en.lrquestion.description)

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

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

2019-10-21 Thread phw

commit b3cd9ac6d59a6f8ad1672518436d9e3d0ac2677f
Merge: 681963d 61d86fb
Author: Philipp Winter 
Date:   Mon Oct 21 08:42:34 2019 -0700

Merge branch 'task/32134' into develop

 CHANGELOG|  8 
 README.rst   | 37 +++-
 bridgedb/i18n/templates/bridgedb.pot | 86 
 bridgedb/strings.py  |  6 ++-
 4 files changed, 75 insertions(+), 62 deletions(-)

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

[tor-commits] [bridgedb/develop] Replace "Tor" with "Tor Browser" in UI.

2019-10-21 Thread phw

commit 61d86fbcdf03f19387feaf73c66e9869d34032d5
Author: Philipp Winter 
Date:   Sat Oct 19 14:49:38 2019 -0700

Replace "Tor" with "Tor Browser" in UI.

Also, add instructions for our translators.
---
 CHANGELOG|  8 +++
 bridgedb/i18n/templates/bridgedb.pot | 46 +++-
 bridgedb/strings.py  |  6 +++--
 3 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 6ab617e..5b6dce6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+Changes in version A.B.C - -MM-DD
+
+* FIXES https://bugs.torproject.org/32134
+While implementing our language switcher (#26543), we added a new
+string, "Language", that requires translations.  This patch adds a new
+translation request and also updates our instructions on how to request
+new translations.
+
 Changes in version 0.9.0 - 2019-10-16
 
 * FIXES https://bugs.torproject.org/26543
diff --git a/bridgedb/i18n/templates/bridgedb.pot 
b/bridgedb/i18n/templates/bridgedb.pot
index 186ad6e..7e16c26 100644
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -5,11 +5,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bridgedb 0.9.0+0.g681963d.dirty\n"
+"Project-Id-Version: bridgedb 0.9.0+3.gfd0c28d.dirty\n"
 "Report-Msgid-Bugs-To: "
 
"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB;
 "=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
-"POT-Creation-Date: 2019-10-16 11:13-0700\n"
+"POT-Creation-Date: 2019-10-19 14:51-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -296,47 +296,49 @@ msgstr ""
 msgid "My bridges don't work! I need help!"
 msgstr ""
 
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:119
 #, python-format
-msgid "If your Tor cannot connect, please take a look at the %s and our %s."
+msgid "If your Tor Browser cannot connect, please take a look at the %s and 
our %s."
 msgstr ""
 
-#: bridgedb/strings.py:121
+#: bridgedb/strings.py:123
 msgid "Here are your bridge lines:"
 msgstr ""
 
-#: bridgedb/strings.py:122
+#: bridgedb/strings.py:124
 msgid "Get Bridges!"
 msgstr ""
 
-#: bridgedb/strings.py:126
+#: bridgedb/strings.py:128
 msgid "Please select options for bridge type:"
 msgstr ""
 
-#: bridgedb/strings.py:127
+#: bridgedb/strings.py:129
 msgid "Do you need IPv6 addresses?"
 msgstr ""
 
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
 #, python-format
 msgid "Do you need a %s?"
 msgstr ""
 
-#: bridgedb/strings.py:132
+#: bridgedb/strings.py:134
 msgid "Your browser is not displaying images properly."
 msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:135
 msgid "Enter the characters from the image above..."
 msgstr ""
 
-#: bridgedb/strings.py:137
+#: bridgedb/strings.py:139
 msgid "How to start using your bridges"
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
 #, python-format
 msgid ""
 "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -345,7 +347,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:146
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and "
 "follow\n"
@@ -353,7 +355,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:148
+#: bridgedb/strings.py:150
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor "
 "connections\n"
@@ -361,7 +363,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:152
+#: bridgedb/strings.py:154
 msgid ""
 "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
 "paste the bridge lines into the text input box. Finally, click 'Connect', and"
@@ -370,29 +372,29 @@ msgid ""
 "button in the 'Tor Network Settings' wizard for further assistance."
 msgstr ""
 
-#: bridgedb/strings.py:160
+#: bridgedb/strings.py:162
 msgid "Displays this message."
 msgstr ""
 
 #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
 #. same non-Pluggable Transport bridges described above as being
 #. "plain-ol'-vanilla" bridges.
-#: bridgedb/strings.py:164
+#: bridgedb/strings.py:166
 msgid "Request vanilla bridges."
 msgstr ""
 
-#: bridgedb/strings.py:165
+#: bridgedb/strings.py:167
 msgid "Request IPv6 bridges."
 msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
 msgid "Request a Pluggable Transport by TYPE."
 msgstr ""
 
 #. TRANSLATORS:

[tor-commits] [bridgedb/develop] Request translations for new string "Language".

2019-10-21 Thread phw

commit 1c529a20f1d1129dca78f8cf3fa3762de4e2a5fe
Author: Philipp Winter 
Date:   Wed Oct 16 15:47:12 2019 -0700

Request translations for new string "Language".

For our language switcher, we added the string "Language", for which we
will need translations.  This commit adds the string to bridgedb.pot, so
it will end up in Transifex.
---
 bridgedb/i18n/templates/bridgedb.pot | 44 +---
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/bridgedb/i18n/templates/bridgedb.pot 
b/bridgedb/i18n/templates/bridgedb.pot
index c5ab8af..186ad6e 100644
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -5,11 +5,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bridgedb 0.8.0+15.gd9d886f.dirty\n"
+"Project-Id-Version: bridgedb 0.9.0+0.g681963d.dirty\n"
 "Report-Msgid-Bugs-To: "
 
"'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB;
 "=bridgedb-reported,msgid=isis,sysrqb=isis'\n"
-"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"POT-Creation-Date: 2019-10-16 11:13-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -33,7 +33,8 @@ msgstr ""
 #. recompiled). `collection_size` sets the number of compiled templates which
 #. are cached before the least recently used ones are removed. See:
 #. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
-#. : Localisations which BridgeDB supports which should be rendered 
right-to-left.
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
 #. We use our metrics singleton to keep track of BridgeDB metrics such as
 #. "number of failed HTTPS bridge requests."
 #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
@@ -47,19 +48,23 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/distributors/https/server.py:135
+#: bridgedb/distributors/https/server.py:138
 msgid "Sorry! Something went wrong with your request."
 msgstr ""
 
-#: bridgedb/distributors/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:92
 msgid "Report a Bug"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:95
 msgid "Source Code"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:98
 msgid "Changelog"
 msgstr ""
 
@@ -98,7 +103,8 @@ msgstr ""
 msgid "There currently aren't any bridges available..."
 msgstr ""
 
-#: bridgedb/distributors/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
 #, python-format
 msgid " Perhaps you should try %s going back %s and choosing a different 
bridge type!"
 msgstr ""
@@ -118,17 +124,19 @@ msgstr ""
 msgid "Step %s2%s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
 #, python-format
 msgid "Get %s bridges %s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
 #, python-format
 msgid "Step %s3%s"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr ""
@@ -137,27 +145,27 @@ msgstr ""
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/distributors/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
 #, python-format
 msgid "%sJ%sust give me bridges!"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
 msgid "Advanced Options"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
 msgid "No"
 msgstr ""
 
-#: bridgedb/distributors/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
 msgid "none"
 msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/distributors/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
 #, python-format
 msgid "%sY%ses!"
 msgstr ""
@@ -165,7 +173,7 @@ msgstr ""
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #.

[tor-commits] [bridgedb/develop] Update instructions on requesting translations.

2019-10-21 Thread phw

commit ad2178a8ae2b6a2d8e7bb9fa229aa6b49fab3cd7
Author: Philipp Winter 
Date:   Thu Oct 17 14:09:16 2019 -0700

Update instructions on requesting translations.

As far as I understand the process, it's not necessary to run
'update_catalog' when requesting new translations.  We're requesting new
translations by *only* updating bridgedb/i18n/templates/bridgedb.pot
because it's the only file that Transifex pays attention to.

Once our translators did their job, we're pulling the updated,
language-specific .po files using the script
maint/get-completed-translations.
---
 README.rst | 37 +++--
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/README.rst b/README.rst
index 4f05ea5..2576fa7 100644
--- a/README.rst
+++ b/README.rst
@@ -162,6 +162,10 @@ Enabling additional features
 Translations
 
 
+For general information on the translation process, take a look at
+`our translation guidelines for developers
+`__.
+
 **Using New Translations**:
 
 This should be done when newly completed translations are available in
@@ -180,31 +184,20 @@ This should be done whenever any of the strings requiring 
translation --
 ``_("the ones inside the weird underscore function, like this")`` -- are
 changed, or new ones are added. See ``lib/bridgedb/strings.py``.
 
-Translations for Tor Project repos are kept `in a separate
-repo `__. You'll need to
-extract the strings from BridgeDB's source code into .pot templates, and
-place these .po files into the ``translation`` repo in the ``bridgedb``
-branch. After than the .po files should be put into Transifex (don't ask
-me how this worksâ¦) and translated. After the translations are complete,
-the finished .po files should be placed into the ``bridgedb_completed``
-branch.
-
--  To extract all strings from BridgeDB's source::
+Translations for Tor Project repos are kept `in a separate repo
+`__. To request new or updated
+translations, you'll need to extract the strings from BridgeDB's source code
+into our ./i18n/templates/bridgedb.pot template, and then commit it to our
+``develop`` branch.  From there, the translation system takes over and
+eventually, new translations will be available.  To extract all strings from
+BridgeDB's source, run::
 
  python setup.py extract_messages
 
-   A .pot file will be created in ./i18n/templates/bridgedb.pot
-
-
--  Initialise catalogs for each desired language::
-
- python setup.py init_catalog -l LANG
-
-   where ``LANG`` is the 2 or 4 letter country-code, eg. 'es'. If you've
-   already initialised a particular language, do instead::
-
- python setup.py update_catalog
-
+Transifex uses the resulting file ./i18n/templates/bridgedb.pot (and this file
+only) as input and fetches it from BridgeDB's ``develop`` branch, so we don't
+need to release a new BridgeDB version (which we only do in the ``master``
+branch) to request translations.
 
 ---
 



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

[tor-commits] [community/master] Update user-research section to include hidden content

2019-10-21 Thread hiro

commit c7309bc6e56a51d5e648fc7990671b2d589de1e6
Author: hiro 
Date:   Mon Oct 21 17:37:44 2019 +0200

Update user-research section to include hidden content
---
 content/user-research/become-tester/contents.lr | 4 +---
 content/user-research/contents.lr   | 2 ++
 content/user-research/guidelines/contents.lr| 4 +---
 content/user-research/open/contents.lr  | 4 ++--
 lego| 2 +-
 templates/two-columns-page.html | 2 +-
 templates/user-research.html| 4 ++--
 7 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/content/user-research/become-tester/contents.lr 
b/content/user-research/become-tester/contents.lr
index 7025245..46b41fb 100644
--- a/content/user-research/become-tester/contents.lr
+++ b/content/user-research/become-tester/contents.lr
@@ -8,8 +8,6 @@ subtitle: We regularly release Tor Browser Alpha versions to 
allow users to test
 ---
 key: 1
 ---
-_template: layout.html

-html: two-columns-page.html
+_hidden: yes
 ---
 body:
diff --git a/content/user-research/contents.lr 
b/content/user-research/contents.lr
index 2ad1aeb..e6fb45d 100644
--- a/content/user-research/contents.lr
+++ b/content/user-research/contents.lr
@@ -21,3 +21,5 @@ body:
 ## We respect our users' privacy when we conduct research.
 
 We practice human-centered design when we build tools for internet freedom. 
The way we build tools also builds community. Our user research is founded on 
the premises of consent, respect, and empathy. You can make an impact in your 
community by learning from our methods and helping us with user research.
+---
+_discoverable: yes
diff --git a/content/user-research/guidelines/contents.lr 
b/content/user-research/guidelines/contents.lr
index a036343..0958fe9 100644
--- a/content/user-research/guidelines/contents.lr
+++ b/content/user-research/guidelines/contents.lr
@@ -8,12 +8,10 @@ title: User Research Guidelines
 ---
 subtitle: We collect only necessary data to improve our services.
 ---
-hide: yes
+_hidden: yes
 ---
 key: 3
 ---
-html: two-columns-page.html

 body:
 
 Congrats! You're going to run your first User Research for Tor - and we are 
delighted to have you on board!
diff --git a/content/user-research/open/contents.lr 
b/content/user-research/open/contents.lr
index c1f5c1a..252fbea 100644
--- a/content/user-research/open/contents.lr
+++ b/content/user-research/open/contents.lr
@@ -12,9 +12,9 @@ title: Open User Research
 ---
 subtitle: We put our users in the center of our development process. That is 
how we bring privacy-enhancing technology to the ones who more need it. Explore 
what we are working on and start to run user research with your local community.
 ---
-key: 2
+_hidden: yes
 ---
-html: two-columns-page.html
+key: 2
 ---
 body:
 These are our current needs for testing Tor products, as well as methodologies 
and testing scripts. Before running Tor user research, be sure you read our 
[Guidelines to becoming a user researcher with 
Tor](https://community.torproject.org/user-research/guidelines).
diff --git a/lego b/lego
index 09c5813..a2e8d34 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790
+Subproject commit a2e8d340105281a2b7bbfe422a17f72e402ee1a8
diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index 5151905..3c6832b 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -6,7 +6,7 @@
   
 {{ this.body }}
 
-{% for child in this.children|sort(attribute='key') %}
+{% for child in this.children.include_hidden(true)|sort(attribute='key') %}
 
 
 
diff --git a/templates/user-research.html b/templates/user-research.html
index e12fa62..7d6bd13 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -8,13 +8,13 @@
 
   
   
-{% for child in this.children|sort(attribute='key') %}
+{% for child in 
site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %}
   
 
   
 
   
-{{ _(child.title) 
}}
+{{ _(child.title) }}
   
   {{ _(child.subtitle) }}
 

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

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

2019-10-21 Thread translation

commit 61796f4d7450c0b74a82ad59da18ba2f4e58f3fd
Author: Translation commit bot 
Date:   Mon Oct 21 15:23:22 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ca.po | 37 -
 contents+fr.po |  9 +
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/contents+ca.po b/contents+ca.po
index e4bb4261d..b8b68f974 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -1,9 +1,9 @@
 # Translators:
 # Marc Ripoll , 2019
+# erinm, 2019
 # Aleix Vidal i Gaya , 2019
 # Emma Peel, 2019
 # jmontane, 2019
-# erinm, 2019
 # Ecron , 2019
 # 
 msgid ""
@@ -883,6 +883,7 @@ msgstr ""
 msgid ""
 "Does Tor remove personal information from the data my application sends?"
 msgstr ""
+"Elimina el Tor informaciÃ³ personal de les dades que la meva aplicaciÃ³ 
envia?"
 
 #: https//support.torproject.org/about/no-data-scrubbing/
 #: (content/about/no-data-scrubbing/contents+en.lrquestion.description)
@@ -912,12 +913,12 @@ msgstr ""
 #: https//support.torproject.org/about/what-is-tor/
 #: (content/about/what-is-tor/contents+en.lrquestion.title)
 msgid "What is Tor?"
-msgstr "QuÃ¨ Ã©s Tor?"
+msgstr "QuÃ¨ Ã©s el Tor?"
 
 #: https//support.torproject.org/about/what-is-tor/
 #: (content/about/what-is-tor/contents+en.lrquestion.description)
 msgid "The name \"Tor\" can refer to several different components."
-msgstr "El nom \"Tor\" pot fer referÃ¨ncia a diversos components."
+msgstr "El nom Â«TorÂ» pot fer referÃ¨ncia a uns quants components diferents."
 
 #: https//support.torproject.org/about/what-is-tor/
 #: (content/about/what-is-tor/contents+en.lrquestion.description)
@@ -948,7 +949,7 @@ msgstr ""
 #: https//support.torproject.org/about/why-is-it-called-tor/
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.title)
 msgid "Why is it called Tor?"
-msgstr ""
+msgstr "Per quÃ¨ s'anomena Tor?"
 
 #: https//support.torproject.org/about/why-is-it-called-tor/
 #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description)
@@ -1302,7 +1303,7 @@ msgid ""
 "Browser?"
 msgstr ""
 "Quins sÃ³n els problemes mÃ©s freqÃ¼ents amb la versiÃ³ estable mÃ©s recent 
del "
-"navegador Tor?"
+"Navegador Tor?"
 
 #: https//support.torproject.org/tbb/tbb-1/
 #: (content/tbb/tbb-1/contents+en.lrquestion.description)
@@ -1310,9 +1311,9 @@ msgid ""
 "Whenever we release a new stable version of Tor Browser, we write a blog "
 "post that details its new features and known issues."
 msgstr ""
-"Cada vegada que publiquem una nova versiÃ³ estable del navegador Tor, "
-"escrivim una publicaciÃ³ de blog que detalla les seves noves funcions i "
-"problemes coneguts."
+"Cada vegada que publiquem una versiÃ³ estable nova del Navegador Tor, "
+"escrivim una publicaciÃ³ que detalla les seves funcions i problemes coneguts "
+"nous."
 
 #: https//support.torproject.org/tbb/tbb-1/
 #: (content/tbb/tbb-1/contents+en.lrquestion.description)
@@ -1339,8 +1340,8 @@ msgid ""
 "My antivirus or malware protection is blocking me from accessing Tor "
 "Browser."
 msgstr ""
-"El meu antivirus o protecciÃ³ de programari maliciÃ³s m'estÃ  blocant 
l'accÃ©s "
-"al navegador Tor."
+"El meu antivirus o protecciÃ³ contra programari maliciÃ³s m'estÃ  blocant "
+"l'accÃ©s al Navegador Tor."
 
 #: https//support.torproject.org/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -1348,9 +1349,9 @@ msgid ""
 "Most antivirus or malware protection allows the user to \"whitelist\" "
 "certain processes that would otherwise be blocked."
 msgstr ""
-"La majoria de la protecciÃ³ antivirus o de programari maliciÃ³s permet a "
-"l'usuari \"llistes blanques\" certs processos que d'una altra forma serien "
-"blocats."
+"La majoria dels antivirus o proteccions contra programari maliciÃ³s permeten "
+"a l'usuari posar en una Â«llista blancaÂ» certs processos que d'una altra "
+"forma es blocarien."
 
 #: https//support.torproject.org/tbb/tbb-10/
 #: (content/tbb/tbb-10/contents+en.lrquestion.description)
@@ -1477,7 +1478,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-12/
 #: (content/tbb/tbb-12/contents+en.lrquestion.title)
 msgid "Can I use Flash in Tor Browser?"
-msgstr "Puc utilitzar Flash al navegador Tor?"
+msgstr "Puc utilitzar el Flash en el Navegador Tor?"
 
 #: https//support.torproject.org/tbb/tbb-12/
 #: (content/tbb/tbb-12/contents+en.lrquestion.description)
@@ -1508,7 +1509,9 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-13/
 #: (content/tbb/tbb-13/contents+en.lrquestion.title)
 msgid "Does using Tor Browser protect other applications on my computer?"
-msgstr "El navegador Tor pot protegir altres aplicacions del meu equip?"
+msgstr ""
+"Es protegeixen altres aplicacions del meu equip en utilitzar el Navegador "
+"Tor?"
 
 #: https//support.torproject.org/tbb/tbb-13/
 #: (content/tbb/tbb-13/contents+en.lrquestion.description)
@@ -1547,7 +1550,7 @@ msgstr ""
 #: https//support.torproject.org/tbb/tbb-15/
 #:

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

2019-10-21 Thread translation

commit 2a112aa529e33f723b39fd7e27f3a8c3217b0545
Author: Translation commit bot 
Date:   Mon Oct 21 14:53:23 2019 +

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

diff --git a/contents+ca.po b/contents+ca.po
index 66026442d..e4bb4261d 100644
--- a/contents+ca.po
+++ b/contents+ca.po
@@ -187,8 +187,8 @@ msgid ""
 "manual.torproject.org/circumvention/)."
 msgstr ""
 "Per a obtenir mÃ©s informaciÃ³, consulteu la secciÃ³ de [censura](https://tb-;
-"manual.torproject.org/circumvention/) del [manual dâusuari del Navegador "
-"Tor](https://tb-manual.torproject.org/)."
+"manual.torproject.org/ca/circumvention/) del [manual dâusuari del Navegador 
"
+"Tor](https://tb-manual.torproject.org/ca/)."
 
 #: https//support.torproject.org/faq/faq-3/
 #: (content/faq/faq-3/contents+en.lrquestion.title)
@@ -540,7 +540,7 @@ msgstr ""
 #: https//support.torproject.org/about/can-i-use-tor-with/
 #: (content/about/can-i-use-tor-with/contents+en.lrquestion.title)
 msgid "What programs can I use with Tor?"
-msgstr "Quins programes puc utilitzaar amb el Tor?"
+msgstr "Quins programes puc utilitzar amb el Tor?"
 
 #: https//support.torproject.org/about/can-i-use-tor-with/
 #: (content/about/can-i-use-tor-with/contents+en.lrquestion.description)
@@ -7426,7 +7426,7 @@ msgstr "ColÂ·laboradors d'aquesta pÃ gina:"
 
 #: templates/macros/question.html:18
 msgid "Edit this page"
-msgstr "Edita la pÃ gina"
+msgstr "Editeu la pÃ gina"
 
 #: templates/macros/question.html:19
 msgid "Suggest Feedback"
@@ -7434,4 +7434,4 @@ msgstr "Suggeriu comentaris"
 
 #: templates/macros/question.html:20
 msgid "Permalink"
-msgstr "Permalink"
+msgstr "EnllaÃ§ permanent"

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

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

2019-10-21 Thread translation

commit 3ea4f4feccf3f1585a9d21a530645de4075de434
Author: Translation commit bot 
Date:   Mon Oct 21 14:48:49 2019 +

https://gitweb.torproject.org/translation.git/commit/?h=tails-iuk_completed
---
 es.po| 2 +-
 es_AR.po | 2 +-
 fr.po| 2 +-
 ga.po| 2 +-
 he.po| 2 +-
 hu.po| 2 +-
 mk.po| 2 +-
 pt_BR.po | 2 +-
 ro.po| 2 +-
 tr.po| 2 +-
 zh_CN.po | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/es.po b/es.po
index ec5fc035c..67e529d56 100644
--- a/es.po
+++ b/es.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-09-14 14:42+0200\n"
+"POT-Creation-Date: 2019-10-21 09:17+0200\n"
 "PO-Revision-Date: 2019-04-23 08:07+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
diff --git a/es_AR.po b/es_AR.po
index 902f79b1f..f95031873 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-09-14 14:42+0200\n"
+"POT-Creation-Date: 2019-10-21 09:17+0200\n"
 "PO-Revision-Date: 2018-12-10 22:16+\n"
 "Last-Translator: Zuhualime Akoochimoya\n"
 "Language-Team: Spanish (Argentina) 
(http://www.transifex.com/otf/torproject/language/es_AR/)\n"
diff --git a/fr.po b/fr.po
index 255ccbd7f..61b9dd37a 100644
--- a/fr.po
+++ b/fr.po
@@ -33,7 +33,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-09-14 14:42+0200\n"
+"POT-Creation-Date: 2019-10-21 09:17+0200\n"
 "PO-Revision-Date: 2019-10-18 21:31+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
diff --git a/ga.po b/ga.po
index b8971b885..6b2beeb53 100644
--- a/ga.po
+++ b/ga.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-09-14 14:42+0200\n"
+"POT-Creation-Date: 2019-10-21 09:17+0200\n"
 "PO-Revision-Date: 2019-04-14 11:45+\n"
 "Last-Translator: Kevin Scannell \n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
diff --git a/he.po b/he.po
index fcf7654e7..d9ce973a4 100644
--- a/he.po
+++ b/he.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-09-14 14:42+0200\n"
+"POT-Creation-Date: 2019-10-21 09:17+0200\n"
 "PO-Revision-Date: 2018-12-10 09:23+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
diff --git a/hu.po b/hu.po
index 37b3a06bd..bbcc2ab16 100644
--- a/hu.po
+++ b/hu.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-09-14 14:42+0200\n"
+"POT-Creation-Date: 2019-10-21 09:17+0200\n"
 "PO-Revision-Date: 2018-12-21 13:53+\n"
 "Last-Translator: vargaviktor \n"
 "Language-Team: Hungarian 
(http://www.transifex.com/otf/torproject/language/hu/)\n"
diff --git a/mk.po b/mk.po
index f2f8088f4..2fa664649 100644
--- a/mk.po
+++ b/mk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-09-14 14:42+0200\n"
+"POT-Creation-Date: 2019-10-21 09:17+0200\n"
 "PO-Revision-Date: 2019-10-06 14:01+\n"
 "Last-Translator: Zarko Gjurov \n"
 "Language-Team: Macedonian 
(http://www.transifex.com/otf/torproject/language/mk/)\n"
diff --git a/pt_BR.po b/pt_BR.po
index d7702c19e..2df8318b5 100644
--- a/pt_BR.po
+++ b/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-09-14 14:42+0200\n"
+"POT-Creation-Date: 2019-10-21 09:17+0200\n"
 "PO-Revision-Date: 2018-12-15 01:58+\n"
 "Last-Translator: Communia \n"
 "Language-Team: Portuguese (Brazil) 
(http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
diff --git a/ro.po b/ro.po
index 68459ce2f..d79b85e00 100644
--- a/ro.po
+++ b/ro.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-09-14 14:42+0200\n"
+"POT-Creation-Date: 2019-10-21 09:17+0200\n"
 "PO-Revision-Date: 2019-01-10 18:02+\n"
 "Last-Translator: A C \n"
 "Language-Team: Romanian 
(http://www.transifex.com/otf/torproject/language/ro/)\n"
diff --git a/tr.po b/tr.po
index c1b648a5d..3f5632f24 100644
--- a/tr.po
+++ b/tr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-09-14 14:42+0200\n"
+"POT-Creation-Date: 2019-10-21 09:17+0200\n"
 "PO-Revision-Date: 2019-06-22 05:22+\n"
 "Last-Translator: Kaya Zeren

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

2019-10-21 Thread translation

commit 5ff301bd0728c0f380b66f13f699bb778b5d7ea7
Author: Translation commit bot 
Date:   Mon Oct 21 13:49:01 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tails-perl5lib_completed
---
 de.po| 2 +-
 el.po| 2 +-
 es.po| 2 +-
 es_AR.po | 2 +-
 fr.po| 2 +-
 ga.po| 2 +-
 he.po| 2 +-
 hu.po| 2 +-
 id.po| 2 +-
 mk.po| 2 +-
 nl.po| 2 +-
 pt_BR.po | 2 +-
 ro.po| 2 +-
 tr.po| 2 +-
 zh_CN.po | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/de.po b/de.po
index 66e1a5fdc..17e8bc2c6 100644
--- a/de.po
+++ b/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"POT-Creation-Date: 2019-10-21 09:04+0200\n"
 "PO-Revision-Date: 2018-05-11 14:17+\n"
 "Last-Translator: spriver\n"
 "Language-Team: German 
(http://www.transifex.com/otf/torproject/language/de/)\n"
diff --git a/el.po b/el.po
index b4879ff0e..2929de469 100644
--- a/el.po
+++ b/el.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"POT-Creation-Date: 2019-10-21 09:04+0200\n"
 "PO-Revision-Date: 2019-01-02 12:08+\n"
 "Last-Translator: Sofia K.\n"
 "Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
diff --git a/es.po b/es.po
index a29b6b62e..64c2c0fc0 100644
--- a/es.po
+++ b/es.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"POT-Creation-Date: 2019-10-21 09:04+0200\n"
 "PO-Revision-Date: 2018-04-09 11:03+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
diff --git a/es_AR.po b/es_AR.po
index 95ba0adc9..7afe7fafc 100644
--- a/es_AR.po
+++ b/es_AR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"POT-Creation-Date: 2019-10-21 09:04+0200\n"
 "PO-Revision-Date: 2018-09-15 03:13+\n"
 "Last-Translator: Zuhualime Akoochimoya\n"
 "Language-Team: Spanish (Argentina) 
(http://www.transifex.com/otf/torproject/language/es_AR/)\n"
diff --git a/fr.po b/fr.po
index a78142524..98927a33f 100644
--- a/fr.po
+++ b/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"POT-Creation-Date: 2019-10-21 09:04+0200\n"
 "PO-Revision-Date: 2018-08-08 18:00+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
diff --git a/ga.po b/ga.po
index d9233d8f3..f94d75659 100644
--- a/ga.po
+++ b/ga.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"POT-Creation-Date: 2019-10-21 09:04+0200\n"
 "PO-Revision-Date: 2018-04-03 13:22+\n"
 "Last-Translator: Kevin Scannell \n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
diff --git a/he.po b/he.po
index 83d545612..d7041f6ad 100644
--- a/he.po
+++ b/he.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"POT-Creation-Date: 2019-10-21 09:04+0200\n"
 "PO-Revision-Date: 2018-04-04 06:17+\n"
 "Last-Translator: ION\n"
 "Language-Team: Hebrew 
(http://www.transifex.com/otf/torproject/language/he/)\n"
diff --git a/hu.po b/hu.po
index 4dde3be2f..83e083192 100644
--- a/hu.po
+++ b/hu.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"POT-Creation-Date: 2019-10-21 09:04+0200\n"
 "PO-Revision-Date: 2018-09-04 20:17+\n"
 "Last-Translator: vargaviktor \n"
 "Language-Team: Hungarian 
(http://www.transifex.com/otf/torproject/language/hu/)\n"
diff --git a/id.po b/id.po
index 7981b8f1a..0a089c95c 100644
--- a/id.po
+++ b/id.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"POT-Creation-Date: 2019-10-21 09:04+0200\n"
 "PO-Revision-Date: 2019-06-06 16:58+\n"
 "Last-Translator: se7entime \n"
 "Language-Team: Indonesian 
(http://www.transifex.com/otf/torproject/language/id/)\n"
diff --git a/mk.po b/mk.po
index 0dc054eb2..076b85730 100644
--- a/mk.po
+++ b/mk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-01-06 16:58+0100\n"
+"POT-Creation-Date: 2019-10-21 09:04+0200\n"
 "PO-Revision-Date: 2019-10-04

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

2019-10-21 Thread translation

commit 76e19d60e22c309b25c1ba5cb94d1b8aed6e
Author: Translation commit bot 
Date:   Mon Oct 21 13:46:20 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=liveusb-creator_completed
---
 es/es.po   | 2 +-
 es_AR/es_AR.po | 2 +-
 fr/fr.po   | 2 +-
 ga/ga.po   | 2 +-
 hu/hu.po   | 2 +-
 it/it.po   | 2 +-
 mk/mk.po   | 2 +-
 tr/tr.po   | 2 +-
 zh_CN/zh_CN.po | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/es/es.po b/es/es.po
index a152efd0b..75e78e7d5 100644
--- a/es/es.po
+++ b/es/es.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-10 07:20+0200\n"
+"POT-Creation-Date: 2019-10-21 09:03+0200\n"
 "PO-Revision-Date: 2019-04-23 08:10+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
diff --git a/es_AR/es_AR.po b/es_AR/es_AR.po
index 37c18d292..4e919711d 100644
--- a/es_AR/es_AR.po
+++ b/es_AR/es_AR.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-10 07:20+0200\n"
+"POT-Creation-Date: 2019-10-21 09:03+0200\n"
 "PO-Revision-Date: 2019-06-02 19:18+\n"
 "Last-Translator: JoaquÃn Serna \n"
 "Language-Team: Spanish (Argentina) 
(http://www.transifex.com/otf/torproject/language/es_AR/)\n"
diff --git a/fr/fr.po b/fr/fr.po
index 7548a455f..590fbe8cd 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -44,7 +44,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-10 07:20+0200\n"
+"POT-Creation-Date: 2019-10-21 09:03+0200\n"
 "PO-Revision-Date: 2019-10-18 21:39+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
diff --git a/ga/ga.po b/ga/ga.po
index 0b72ce959..81f2977e6 100644
--- a/ga/ga.po
+++ b/ga/ga.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-10 07:20+0200\n"
+"POT-Creation-Date: 2019-10-21 09:03+0200\n"
 "PO-Revision-Date: 2019-04-14 11:08+\n"
 "Last-Translator: Kevin Scannell \n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
diff --git a/hu/hu.po b/hu/hu.po
index a61708743..1ede11bfc 100644
--- a/hu/hu.po
+++ b/hu/hu.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-10 07:20+0200\n"
+"POT-Creation-Date: 2019-10-21 09:03+0200\n"
 "PO-Revision-Date: 2019-08-19 10:47+\n"
 "Last-Translator: vargaviktor \n"
 "Language-Team: Hungarian 
(http://www.transifex.com/otf/torproject/language/hu/)\n"
diff --git a/it/it.po b/it/it.po
index 80ba58366..89b83aa9b 100644
--- a/it/it.po
+++ b/it/it.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-10 07:20+0200\n"
+"POT-Creation-Date: 2019-10-21 09:03+0200\n"
 "PO-Revision-Date: 2019-08-21 15:01+\n"
 "Last-Translator: Davide Sant \n"
 "Language-Team: Italian 
(http://www.transifex.com/otf/torproject/language/it/)\n"
diff --git a/mk/mk.po b/mk/mk.po
index 76727c81c..a984e8718 100644
--- a/mk/mk.po
+++ b/mk/mk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-10 07:20+0200\n"
+"POT-Creation-Date: 2019-10-21 09:03+0200\n"
 "PO-Revision-Date: 2019-10-08 23:59+\n"
 "Last-Translator: Zarko Gjurov \n"
 "Language-Team: Macedonian 
(http://www.transifex.com/otf/torproject/language/mk/)\n"
diff --git a/tr/tr.po b/tr/tr.po
index 1de2ee1ed..ea808f2dc 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-10 07:20+0200\n"
+"POT-Creation-Date: 2019-10-21 09:03+0200\n"
 "PO-Revision-Date: 2019-06-22 05:25+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 32ff7d85e..5a9d2d308 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-10-10 07:20+0200\n"
+"POT-Creation-Date: 2019-10-21 09:03+0200\n"
 "PO-Revision-Date: 2019-05-30 00:52+\n"
 "Last-Translator: ff98sha\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"

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

[tor-commits] [tpo/master] new jobpost

2019-10-21 Thread emmapeel

commit 2fb9e4ad16d2d04a3e0400da8718d3b1b9e612ba
Author: emma peel 
Date:   Mon Oct 21 14:05:27 2019 +0200

new jobpost
---
 .../jobs/shadow-simulation-developer/contents.lr   | 89 ++
 1 file changed, 89 insertions(+)

diff --git a/content/about/jobs/shadow-simulation-developer/contents.lr 
b/content/about/jobs/shadow-simulation-developer/contents.lr
new file mode 100644
index 000..0a44aab
--- /dev/null
+++ b/content/about/jobs/shadow-simulation-developer/contents.lr
@@ -0,0 +1,89 @@
+_model: job
+---
+_template: about.html
+---
+active: False
+---
+section: about
+---
+section_id: about
+---
+title: Shadow Simulation Developer
+---
+summary:
+
+The Tor Project is looking for a Shadow Simulation Developer!
+
+---
+description:
+
+## The Tor Project is looking for a Shadow Simulation Developer
+*October 18, 2019*
+
+We are seeking an experienced programmer to help us develop cutting-edge 
network simulation / emulation software.
+This person will be responsible for the implementation, documentation, and 
testing of software to support research into privacy-enhancing technologies.
+In particular, this person will be contributing to software that constructs 
large, realistic, high fidelity simulations of anonymity networks, allowing 
other researchers to run existing software (e.g., Tor) on top of a virtualized 
network.
+As such, this person should be comfortable working with established codebases 
(github.com/shadow) and incrementally improving them through modular design.
+
+The ideal candidate will have significant practical programming skills, 
specifically, expertise in parallel program design and development.
+
+For programming experience we seek a candidate with demonstrated ability to 
write correct, maintainable code in both Python and C.
+Experience with Rust, or a strong desire to learn to program in Rust, is 
preferred.
+In addition to high familiarity with parallel programming, the candidate will 
possess knowledge of the Linux operating system, networking, and algorithms at 
the BS level or higher.
+The candidate should be able to work both independently and as part of a small 
team, with strong communication skills and the ability to read and understand 
research papers and other technical documents.
+
+The person in this position will work as part of a small cross-organizational 
development team, along with another simulation developer working in Micah 
Sherr's SecurityLab at the Georgetown University.
+Rob Jansen at the U.S. Naval Research Laboratory will oversee and lead the 
team, however, the person in this position is integrated into the Tor Project 
Community through working with its Network Team.
+
+The ideal candidate will be based in the Washington DC area (in which case we 
will try to get you them desk at the Georgetown University).
+However, we will be considering remote candidates.
+
+This position has full-time funding for three years, with the possibility to 
continue in another role thereafter, depending on organizational finances.
+
+**Required Qualifications:**
+
+- Programming experience in Python and C.
+- Experience developing and running software in Linux.
+- Experience developing software using parallel programming models 
(multi-threading / multi-processing, shared memory, message passing).
+- Knowledge of networking: socket programming, TCP/IP, etc.
+- Experience interacting with users and other developers online, including 
experience being exposed to and discussing differing ideas and opinions, while 
maintaining a high level of respect and professionalism.
+- Comfort with transparency: as a non-profit organization who develops open 
source software, most of what we do is public.
+
+**Preferred qualifications:**
+
+- Familiarity with network simulation and/or emulation.
+- Familiarity with developing and scaling distributed systems.
+- Experience working with distributed (remote) teams across different 
time-zones with people of differing skill levels over multiple mediums, 
including email, instant messaging, and IRC.
+- Familiarity with or willingness/ability to learn the Rust programming 
language.
+- Open-source experience: contributed significant chunks of code to multiple 
open-source projects in the past.
+- Familiarity with distributed version control systems, including Git.
+- Genuinely be excited about Tor and its values!
+- Willingness and ability to travel internationally to twice-yearly team 
meetings (strongly preferred).
+
+**Key responsibilities include but are not limited to**
+
+- Software Development - software development, writing test cases, and coding 
review.
+- Evaluations - system evaluation, including performance.
+- Documentation - coding documentation, and assisting in preparing technical 
reports.
+
+Academic degrees are great, but not required if you have the right experience!
+
+Salary negotiable. We have a competitive benefits package, including a 
generous PTO policy; 14 paid holidays per year (US;

[tor-commits] [tpo/master] show job offer

2019-10-21 Thread emmapeel

commit af59055c806ceb3ac2107a3165193e67792ada59
Author: emma peel 
Date:   Mon Oct 21 15:28:44 2019 +0200

show job offer
---
 content/about/jobs/shadow-simulation-developer/contents.lr | 2 +-
 templates/jobs.html| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/about/jobs/shadow-simulation-developer/contents.lr 
b/content/about/jobs/shadow-simulation-developer/contents.lr
index b6f51c8..338da9b 100644
--- a/content/about/jobs/shadow-simulation-developer/contents.lr
+++ b/content/about/jobs/shadow-simulation-developer/contents.lr
@@ -2,7 +2,7 @@ _model: job
 ---
 _template: about.html
 ---
-active: False
+active: True
 ---
 section: about
 ---
diff --git a/templates/jobs.html b/templates/jobs.html
index 58dbf3c..18d8355 100644
--- a/templates/jobs.html
+++ b/templates/jobs.html
@@ -5,7 +5,7 @@
   
 {% from "macros/jobs.html" import render_active %}
 {% set items = this.children.filter(F.active == True).all() %}
-{% if items|length > 1 %}
+{% if items|length > 0 %}
   {% for item in items %}
 {{ render_active(item, this.alt) }}
   {% endfor %}

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

[tor-commits] [tpo/master] typos

2019-10-21 Thread emmapeel

commit a02f8ce4bfe8a8052467a2e0ef1b051b57f2e925
Author: emma peel 
Date:   Mon Oct 21 15:28:22 2019 +0200

typos
---
 content/about/jobs/shadow-simulation-developer/contents.lr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/about/jobs/shadow-simulation-developer/contents.lr 
b/content/about/jobs/shadow-simulation-developer/contents.lr
index 0a44aab..b6f51c8 100644
--- a/content/about/jobs/shadow-simulation-developer/contents.lr
+++ b/content/about/jobs/shadow-simulation-developer/contents.lr
@@ -32,10 +32,10 @@ Experience with Rust, or a strong desire to learn to 
program in Rust, is preferr
 In addition to high familiarity with parallel programming, the candidate will 
possess knowledge of the Linux operating system, networking, and algorithms at 
the BS level or higher.
 The candidate should be able to work both independently and as part of a small 
team, with strong communication skills and the ability to read and understand 
research papers and other technical documents.
 
-The person in this position will work as part of a small cross-organizational 
development team, along with another simulation developer working in Micah 
Sherr's SecurityLab at the Georgetown University.
+The person in this position will work as part of a small cross-organizational 
development team, along with another simulation developer working in Micah 
Sherr's SecurityLab at Georgetown University.
 Rob Jansen at the U.S. Naval Research Laboratory will oversee and lead the 
team, however, the person in this position is integrated into the Tor Project 
Community through working with its Network Team.
 
-The ideal candidate will be based in the Washington DC area (in which case we 
will try to get you them desk at the Georgetown University).
+The ideal candidate will be based in the Washington DC area (in which case we 
will try to get you a desk at Georgetown University).
 However, we will be considering remote candidates.
 
 This position has full-time funding for three years, with the possibility to 
continue in another role thereafter, depending on organizational finances.



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

[tor-commits] [tpo/staging] typos

2019-10-21 Thread emmapeel

commit a19ca4de1b684e186010af1c5edf44b497074110
Author: emma peel 
Date:   Mon Oct 21 15:28:22 2019 +0200

typos
---
 content/about/jobs/shadow-simulation-developer/contents.lr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/about/jobs/shadow-simulation-developer/contents.lr 
b/content/about/jobs/shadow-simulation-developer/contents.lr
index 0a44aab..b6f51c8 100644
--- a/content/about/jobs/shadow-simulation-developer/contents.lr
+++ b/content/about/jobs/shadow-simulation-developer/contents.lr
@@ -32,10 +32,10 @@ Experience with Rust, or a strong desire to learn to 
program in Rust, is preferr
 In addition to high familiarity with parallel programming, the candidate will 
possess knowledge of the Linux operating system, networking, and algorithms at 
the BS level or higher.
 The candidate should be able to work both independently and as part of a small 
team, with strong communication skills and the ability to read and understand 
research papers and other technical documents.
 
-The person in this position will work as part of a small cross-organizational 
development team, along with another simulation developer working in Micah 
Sherr's SecurityLab at the Georgetown University.
+The person in this position will work as part of a small cross-organizational 
development team, along with another simulation developer working in Micah 
Sherr's SecurityLab at Georgetown University.
 Rob Jansen at the U.S. Naval Research Laboratory will oversee and lead the 
team, however, the person in this position is integrated into the Tor Project 
Community through working with its Network Team.
 
-The ideal candidate will be based in the Washington DC area (in which case we 
will try to get you them desk at the Georgetown University).
+The ideal candidate will be based in the Washington DC area (in which case we 
will try to get you a desk at Georgetown University).
 However, we will be considering remote candidates.
 
 This position has full-time funding for three years, with the possibility to 
continue in another role thereafter, depending on organizational finances.



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

[tor-commits] [tpo/staging] show job offer

2019-10-21 Thread emmapeel

commit f5e6123e50a994794813dc60fa1ce3e9a7c699fa
Author: emma peel 
Date:   Mon Oct 21 15:28:44 2019 +0200

show job offer
---
 content/about/jobs/shadow-simulation-developer/contents.lr | 2 +-
 templates/jobs.html| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/about/jobs/shadow-simulation-developer/contents.lr 
b/content/about/jobs/shadow-simulation-developer/contents.lr
index b6f51c8..338da9b 100644
--- a/content/about/jobs/shadow-simulation-developer/contents.lr
+++ b/content/about/jobs/shadow-simulation-developer/contents.lr
@@ -2,7 +2,7 @@ _model: job
 ---
 _template: about.html
 ---
-active: False
+active: True
 ---
 section: about
 ---
diff --git a/templates/jobs.html b/templates/jobs.html
index 58dbf3c..18d8355 100644
--- a/templates/jobs.html
+++ b/templates/jobs.html
@@ -5,7 +5,7 @@
   
 {% from "macros/jobs.html" import render_active %}
 {% set items = this.children.filter(F.active == True).all() %}
-{% if items|length > 1 %}
+{% if items|length > 0 %}
   {% for item in items %}
 {{ render_active(item, this.alt) }}
   {% endfor %}

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

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

2019-10-21 Thread translation

commit bb46e753757a8e1992b160faa512458256c429c4
Author: Translation commit bot 
Date:   Mon Oct 21 13:19:48 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup_completed
---
 es/es.po   | 2 +-
 fr/fr.po   | 2 +-
 ga/ga.po   | 2 +-
 mk/mk.po   | 2 +-
 tr/tr.po   | 2 +-
 zh_CN/zh_CN.po | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/es/es.po b/es/es.po
index ed438094f..10bc57055 100644
--- a/es/es.po
+++ b/es/es.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-10-10 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 09:06+0200\n"
 "PO-Revision-Date: 2019-10-08 19:38+\n"
 "Last-Translator: Emma Peel\n"
 "Language-Team: Spanish 
(http://www.transifex.com/otf/torproject/language/es/)\n"
diff --git a/fr/fr.po b/fr/fr.po
index 5652ce204..95d7f5a84 100644
--- a/fr/fr.po
+++ b/fr/fr.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-10-10 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 09:06+0200\n"
 "PO-Revision-Date: 2019-10-18 21:26+\n"
 "Last-Translator: AO \n"
 "Language-Team: French 
(http://www.transifex.com/otf/torproject/language/fr/)\n"
diff --git a/ga/ga.po b/ga/ga.po
index 7aa09394f..787a3f25d 100644
--- a/ga/ga.po
+++ b/ga/ga.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-10-10 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 09:06+0200\n"
 "PO-Revision-Date: 2019-10-12 18:53+\n"
 "Last-Translator: Kevin Scannell \n"
 "Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
diff --git a/mk/mk.po b/mk/mk.po
index 3a68a73f2..153457c9d 100644
--- a/mk/mk.po
+++ b/mk/mk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-10-10 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 09:06+0200\n"
 "PO-Revision-Date: 2019-10-09 00:07+\n"
 "Last-Translator: Liljana Ackovska \n"
 "Language-Team: Macedonian 
(http://www.transifex.com/otf/torproject/language/mk/)\n"
diff --git a/tr/tr.po b/tr/tr.po
index 92d18a0ed..948a5cd0b 100644
--- a/tr/tr.po
+++ b/tr/tr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-10-10 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 09:06+0200\n"
 "PO-Revision-Date: 2019-10-08 18:09+\n"
 "Last-Translator: Kaya Zeren \n"
 "Language-Team: Turkish 
(http://www.transifex.com/otf/torproject/language/tr/)\n"
diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 97f9cfb71..a70057908 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
-"POT-Creation-Date: 2019-10-10 07:43+0200\n"
+"POT-Creation-Date: 2019-10-21 09:06+0200\n"
 "PO-Revision-Date: 2019-10-09 00:26+\n"
 "Last-Translator: ff98sha\n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"

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

[tor-commits] [tpo/staging] new jobpost

2019-10-21 Thread emmapeel

commit 6caa7784a53cd602bc0c555223f9b5211eabc9ff
Author: emma peel 
Date:   Mon Oct 21 14:05:27 2019 +0200

new jobpost
---
 .../jobs/shadow-simulation-developer/contents.lr   | 89 ++
 1 file changed, 89 insertions(+)

diff --git a/content/about/jobs/shadow-simulation-developer/contents.lr 
b/content/about/jobs/shadow-simulation-developer/contents.lr
new file mode 100644
index 000..0a44aab
--- /dev/null
+++ b/content/about/jobs/shadow-simulation-developer/contents.lr
@@ -0,0 +1,89 @@
+_model: job
+---
+_template: about.html
+---
+active: False
+---
+section: about
+---
+section_id: about
+---
+title: Shadow Simulation Developer
+---
+summary:
+
+The Tor Project is looking for a Shadow Simulation Developer!
+
+---
+description:
+
+## The Tor Project is looking for a Shadow Simulation Developer
+*October 18, 2019*
+
+We are seeking an experienced programmer to help us develop cutting-edge 
network simulation / emulation software.
+This person will be responsible for the implementation, documentation, and 
testing of software to support research into privacy-enhancing technologies.
+In particular, this person will be contributing to software that constructs 
large, realistic, high fidelity simulations of anonymity networks, allowing 
other researchers to run existing software (e.g., Tor) on top of a virtualized 
network.
+As such, this person should be comfortable working with established codebases 
(github.com/shadow) and incrementally improving them through modular design.
+
+The ideal candidate will have significant practical programming skills, 
specifically, expertise in parallel program design and development.
+
+For programming experience we seek a candidate with demonstrated ability to 
write correct, maintainable code in both Python and C.
+Experience with Rust, or a strong desire to learn to program in Rust, is 
preferred.
+In addition to high familiarity with parallel programming, the candidate will 
possess knowledge of the Linux operating system, networking, and algorithms at 
the BS level or higher.
+The candidate should be able to work both independently and as part of a small 
team, with strong communication skills and the ability to read and understand 
research papers and other technical documents.
+
+The person in this position will work as part of a small cross-organizational 
development team, along with another simulation developer working in Micah 
Sherr's SecurityLab at the Georgetown University.
+Rob Jansen at the U.S. Naval Research Laboratory will oversee and lead the 
team, however, the person in this position is integrated into the Tor Project 
Community through working with its Network Team.
+
+The ideal candidate will be based in the Washington DC area (in which case we 
will try to get you them desk at the Georgetown University).
+However, we will be considering remote candidates.
+
+This position has full-time funding for three years, with the possibility to 
continue in another role thereafter, depending on organizational finances.
+
+**Required Qualifications:**
+
+- Programming experience in Python and C.
+- Experience developing and running software in Linux.
+- Experience developing software using parallel programming models 
(multi-threading / multi-processing, shared memory, message passing).
+- Knowledge of networking: socket programming, TCP/IP, etc.
+- Experience interacting with users and other developers online, including 
experience being exposed to and discussing differing ideas and opinions, while 
maintaining a high level of respect and professionalism.
+- Comfort with transparency: as a non-profit organization who develops open 
source software, most of what we do is public.
+
+**Preferred qualifications:**
+
+- Familiarity with network simulation and/or emulation.
+- Familiarity with developing and scaling distributed systems.
+- Experience working with distributed (remote) teams across different 
time-zones with people of differing skill levels over multiple mediums, 
including email, instant messaging, and IRC.
+- Familiarity with or willingness/ability to learn the Rust programming 
language.
+- Open-source experience: contributed significant chunks of code to multiple 
open-source projects in the past.
+- Familiarity with distributed version control systems, including Git.
+- Genuinely be excited about Tor and its values!
+- Willingness and ability to travel internationally to twice-yearly team 
meetings (strongly preferred).
+
+**Key responsibilities include but are not limited to**
+
+- Software Development - software development, writing test cases, and coding 
review.
+- Evaluations - system evaluation, including performance.
+- Documentation - coding documentation, and assisting in preparing technical 
reports.
+
+Academic degrees are great, but not required if you have the right experience!
+
+Salary negotiable. We have a competitive benefits package, including a 
generous PTO policy; 14 paid holidays per year (US;

[tor-commits] [tor-browser-spec/master] Bug 32147: Update release instructions with Torbutton changes for 9.0

2019-10-21 Thread gk

commit f8ce4dbe63724b0af30ec2132174f19908d843f3
Author: Georg Koppen 
Date:   Mon Oct 21 12:47:15 2019 +

Bug 32147: Update release instructions with Torbutton changes for 9.0
---
 processes/ReleaseProcess | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess
index 2b772e5..f6256db 100644
--- a/processes/ReleaseProcess
+++ b/processes/ReleaseProcess
@@ -4,6 +4,10 @@
 #
 
 #. Tag any relevant component versions.
+#  In particular: before tagging the tor-browser tag, the final code from
+#  Torbutton needs to get included and in order to avoid unnecessary commit
+#  inflation the commit for bumping the git submodule should be a fixup commit
+#  to the one with "Pick up latest Torbutton code" in its commit message.
 
 #. Update changelog and relevant config files in tor-browser-build.
cd tor-browser-build
@@ -45,6 +49,8 @@
# For stable releases put tails-...@boum.org into Cc.
 
 #. Codesign the macOS dmg files.
+   # XXX: Update with Notarization bits once they are included in our signing
+   # setup
torsocks ssh mac-signer "mkdir $TORBROWSER_VERSION"
torsocks rsync -avP $TORBROWSER_BUILDDIR/*.dmg 
mac-signer:$TORBROWSER_VERSION/
torsocks ssh mac-signer



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

[tor-commits] [tor-browser-spec/master] Merge branch 'bug_32147'

2019-10-21 Thread gk

commit b11c935c4ef26a0a1317a2213b42e38186ba4970
Merge: d25eeb6 f8ce4db
Author: Georg Koppen 
Date:   Mon Oct 21 12:49:17 2019 +

Merge branch 'bug_32147'

 processes/ReleaseProcess | 6 ++
 1 file changed, 6 insertions(+)

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

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

2019-10-21 Thread translation

commit 1dc0e9422fe829464e290338bd317841d8a26638
Author: Translation commit bot 
Date:   Mon Oct 21 08:21:45 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd_completed
---
 tr/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/abouttbupdate.dtd b/tr/abouttbupdate.dtd
index 507b19880..d8e3612f0 100644
--- a/tr/abouttbupdate.dtd
+++ b/tr/abouttbupdate.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 

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

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

2019-10-21 Thread translation

commit 343d189199deecaf99c687c0f43ccdff7829b360
Author: Translation commit bot 
Date:   Mon Oct 21 08:21:39 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-abouttbupdatedtd
---
 tr/abouttbupdate.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tr/abouttbupdate.dtd b/tr/abouttbupdate.dtd
index 507b19880..d8e3612f0 100644
--- a/tr/abouttbupdate.dtd
+++ b/tr/abouttbupdate.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 

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

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

2019-10-21 Thread translation

commit bfa2cf21a4b00ca8d6c418ce309750179267ef63
Author: Translation commit bot 
Date:   Mon Oct 21 08:20:10 2019 +


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

diff --git a/contents+tr.po b/contents+tr.po
index 51398d813..eeae10c2c 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -5,6 +5,7 @@
 # Emma Peel, 2019
 # erinm, 2019
 # Kaya Zeren , 2019
+# Volkan Gezer , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Kaya Zeren , 2019\n"
+"Last-Translator: Volkan Gezer , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -244,7 +245,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.title)
 msgid "DOWNLOADING"
-msgstr "Ä°NDÄ°RÄ°LÄ°YOR"
+msgstr "Ä°NDÄ°RMEK"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.description)

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

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

2019-10-21 Thread translation

commit e473282c90ee709a746e969bded238fbc93a880b
Author: Translation commit bot 
Date:   Mon Oct 21 08:20:01 2019 +

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

diff --git a/contents+tr.po b/contents+tr.po
index 51398d813..eeae10c2c 100644
--- a/contents+tr.po
+++ b/contents+tr.po
@@ -5,6 +5,7 @@
 # Emma Peel, 2019
 # erinm, 2019
 # Kaya Zeren , 2019
+# Volkan Gezer , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-09-05 17:40+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Kaya Zeren , 2019\n"
+"Last-Translator: Volkan Gezer , 2019\n"
 "Language-Team: Turkish (https://www.transifex.com/otf/teams/1519/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -244,7 +245,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.title)
 msgid "DOWNLOADING"
-msgstr "Ä°NDÄ°RÄ°LÄ°YOR"
+msgstr "Ä°NDÄ°RMEK"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.description)

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

[tor-commits] [tpo/staging] remove unpushed lego commit from submodule

2019-10-21 Thread emmapeel

commit a428daf22bb523e60fa3632e17b3f7309f4f4405
Author: emma peel 
Date:   Mon Oct 21 10:04:47 2019 +0200

remove unpushed lego commit from submodule
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index f69eb16..a2e8d34 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit f69eb16bf837b326cdec06e1af22a26770cdac38
+Subproject commit a2e8d340105281a2b7bbfe422a17f72e402ee1a8

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

94 matches

Mail list logo