December 2019 - tor-commits - lists.torproject.org

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 10 Dec '19

10 Dec '19

commit 94403a2317f3b8b6f23561201bda1ca9403d8d9e Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 10 09:20:16 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ru.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+ru.po b/contents+ru.po index 1c8d029b9d..b43b1c67dc 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -817,6 +817,8 @@ msgid "" "If you try all of these options, and none of them gets you online, you will " "need to enter bridge addresses manually." msgstr "" +"Если вы пробуете все эти варианты, и ни один из них не подключает вас к " +"сети, вам нужно будет ввести адреса моста вручную." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 10 Dec '19

10 Dec '19

commit 0572ed1780daaa7497a39325da7433775817fbd9 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 10 08:50:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ru.po | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 93a7c5d4b8..1c8d029b9d 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -440,6 +440,8 @@ msgid "" "4. When the download is complete, double click the `.exe` file. Complete the" " installation wizard process." msgstr "" +"4. Когда загрузка будет завершена, дважды щелкните на `.exe` файл. Завершите" +" процесс установки." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -451,7 +453,7 @@ msgstr "Для macOS:" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "2. Download the macOS `.dmg` file" -msgstr "" +msgstr "2. Загрузите `.dmg` файл для macOS" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -459,6 +461,8 @@ msgid "" "4. When the download is complete, double click the `.dmg` file. Complete the" " installation wizard process." msgstr "" +"4. Когда загрузка будет завершена, дважды щелкните на `.dmg` файл. Завершите" +" процесс установки." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -470,7 +474,7 @@ msgstr "Для GNU/Linux:" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "2. Download the GNU/Linux `.tar.xz` file" -msgstr "" +msgstr "2. Загрузите `.tar.xz` файл для GNU/Linux" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -513,7 +517,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "`./start-tor-browser`" -msgstr "" +msgstr "`./start-tor-browser`" #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.title) @@ -658,7 +662,7 @@ msgstr "" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) msgid "### TYPES OF PLUGGABLE TRANSPORT" -msgstr "" +msgstr "### ВИДЫ ПОДКЛЮЧАЕМОГО ТРАНСПОРТА" #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -794,6 +798,9 @@ msgid "" "Each of the transports listed in Tor Launcher’s menu works in a different " "way, and their effectiveness depends on your individual circumstances." msgstr "" +"Каждый из транспортов, перечисленных в меню запуска Tor, работает по-" +"разному, и их результативность зависит от ваших индивидуальных " +"обстоятельств." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -801,6 +808,8 @@ msgid "" "If you are trying to circumvent a blocked connection for the first time, you" " should try the different transports: obfs4, snowflake, and meek-azure." msgstr "" +"Если вы пытаетесь обойти заблокированное соединение в первый раз, вы должны " +"попробовать различные транспортны: obfs4, snowflake и meek-azure." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 10 Dec '19

10 Dec '19

commit 988f48b0da5dd2470cdc7c3a8e18a77914a1a1a3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Dec 10 08:20:11 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ru.po | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/contents+ru.po b/contents+ru.po index 21a58f209b..93a7c5d4b8 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -8,8 +8,8 @@ # erinm, 2019 # Мария Романенко <mary.romanenko(a)gmail.com>, 2019 # IvanLykov <chabib(a)list.ru>, 2019 -# diana azaryan <dianazryn(a)gmail.com>, 2019 # Sergey Smirnov <cj75300(a)gmail.com>, 2019 +# diana azaryan <dianazryn(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-29 10:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Sergey Smirnov <cj75300(a)gmail.com>, 2019\n" +"Last-Translator: diana azaryan <dianazryn(a)gmail.com>, 2019\n" "Language-Team: Russian (https://www.transifex.com/otf/teams/1519/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -328,6 +328,10 @@ msgid "" "mirrors, either through [EFF](https://tor.eff.org), [Calyx " "Institute](https://tor.calyxinstitute.org) or [CCC](https://tor.ccc.de)." msgstr "" +"Если вы не можете загрузить Tor Browser с официального сайта Tor Project, вы" +" можете попробовать загрузить его с одного из наших официальных зеркал, либо" +" через [EFF](https://tor.eff.org), [Calyx " +"Institute](https://tor.calyxinstitute.org) или [ССС](https://tor.ccc.de)." #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -381,6 +385,7 @@ msgstr "" #: (content/downloading/contents+en.lrtopic.body) msgid "### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):" msgstr "" +"### ЧТОБЫ ИСПОЛЬЗОВАТЬ GETTOR ЧЕРЕЗ JABBER/XMPP (JITSI, COYIM, И Т. Д.):" #: https//tb-manual.torproject.org/downloading/ #: (content/downloading/contents+en.lrtopic.body) @@ -399,7 +404,7 @@ msgstr "УСТАНОВКА" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.description) msgid "Installing Tor Browser" -msgstr "" +msgstr "Установка Tor Browser" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -414,11 +419,13 @@ msgid "" "1. Navigate to the Tor Browser [download " "page](https://www.torproject.org/download)." msgstr "" +"1. Перейдите на Tor Browser [страницу " +"закгрузки](https://www.torproject.org/download)." #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "2. Download the Windows `.exe` file" -msgstr "" +msgstr "2. Загрузите `.exe` файл для Windows" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body)

1 0

[dip/master] Record gitaly latency
by hiro＠torproject.org 10 Dec '19

10 Dec '19

commit 02b0cdd435554354607323c50144bac90e77f9c8 Author: hiro <hiro(a)torproject.org> Date: Tue Dec 10 09:04:52 2019 +0100 Record gitaly latency --- roles/gitaly/templates/gitaly.toml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/gitaly/templates/gitaly.toml.j2 b/roles/gitaly/templates/gitaly.toml.j2 index e70a0f8..22a2e60 100644 --- a/roles/gitaly/templates/gitaly.toml.j2 +++ b/roles/gitaly/templates/gitaly.toml.j2 @@ -37,8 +37,8 @@ level = "info" dir = "{{ ansible_user_dir }}/log/gitaly" # # You can optionally configure Gitaly to record histogram latencies on GRPC method calls -# [prometheus] -# grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0] +[prometheus] +grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0] [gitaly-ruby] # The directory where gitaly-ruby is installed

1 0

[tor-browser/tor-browser-68.3.0esr-9.5-1] fixup! TB3: Tor Browser's official .mozconfigs.
by gk＠torproject.org 10 Dec '19

10 Dec '19

commit cb3038cf717f25e759fb3fdc0a8e941dbfc4e0f1 Author: Richard Pospesel <richard(a)torproject.org> Date: Mon Dec 9 16:55:21 2019 -0800 fixup! TB3: Tor Browser's official .mozconfigs. --- .mozconfig | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/.mozconfig b/.mozconfig index 9383f1ad1a73..b4c5440304ac 100755 --- a/.mozconfig +++ b/.mozconfig @@ -1,5 +1,14 @@ . $topsrcdir/browser/config/mozconfig +# This mozconfig file is not used in official Tor Browser builds. +# It is only intended to be used when doing incremental Linux builds +# during development. The platform-specific mozconfig configuration +# files used in official Tor Browser releases can be found in the +# tor-browser-build repo: +# https://gitweb.torproject.org/builders/tor-browser-build.git/ +# under: +# tor-browser-build/projects/firefox/mozconfig-$OS-$ARCH + mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-@CONFIG_GUESS@ mk_add_options MOZ_APP_DISPLAYNAME="Tor Browser" export MOZILLA_OFFICIAL=1 @@ -10,7 +19,8 @@ ac_add_options --enable-official-branding # Let's support GTK3 for ESR60 ac_add_options --enable-default-toolkit=cairo-gtk3 -ac_add_options --enable-tor-browser-update +ac_add_options --disable-tor-launcher +ac_add_options --disable-tor-browser-update ac_add_options --enable-signmar ac_add_options --enable-verify-mar @@ -25,4 +35,6 @@ ac_add_options --disable-eme ac_add_options --enable-proxy-bypass-protection # Disable telemetry -ac_add_options MOZ_TELEMETRY_REPORTING= \ No newline at end of file +ac_add_options MOZ_TELEMETRY_REPORTING= + +ac_add_options --with-tor-browser-version=dev-build

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 09 Dec '19

09 Dec '19

commit 3efab25f1787924ce403a16a94338de7ee78d905 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 9 21:15:40 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/fa/LC_MESSAGES/messages.po | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/locale/fa/LC_MESSAGES/messages.po b/locale/fa/LC_MESSAGES/messages.po index a4fbca7647..cee5eaeb85 100644 --- a/locale/fa/LC_MESSAGES/messages.po +++ b/locale/fa/LC_MESSAGES/messages.po @@ -15,10 +15,11 @@ # Ali A D, 2019 # Shahzadeh Amir <dabamed196(a)tmail1.com>, 2019 # erinm, 2019 +# Samaneh M <asamana.haoma(a)gmail.com>, 2019 # msgid "" msgstr "" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Samaneh M <asamana.haoma(a)gmail.com>, 2019\n" "Language-Team: Persian (https://www.transifex.com/otf/teams/1519/fa/)\n" "Language: fa\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -42,20 +43,22 @@ msgid "" "The European shirt fits run a little small so you might want to consider " "sizing up." msgstr "" +"اندازه ی پیراهن ها در اروپا کمی کوچک تر از جاهای دیگر است، پس بهتر است سایز " +"خود را کمی بزرگتر انتخاب کنید." #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:54 msgid "Fit" -msgstr "" +msgstr "اندازه" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:58 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:508 msgid "Select Fit" -msgstr "" +msgstr "تناسب را انتخاب کنید" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:62 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:500 msgid "Slim" -msgstr "" +msgstr "لاغر" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:66 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:496 @@ -74,7 +77,7 @@ msgstr "اندازه" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:88 #: tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:512 msgid "Select Size" -msgstr "" +msgstr "اندازه را انتخاب کنید" #: tmp/cache_locale/eb/eb66db0fc2349cdc00200df1ba86814695c5deb02dc0f5941de0ada2f44eb52b.php:92 msgid "S" @@ -99,12 +102,12 @@ msgstr "XXL" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:47 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:70 msgid "Privacy and freedom online should be the default." -msgstr "" +msgstr "حریم شخصی و آزادی در اینترنت باید امری بدیهی باشد." #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:49 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:72 msgid "Donate to the Tor Project." -msgstr "" +msgstr "به پروژه‌ی تور اهدا کنید." #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:58 msgid "summary_large_image" @@ -123,7 +126,7 @@ msgstr "امروز از پروژه تور پشتیبانی کنید!" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:83 msgid "Want to donate by credit card or PayPal?" -msgstr "" +msgstr "آیا می‌خواهید با کارت یا پی‌پال اهدا کنید؟" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:92 msgid "Donate using BTCPayServer"

1 0

[tor/release-0.4.1] bump to 0.3.5.9-dev
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:01:11 2019 -0500 bump to 0.3.5.9-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 15b66eef6..834fea073 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.5.9]) +AC_INIT([tor],[0.3.5.9-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 32d468e79..9eeb32822 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.5.9" +!define VERSION "0.3.5.9-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 6d1801f85..baad733d0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.5.9" +#define VERSION "0.3.5.9-dev"

1 0

[tor/release-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8 Merge: c7ca3fc18 0c4f0ec97 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:01:22 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump.

1 0

[tor/release-0.4.1] Bump version to 0.4.0.6-dev
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit b9504f788c9798fab2b74d4006ba9b97151d6404 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:01:56 2019 -0500 Bump version to 0.4.0.6-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d66dd6db0..8990cd9fc 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.0.6]) +AC_INIT([tor],[0.4.0.6-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-05"], # for 0.4.0.6 +AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.0.6-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 29674dee4..93f3f72ec 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.4.0.6" +!define VERSION "0.4.0.6-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index fa1bc6814..bf746a19a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.0.6" +#define VERSION "0.4.0.6-dev"

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 09 Dec '19

09 Dec '19

commit 7aaf714e8eae3419b2885c937276c3f7ab28bdbc Merge: 6513102b9 b9504f788 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 9 16:02:07 2019 -0500 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0