date:20191209

[tor-commits] [tor-browser/tor-browser-68.3.0esr-9.5-1] fixup! TB3: Tor Browser's official .mozconfigs.

2019-12-09 Thread gk

commit cb3038cf717f25e759fb3fdc0a8e941dbfc4e0f1
Author: Richard Pospesel 
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

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

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

2019-12-09 Thread translation

commit 3efab25f1787924ce403a16a94338de7ee78d905
Author: Translation commit bot 
Date:   Mon Dec 9 21:15:40 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
---
 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 , 2019
 # erinm, 2019
+# Samaneh M , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: erinm, 2019\n"
+"Last-Translator: Samaneh M , 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"

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

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

2019-12-09 Thread nickm

commit 17561434ebcf01eaa86737b2acfb65df8b57a8b5
Merge: 3248630fc 7174a80ed
Author: Nick Mathewson 
Date:   Mon Dec 9 16:03:01 2019 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.




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

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

2019-12-09 Thread nickm

commit ee4375a98545aa12acc511ccde21de7a0af56043
Merge: bede4ea10 b7d18f861
Author: Nick Mathewson 
Date:   Mon Dec 9 16:04:22 2019 -0500

Merge branch 'maint-0.4.2' into release-0.4.2

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

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

[tor-commits] [tor/release-0.4.2] bump to 0.3.5.9-dev

2019-12-09 Thread nickm

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb
Author: Nick Mathewson 
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"
 
 
 



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

[tor-commits] [tor/release-0.4.2] bump to 0.4.2.5-dev

2019-12-09 Thread nickm

commit b7d18f861057fca75f8f49f16e31d9e3a8f94812
Author: Nick Mathewson 
Date:   Mon Dec 9 16:03:31 2019 -0500

bump to 0.4.2.5-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 6d2dae91a..0e4ecaa94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.5])
+AC_INIT([tor],[0.4.2.5-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.2.5
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.2.5-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 fa0bb6b35..fab06e0e3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.2.5"
+!define VERSION "0.4.2.5-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 18f8afca7..fb27f0276 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.5"
+#define VERSION "0.4.2.5-dev"
 
 
 



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

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

2019-12-09 Thread nickm

commit 7aaf714e8eae3419b2885c937276c3f7ab28bdbc
Merge: 6513102b9 b9504f788
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:07 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1




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

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

2019-12-09 Thread nickm

commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8
Merge: c7ca3fc18 0c4f0ec97
Author: Nick Mathewson 
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.




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

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

2019-12-09 Thread nickm

commit 944bdde50edbc6030dfc954ff501c92cd9e73fb0
Merge: 5d4005abf b7d18f861
Author: Nick Mathewson 
Date:   Mon Dec 9 16:04:09 2019 -0500

Merge branch 'maint-0.4.2'

"ours" to avoid version bump.

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

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

2019-12-09 Thread nickm

commit 7aaf714e8eae3419b2885c937276c3f7ab28bdbc
Merge: 6513102b9 b9504f788
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:07 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1




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

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

2019-12-09 Thread nickm

commit 17561434ebcf01eaa86737b2acfb65df8b57a8b5
Merge: 3248630fc 7174a80ed
Author: Nick Mathewson 
Date:   Mon Dec 9 16:03:01 2019 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.




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

[tor-commits] [tor/release-0.3.5] bump to 0.3.5.9-dev

2019-12-09 Thread nickm

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb
Author: Nick Mathewson 
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"
 
 
 



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

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

2019-12-09 Thread nickm

commit 7174a80edd13d53f63be1558c6de341ec1296006
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:36 2019 -0500

bump to 0.4.1.7-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 3725235e0..9e31b3bd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.7])
+AC_INIT([tor],[0.4.1.7-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.1.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.1.7-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 c3c14186d..b50746779 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.7"
+!define VERSION "0.4.1.7-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 cbf6217dd..dccf73154 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.7"
+#define VERSION "0.4.1.7-dev"
 
 
 



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

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

2019-12-09 Thread nickm

commit b9504f788c9798fab2b74d4006ba9b97151d6404
Author: Nick Mathewson 
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"
 
 
 



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

[tor-commits] [tor/release-0.4.1] bump to 0.3.5.9-dev

2019-12-09 Thread nickm

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb
Author: Nick Mathewson 
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"
 
 
 



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

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

2019-12-09 Thread nickm

commit 7174a80edd13d53f63be1558c6de341ec1296006
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:36 2019 -0500

bump to 0.4.1.7-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 3725235e0..9e31b3bd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.7])
+AC_INIT([tor],[0.4.1.7-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.1.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.1.7-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 c3c14186d..b50746779 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.7"
+!define VERSION "0.4.1.7-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 cbf6217dd..dccf73154 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.7"
+#define VERSION "0.4.1.7-dev"
 
 
 



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

[tor-commits] [tor/release-0.4.2] Bump version to 0.4.0.6-dev

2019-12-09 Thread nickm

commit b9504f788c9798fab2b74d4006ba9b97151d6404
Author: Nick Mathewson 
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"
 
 
 



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

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

2019-12-09 Thread nickm

commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8
Merge: c7ca3fc18 0c4f0ec97
Author: Nick Mathewson 
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.




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

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

2019-12-09 Thread nickm

commit 793c4a3c922765f92b7eabc4aa179043e61105a8
Merge: 39344e410 b9504f788
Author: Nick Mathewson 
Date:   Mon Dec 9 16:04:22 2019 -0500

Merge branch 'maint-0.4.0' into release-0.4.0

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

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

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

2019-12-09 Thread nickm

commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8
Merge: c7ca3fc18 0c4f0ec97
Author: Nick Mathewson 
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.




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

[tor-commits] [tor/master] bump to 0.4.2.5-dev

2019-12-09 Thread nickm

commit b7d18f861057fca75f8f49f16e31d9e3a8f94812
Author: Nick Mathewson 
Date:   Mon Dec 9 16:03:31 2019 -0500

bump to 0.4.2.5-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 6d2dae91a..0e4ecaa94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.5])
+AC_INIT([tor],[0.4.2.5-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.2.5
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.2.5-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 fa0bb6b35..fab06e0e3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.2.5"
+!define VERSION "0.4.2.5-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 18f8afca7..fb27f0276 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.5"
+#define VERSION "0.4.2.5-dev"
 
 
 



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

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

2019-12-09 Thread nickm

commit b9504f788c9798fab2b74d4006ba9b97151d6404
Author: Nick Mathewson 
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"
 
 
 



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

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

2019-12-09 Thread nickm

commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8
Merge: c7ca3fc18 0c4f0ec97
Author: Nick Mathewson 
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.




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

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

2019-12-09 Thread nickm

commit 7174a80edd13d53f63be1558c6de341ec1296006
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:36 2019 -0500

bump to 0.4.1.7-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 3725235e0..9e31b3bd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.7])
+AC_INIT([tor],[0.4.1.7-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.1.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.1.7-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 c3c14186d..b50746779 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.7"
+!define VERSION "0.4.1.7-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 cbf6217dd..dccf73154 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.7"
+#define VERSION "0.4.1.7-dev"
 
 
 



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

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

2019-12-09 Thread nickm

commit 9fc50f05741c8c1ce6005784a288c0c8b4654354
Merge: 0772f901b 7174a80ed
Author: Nick Mathewson 
Date:   Mon Dec 9 16:04:22 2019 -0500

Merge branch 'maint-0.4.1' into release-0.4.1

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

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

[tor-commits] [tor/release-0.4.0] bump to 0.3.5.9-dev

2019-12-09 Thread nickm

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb
Author: Nick Mathewson 
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"
 
 
 



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

[tor-commits] [tor/maint-0.4.1] bump to 0.4.1.7-dev

2019-12-09 Thread nickm

commit 7174a80edd13d53f63be1558c6de341ec1296006
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:36 2019 -0500

bump to 0.4.1.7-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 3725235e0..9e31b3bd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.7])
+AC_INIT([tor],[0.4.1.7-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.1.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.1.7-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 c3c14186d..b50746779 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.7"
+!define VERSION "0.4.1.7-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 cbf6217dd..dccf73154 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.7"
+#define VERSION "0.4.1.7-dev"
 
 
 

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

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

2019-12-09 Thread nickm

commit 7aaf714e8eae3419b2885c937276c3f7ab28bdbc
Merge: 6513102b9 b9504f788
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:07 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1




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

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

2019-12-09 Thread nickm

commit 09a3bd1ffeedb94c2b50c11ea702b46fcba9203c
Merge: 72595eb02 0c4f0ec97
Author: Nick Mathewson 
Date:   Mon Dec 9 16:04:22 2019 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

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

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

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

2019-12-09 Thread nickm

commit 7aaf714e8eae3419b2885c937276c3f7ab28bdbc
Merge: 6513102b9 b9504f788
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:07 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1




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

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

2019-12-09 Thread nickm

commit b9504f788c9798fab2b74d4006ba9b97151d6404
Author: Nick Mathewson 
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"
 
 
 



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

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

2019-12-09 Thread nickm

commit b9504f788c9798fab2b74d4006ba9b97151d6404
Author: Nick Mathewson 
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"
 
 
 

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

[tor-commits] [tor/maint-0.4.2] Bump version to 0.4.0.6-dev

2019-12-09 Thread nickm

commit b9504f788c9798fab2b74d4006ba9b97151d6404
Author: Nick Mathewson 
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"
 
 
 



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

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

2019-12-09 Thread nickm

commit 17561434ebcf01eaa86737b2acfb65df8b57a8b5
Merge: 3248630fc 7174a80ed
Author: Nick Mathewson 
Date:   Mon Dec 9 16:03:01 2019 -0500

Merge branch 'maint-0.4.1' into maint-0.4.2

"ours" to avoid version bump.




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

[tor-commits] [tor/master] bump to 0.3.5.9-dev

2019-12-09 Thread nickm

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb
Author: Nick Mathewson 
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"
 
 
 



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

[tor-commits] [tor/maint-0.4.2] bump to 0.3.5.9-dev

2019-12-09 Thread nickm

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb
Author: Nick Mathewson 
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"
 
 
 



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

[tor-commits] [tor/maint-0.4.2] bump to 0.4.1.7-dev

2019-12-09 Thread nickm

commit 7174a80edd13d53f63be1558c6de341ec1296006
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:36 2019 -0500

bump to 0.4.1.7-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 3725235e0..9e31b3bd6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.1.7])
+AC_INIT([tor],[0.4.1.7-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.1.7
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.1.7-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 c3c14186d..b50746779 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.1.7"
+!define VERSION "0.4.1.7-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 cbf6217dd..dccf73154 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.1.7"
+#define VERSION "0.4.1.7-dev"
 
 
 



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

[tor-commits] [tor/maint-0.4.0] bump to 0.3.5.9-dev

2019-12-09 Thread nickm

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb
Author: Nick Mathewson 
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"
 
 
 



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

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

2019-12-09 Thread nickm

commit b9504f788c9798fab2b74d4006ba9b97151d6404
Author: Nick Mathewson 
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"
 
 
 



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

[tor-commits] [tor/maint-0.3.5] bump to 0.3.5.9-dev

2019-12-09 Thread nickm

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb
Author: Nick Mathewson 
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"
 
 
 

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

[tor-commits] [tor/maint-0.4.2] bump to 0.4.2.5-dev

2019-12-09 Thread nickm

commit b7d18f861057fca75f8f49f16e31d9e3a8f94812
Author: Nick Mathewson 
Date:   Mon Dec 9 16:03:31 2019 -0500

bump to 0.4.2.5-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 6d2dae91a..0e4ecaa94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.4.2.5])
+AC_INIT([tor],[0.4.2.5-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.2.5
+AC_DEFINE(APPROX_RELEASE_DATE, ["2019-12-09"], # for 0.4.2.5-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 fa0bb6b35..fab06e0e3 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.4.2.5"
+!define VERSION "0.4.2.5-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 18f8afca7..fb27f0276 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.4.2.5"
+#define VERSION "0.4.2.5-dev"
 
 
 

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

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

2019-12-09 Thread nickm

commit 7aaf714e8eae3419b2885c937276c3f7ab28bdbc
Merge: 6513102b9 b9504f788
Author: Nick Mathewson 
Date:   Mon Dec 9 16:02:07 2019 -0500

Merge branch 'maint-0.4.0' into maint-0.4.1




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

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

2019-12-09 Thread nickm

commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8
Merge: c7ca3fc18 0c4f0ec97
Author: Nick Mathewson 
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.




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

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

2019-12-09 Thread nickm

commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8
Merge: c7ca3fc18 0c4f0ec97
Author: Nick Mathewson 
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.




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

[tor-commits] [tor/maint-0.4.1] bump to 0.3.5.9-dev

2019-12-09 Thread nickm

commit 0c4f0ec977823021a71b6951fa43d2ffb2315cdb
Author: Nick Mathewson 
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"
 
 
 



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

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

2019-12-09 Thread nickm

commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8
Merge: c7ca3fc18 0c4f0ec97
Author: Nick Mathewson 
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.




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

[tor-commits] [snowflake/master] Document setting the proxyType for metrics

2019-12-09 Thread arlo

commit 1e45d48a3c4ef05434916d963f0c00d8c0246ac9
Author: Arlo Breault 
Date:   Fri Dec 6 17:54:54 2019 -0500

Document setting the proxyType for metrics

Trac: 32499
---
 proxy/README.md   | 8 +++-
 proxy/config.js   | 6 +-
 proxy/init-badge.js   | 3 +--
 proxy/init-node.js| 2 +-
 proxy/init-testing.js | 2 +-
 proxy/init-webext.js  | 3 +--
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/proxy/README.md b/proxy/README.md
index fedfa20..33b8738 100644
--- a/proxy/README.md
+++ b/proxy/README.md
@@ -122,7 +122,7 @@ var log = function(msg) {
 };
 var dbg = log;
 
-var config = new Config();
+var config = new Config("myui");  // NOTE: Set a unique proxy type for metrics
 var ui = new MyUI();  // NOTE: Using the class defined above
 var broker = new Broker(config.brokerUrl);
 
@@ -134,4 +134,10 @@ snowflake.beginWebRTC();
 
 This minimal setup is pretty much what's currently in `init-node.js`.
 
+When configuring the snowflake, set a unique `proxyType` (first argument
+to `Config`) that will be used when recording metrics at the broker.  Also,
+it would be helpful to get in touch with the [Anti-Censorship Team][2] at the
+Tor Project to let them know about your tool.
+
 [1]: 
https://chrome.google.com/webstore/detail/cupcake/dajjbehmbnbppjkcnpdkaniapgdppdnc
+[2]: https://trac.torproject.org/projects/tor/wiki/org/teams/AntiCensorshipTeam
diff --git a/proxy/config.js b/proxy/config.js
index 2b698a6..39c2b15 100644
--- a/proxy/config.js
+++ b/proxy/config.js
@@ -1,5 +1,9 @@
 
-class Config {}
+class Config {
+  constructor(proxyType) {
+this.proxyType = proxyType || '';
+  }
+}
 
 Config.prototype.brokerUrl = 'snowflake-broker.freehaven.net';
 
diff --git a/proxy/init-badge.js b/proxy/init-badge.js
index 2e0a261..cb066e8 100644
--- a/proxy/init-badge.js
+++ b/proxy/init-badge.js
@@ -169,8 +169,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, 
update, silenceNotific
   return;
 }
 
-config = new Config;
-config.proxyType = "badge";
+config = new Config("badge");
 if ('off' !== query.get('ratelimit')) {
   config.rateLimitBytes = Params.getByteCount(query, 'ratelimit', 
config.rateLimitBytes);
 }
diff --git a/proxy/init-node.js b/proxy/init-node.js
index 73c25dc..b5a60d8 100644
--- a/proxy/init-node.js
+++ b/proxy/init-node.js
@@ -4,7 +4,7 @@
 Entry point.
 */
 
-var config = new Config;
+var config = new Config("node");
 
 var ui = new UI();
 
diff --git a/proxy/init-testing.js b/proxy/init-testing.js
index f553f12..01b6147 100644
--- a/proxy/init-testing.js
+++ b/proxy/init-testing.js
@@ -79,7 +79,7 @@ var snowflake, query, debug, ui, silenceNotifications, log, 
dbg, init;
 
   init = function() {
 var broker, config, ui;
-config = new Config;
+config = new Config("testing");
 if ('off' !== query['ratelimit']) {
   config.rateLimitBytes = Params.getByteCount(query, 'ratelimit', 
config.rateLimitBytes);
 }
diff --git a/proxy/init-webext.js b/proxy/init-webext.js
index afa9aee..3eb42dd 100644
--- a/proxy/init-webext.js
+++ b/proxy/init-webext.js
@@ -171,8 +171,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, 
update, silenceNotific
   };
 
   init = function() {
-config = new Config;
-config.proxyType = "webext";
+config = new Config("webext");
 ui = new WebExtUI();
 broker = new Broker(config);
 snowflake = new Snowflake(config, ui, broker);

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

[tor-commits] [stem/master] Add a stem test to look for regressions in Tor ticket 31495.

2019-12-09 Thread atagar

commit ab44af05e4165f68da67870b434b705e8ffb4e86
Author: Nick Mathewson 
Date:   Tue Oct 8 18:03:59 2019 -0400

Add a stem test to look for regressions in Tor ticket 31495.

This closes Tor ticket 31909.
---
 test/integ/control/controller.py | 17 +
 1 file changed, 17 insertions(+)

diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index ba4037d8..e7c979b2 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -784,6 +784,23 @@ class TestController(unittest.TestCase):
 shutil.rmtree(tmpdir)
 
   @test.require.controller
+  def test_set_conf_31495_regression(self):
+"""
+Make sure that we can set UseBridges=1 and set a Bridge, to
+check for a regression in Tor bug 31945.
+"""
+with test.runner.get_runner().get_tor_controller() as controller:
+  # Make sure we aren't a relay, so that we can set UseBridges.
+  controller.set_conf("ORPort", "0")
+
+  # Try setting UseBridges, to make sure we don't reject the request.
+  controller.set_options([("UseBridges", "1"),
+  ("Bridge", "127.0.0.1:")])
+
+  # Set UseBridges back again to avoid problems in later tests.
+  controller.set_conf("UseBridges", "0")
+
+  @test.require.controller
   def test_set_conf_when_immutable(self):
 """
 Issue a SETCONF for tor options that cannot be changed while running.



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

[tor-commits] [stem/master] Revert ORPort after new integ test

2019-12-09 Thread atagar

commit cb61dfe74a0a4b87b115ed834624cf2c9c5d282c
Author: Damian Johnson 
Date:   Mon Dec 9 11:44:08 2019 -0800

Revert ORPort after new integ test

Nick's new test passes with flying colors, but does not revert the ORPort 
back
to the value we previously had. This worked because this test coincidently 
was
one of the last.

Also fixing minor stylistic issues cited by pycodestyle...

  STATIC CHECKS
  * /home/atagar/Desktop/stem/test/integ/control/controller.py
line 794  - use single rather than double quotes | 
controller.set_conf("ORPort", "0")
line 797  - use single rather than double quotes | 
controller.set_options([("UseBridges", "1"),
line 798  - use single rather than double quotes | ("Bridge", 
"127.0.0.1:")])
line 801  - use single rather than double quotes | 
controller.set_conf("UseBridges", "0")
---
 stem/control.py  |  2 ++
 test/integ/control/controller.py | 27 +--
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/stem/control.py b/stem/control.py
index f0242b0d..42736486 100644
--- a/stem/control.py
+++ b/stem/control.py
@@ -299,6 +299,8 @@ MALFORMED_EVENTS = 'MALFORMED_EVENTS'
 
 State = stem.util.enum.Enum('INIT', 'RESET', 'CLOSED')
 
+# TODO: consider merging this with stem.response.event in stem 2.x? (#32689)
+
 EventType = stem.util.enum.UppercaseEnum(
   'ADDRMAP',
   'AUTHDIR_NEWDESCS',
diff --git a/test/integ/control/controller.py b/test/integ/control/controller.py
index e7c979b2..6e45d0fa 100644
--- a/test/integ/control/controller.py
+++ b/test/integ/control/controller.py
@@ -773,6 +773,7 @@ class TestController(unittest.TestCase):
 self.assertEqual('17234 127.0.0.1:17235', 
controller.get_conf('HiddenServicePort'))
   finally:
 # reverts configuration changes
+
 controller.set_options((
   ('ExitPolicy', 'reject *:*'),
   ('ConnLimit', None),
@@ -784,21 +785,27 @@ class TestController(unittest.TestCase):
 shutil.rmtree(tmpdir)
 
   @test.require.controller
-  def test_set_conf_31495_regression(self):
+  def test_set_conf_for_usebridges(self):
 """
-Make sure that we can set UseBridges=1 and set a Bridge, to
-check for a regression in Tor bug 31945.
+Ensure we can set UseBridges=1 and also set a Bridge. This is a tor
+regression check (:trac:`31945`).
 """
+
 with test.runner.get_runner().get_tor_controller() as controller:
-  # Make sure we aren't a relay, so that we can set UseBridges.
-  controller.set_conf("ORPort", "0")
+  orport = controller.get_conf('ORPort')
 
-  # Try setting UseBridges, to make sure we don't reject the request.
-  controller.set_options([("UseBridges", "1"),
-  ("Bridge", "127.0.0.1:")])
+  try:
+controller.set_conf('ORPort', '0')  # ensure we're not a relay so 
UseBridges is usabe
+controller.set_options([('UseBridges', '1'), ('Bridge', 
'127.0.0.1:')])
+self.assertEqual('127.0.0.1:', controller.get_conf('Bridge'))
+  finally:
+# reverts configuration changes
 
-  # Set UseBridges back again to avoid problems in later tests.
-  controller.set_conf("UseBridges", "0")
+controller.set_options((
+  ('ORPort', orport),
+  ('UseBridges', None),
+  ('Bridge', None),
+), reset = True)
 
   @test.require.controller
   def test_set_conf_when_immutable(self):

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

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

2019-12-09 Thread translation

commit bbbaec733a3e47aa6bad4e9890d0ff55d7cc6e6a
Author: Translation commit bot 
Date:   Mon Dec 9 19:20:24 2019 +

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

diff --git a/contents+it.po b/contents+it.po
index 7c2efe153b..9b58fed2a0 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -1080,7 +1080,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/contents+en.lrtopic.title)
 msgid "MANAGING IDENTITIES"
-msgstr "manipolare le identitÃ "
+msgstr "GESTIRE LE IDENTITÃ"
 
 #: https//tb-manual.torproject.org/managing-identities/
 #: (content/managing-identities/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-12-09 Thread translation

commit 56df978c43732c99873faec9259e9a02ee45e691
Author: Translation commit bot 
Date:   Mon Dec 9 18:49:57 2019 +

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

diff --git a/contents+it.po b/contents+it.po
index 8f48bb1e60..7c2efe153b 100644
--- a/contents+it.po
+++ b/contents+it.po
@@ -566,8 +566,8 @@ msgid ""
 "This offers you the option to connect directly to the Tor network, or to "
 "configure Tor Browser for your connection."
 msgstr ""
-"Questo ti offre la possibilitÃ  di connetterti direttamente alla rete Tor o "
-"di configurare Tor Browser per la tua connessione."
+"Questa finestra ti offre la possibilitÃ  di connetterti direttamente alla "
+"rete Tor o di configurare Tor Browser per la tua connessione."
 
 #: 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] [tpo/master] 0.4.2.5 is released.

2019-12-09 Thread nickm

commit b0c4ad0fdf4fa08665a9de0149d75613a439af69
Author: Nick Mathewson 
Date:   Mon Dec 9 13:27:02 2019 -0500

0.4.2.5 is released.
---
 databags/versions.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/databags/versions.ini b/databags/versions.ini
index 0186dc1..446c05e 100644
--- a/databags/versions.ini
+++ b/databags/versions.ini
@@ -6,8 +6,8 @@ win32 = 0.4.1.6
 version = 9.5a3
 
 [tor-stable]
-version = 0.4.1.6
+version = 0.4.2.5
 
 [tor-alpha]
-version = 0.4.2.4-rc
+version = 0.4.2.5
 

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

[tor-commits] [dip/master] Modify gitaly configuration

2019-12-09 Thread hiro

commit 8a76f298705dc841f2d77ed1e5ef15ee375e1d88
Author: hiro 
Date:   Mon Dec 9 19:13:22 2019 +0100

Modify gitaly configuration
---
 roles/gitaly/templates/gitaly.toml.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/roles/gitaly/templates/gitaly.toml.j2 
b/roles/gitaly/templates/gitaly.toml.j2
index a06e182..e70a0f8 100644
--- a/roles/gitaly/templates/gitaly.toml.j2
+++ b/roles/gitaly/templates/gitaly.toml.j2
@@ -1,6 +1,7 @@
 # Example Gitaly configuration file
 
 socket_path = "{{ ansible_env.XDG_RUNTIME_DIR | mandatory 
}}/gitaly/gitaly.socket"
+internal_socket_dir = "{{ ansible_env.XDG_RUNTIME_DIR | mandatory 
}}/gitaly/gitaly.socket"
 
 # The directory where Gitaly's executables are stored
 bin_dir = "{{ ansible_user_dir }}/bin"
@@ -42,6 +43,7 @@ dir = "{{ ansible_user_dir }}/log/gitaly"
 [gitaly-ruby]
 # The directory where gitaly-ruby is installed
 dir = "{{ ansible_user_dir }}/gitaly/ruby"
+num_workers = 4
 
 # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes)
 # max_rss = 3

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

[tor-commits] [tor/master] Port changelog tools to python 3

2019-12-09 Thread nickm

commit e93801bfe6561975a23a3ca39a7465b5ac376998
Author: Nick Mathewson 
Date:   Mon Dec 9 10:53:48 2019 -0500

Port changelog tools to python 3

Closes ticket 32704.
---
 changes/ticket32704   |  3 +++
 scripts/maint/format_changelog.py | 41 ---
 scripts/maint/sortChanges.py  | 11 ++-
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/changes/ticket32704 b/changes/ticket32704
new file mode 100644
index 0..4cc001975
--- /dev/null
+++ b/changes/ticket32704
@@ -0,0 +1,3 @@
+  o Minor features (release tools):
+- Port our changelog formatting and sorting tools to Python 3.
+  Closes ticket 32704.
diff --git a/scripts/maint/format_changelog.py 
b/scripts/maint/format_changelog.py
index 08b2155fa..97a6ce938 100755
--- a/scripts/maint/format_changelog.py
+++ b/scripts/maint/format_changelog.py
@@ -9,6 +9,7 @@
 # To run it, pipe a section of the changelog (starting with "Changes
 # in Tor 0.x.y.z-alpha" through the script.)
 
+from __future__ import print_function
 import os
 import re
 import sys
@@ -190,7 +191,7 @@ def body_parser(line):
 elif re.match(r'^\s+\S', line):
 return TP_HEADTEXT
 else:
-print "Weird line %r"%line
+print("Weird line %r"%line, file=sys.stderr)
 
 def clean_head(head):
 return head
@@ -198,7 +199,7 @@ def clean_head(head):
 def head_score(s):
 m = re.match(r'^ +o (.*)', s)
 if not m:
-print >>sys.stderr, "Can't score %r"%s
+print("Can't score %r"%s, file=sys.stderr)
 return 9
 lw = m.group(1).lower()
 if lw.startswith("security") and "feature" not in lw:
@@ -291,7 +292,7 @@ class ChangeLog(object):
 def lint_head(self, line, head):
 m = re.match(r'^ *o ([^\(]+)((?:\([^\)]+\))?):', head)
 if not m:
-print >>sys.stderr, "Weird header format on line %s"%line
+print("Weird header format on line %s"%line, file=sys.stderr)
 
 def lint_item(self, line, grafs, head_type):
 pass
@@ -306,7 +307,7 @@ class ChangeLog(object):
 def dumpGraf(self,par,indent1,indent2=-1):
 if not self.wrapText:
 for line in par:
-print line
+print(line)
 return
 
 if indent2 == -1:
@@ -320,17 +321,17 @@ class ChangeLog(object):
 
 def dumpPreheader(self, graf):
 self.dumpGraf(graf, 0)
-print
+print()
 
 def dumpMainhead(self, head):
-print head
+print(head)
 
 def dumpHeadGraf(self, graf):
 self.dumpGraf(graf, 2)
-print
+print()
 
 def dumpSectionHeader(self, header):
-print header
+print(header)
 
 def dumpStartOfSections(self):
 pass
@@ -339,10 +340,10 @@ class ChangeLog(object):
 pass
 
 def dumpEndOfSection(self):
-print
+print()
 
 def dumpEndOfChangelog(self):
-print
+print()
 
 def dumpDrupalBreak(self):
 pass
@@ -350,7 +351,7 @@ class ChangeLog(object):
 def dumpItem(self, grafs):
 self.dumpGraf(grafs[0],4,6)
 for par in grafs[1:]:
-print
+print()
 self.dumpGraf(par,6,6)
 
 def collateAndSortSections(self):
@@ -389,7 +390,7 @@ class ChangeLog(object):
 self.dumpStartOfSections()
 for _,head,items in self.sections:
 if not head.endswith(':'):
-print >>sys.stderr, "adding : to %r"%head
+print("adding : to %r"%head, file=sys.stderr)
 head = head + ":"
 self.dumpSectionHeader(head)
 for _,grafs in items:
@@ -445,16 +446,16 @@ class HTMLChangeLog(ChangeLog):
 pass
 
 def dumpStartOfSections(self):
-print "\n"
+print("\n")
 
 def dumpEndOfSections(self):
-print "\n"
+print("\n")
 
 def dumpDrupalBreak(self):
-print "\n\n"
-print " "
-print "\n\n\n"
-print ""
+print("\n\n")
+print(" ")
+print("\n\n\n")
+print("")
 
 def dumpItem(self, grafs):
 grafs[0][0] = grafs[0][0].replace(" - ", "", 1).lstrip()
@@ -464,7 +465,7 @@ class HTMLChangeLog(ChangeLog):
 self.htmlPar(par)
 else:
 self.htmlText(grafs[0])
-print
+print()
 
 op = optparse.OptionParser(usage="usage: %prog [options] [filename]")
 op.add_option('-W', '--no-wrap', action='store_false',
@@ -560,7 +561,7 @@ if options.firstOnly:
 sys.exit(0)
 
 if nextline is not None:
-print nextline
+print(nextline)
 
 for line in sys.stdin:
 sys.stdout.write(line)
diff --git a/scripts/maint/sortChanges.py b/scripts/maint/sortChanges.py
index 986b94b02..44dd0dc41 100755
--- a/scripts/maint/sortChanges.py
+++ b/scripts/maint/sortChanges.py
@@ -7,6 +7,7 @@
changelog.
 """
 
+from __future__ import print_function
 import re
 import sys
 
@@ -43,7 +44,7 @

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

2019-12-09 Thread nickm

commit 5d4005abfdbaf1e9a676ded589ebb9a3ae6f9b3e
Merge: 5fea7d849 e93801bfe
Author: Nick Mathewson 
Date:   Mon Dec 9 13:01:24 2019 -0500

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

 changes/ticket32704   |  3 +++
 scripts/maint/format_changelog.py | 41 ---
 scripts/maint/sortChanges.py  | 11 ++-
 3 files changed, 30 insertions(+), 25 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] Copy ChangeLog to ReleaseNotes.

2019-12-09 Thread nickm

commit 0772f901b4b3b74077658c7b9585ee5ab947ad64
Author: Nick Mathewson 
Date:   Mon Dec 9 11:51:01 2019 -0500

Copy ChangeLog to ReleaseNotes.
---
 ChangeLog|   1 +
 ReleaseNotes | 160 +++
 2 files changed, 161 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 699f5133d..463962e3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -157,6 +157,7 @@ Changes in version 0.4.1.7 - 2019-12-09
   Build some jobs with -std=gnu99, and some jobs without.
   Closes ticket 32500.
 
+
 Changes in version 0.4.1.6 - 2019-09-19
   This release backports several bugfixes to improve stability and
   correctness.  Anyone experiencing build problems or crashes with 0.4.1.5,
diff --git a/ReleaseNotes b/ReleaseNotes
index cfeacd729..213856e9c 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,166 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.4.1.7 - 2019-12-09
+  This release backports several bugfixes to improve stability and
+  correctness.  Anyone experiencing build problems or crashes with 0.4.1.6,
+  including all relays relying on AccountingMax, should upgrade.
+
+  o Major features (directory authorities, backport from 0.4.2.2-alpha):
+- Directory authorities now reject relays running all currently
+  deprecated release series. The currently supported release series
+  are: 0.2.9, 0.3.5, 0.4.0, 0.4.1, and 0.4.2. Closes ticket 31549.
+
+  o Major bugfixes (embedded Tor, backport from 0.4.2.2-alpha):
+- Avoid a possible crash when restarting Tor in embedded mode and
+  enabling a different set of publish/subscribe messages. Fixes bug
+  31898; bugfix on 0.4.1.1-alpha.
+
+  o Major bugfixes (relay, backport from 0.4.2.3-alpha):
+- Relays now respect their AccountingMax bandwidth again. When
+  relays entered "soft" hibernation (which typically starts when
+  we've hit 90% of our AccountingMax), we had stopped checking
+  whether we should enter hard hibernation. Soft hibernation refuses
+  new connections and new circuits, but the existing circuits can
+  continue, meaning that relays could have exceeded their configured
+  AccountingMax. Fixes bug 32108; bugfix on 0.4.0.1-alpha.
+
+  o Major bugfixes (torrc parsing, backport from 0.4.2.2-alpha):
+- Stop ignoring torrc options after an %include directive, when the
+  included directory ends with a file that does not contain any
+  config options (but does contain comments or whitespace). Fixes
+  bug 31408; bugfix on 0.3.1.1-alpha.
+
+  o Major bugfixes (v3 onion services, backport from 0.4.2.3-alpha):
+- Onion services now always use the exact number of intro points
+  configured with the HiddenServiceNumIntroductionPoints option (or
+  fewer if nodes are excluded). Before, a service could sometimes
+  pick more intro points than configured. Fixes bug 31548; bugfix
+  on 0.3.2.1-alpha.
+
+  o Minor features (continuous integration, backport from 0.4.2.2-alpha):
+- When building on Appveyor and Travis, pass the "-k" flag to make,
+  so that we are informed of all compilation failures, not just the
+  first one or two. Closes ticket 31372.
+
+  o Minor features (geoip, backport from 0.4.2.5):
+- Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
+  Country database. Closes ticket 32685.
+
+  o Minor bugfixes (Appveyor CI, backport from 0.4.2.2-alpha):
+- Avoid spurious errors when Appveyor CI fails before the install step.
+  Fixes bug 31884; bugfix on 0.3.4.2-alpha.
+
+  o Minor bugfixes (client, onion service v3, backport from 0.4.2.4-rc):
+- Fix a BUG() assertion that occurs within a very small race window
+  between when a client intro circuit opens and when its descriptor
+  gets cleaned up from the cache. The circuit is now closed early,
+  which will trigger a re-fetch of the descriptor and continue the
+  connection. Fixes bug 28970; bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (connections, backport from 0.4.2.3-rc):
+- Avoid trying to read data from closed connections, which can cause
+  needless loops in Libevent and infinite loops in Shadow. Fixes bug
+  30344; bugfix on 0.1.1.1-alpha.
+
+  o Minor bugfixes (error handling, backport from 0.4.2.1-alpha):
+- On abort, try harder to flush the output buffers of log messages.
+  On some platforms (macOS), log messages could be discarded when
+  the process terminates. Fixes bug 31571; bugfix on 0.3.5.1-alpha.
+- Report the tor version whenever an assertion fails. Previously, we
+  only reported the Tor version on some crashes, and some non-fatal
+  assertions. Fixes bug 31571; bugfix on 0.3.5.1-alpha.
+- When tor aborts due to an error, close log file descriptors before
+  abo

[tor-commits] [tor/release-0.4.0] Copy ChangeLog to ReleaseNotes.

2019-12-09 Thread nickm

commit 39344e410dca1dd4fda83034e725afa45a0c0bf4
Author: Nick Mathewson 
Date:   Mon Dec 9 11:50:51 2019 -0500

Copy ChangeLog to ReleaseNotes.
---
 ReleaseNotes | 359 +++
 1 file changed, 359 insertions(+)

diff --git a/ReleaseNotes b/ReleaseNotes
index 53867617c..e69a115ec 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,365 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.4.0.6 - 2019-12-09
+  This is the second stable release in the 0.4.0.x series. This release
+  backports several bugfixes to improve stability and correctness.  Anyone
+  experiencing build problems or crashes with 0.4.0.5, including all relays
+  relying on AccountingMax, should upgrade.
+
+  Note that, per our support policy, support for the 0.4.0.x series will end
+  on 2 Feb 2020.  Anyone still running 0.4.0.x should plan to upgrade to the
+  latest stable release, or downgrade to 0.3.5.x, which will get long-term
+  support until 1 Feb 2022.
+
+  o Directory authority changes (backport from 0.4.1.5):
+- The directory authority "dizum" has a new IP address. Closes
+  ticket 31406.
+
+  o Major bugfixes (bridges, backport from 0.4.1.2-alpha):
+- Consider our directory information to have changed when our list
+  of bridges changes. Previously, Tor would not re-compute the
+  status of its directory information when bridges changed, and
+  therefore would not realize that it was no longer able to build
+  circuits. Fixes part of bug 29875.
+- Do not count previously configured working bridges towards our
+  total of working bridges. Previously, when Tor's list of bridges
+  changed, it would think that the old bridges were still usable,
+  and delay fetching router descriptors for the new ones. Fixes part
+  of bug 29875; bugfix on 0.3.0.1-alpha.
+
+  o Major bugfixes (circuit build, guard, backport from 0.4.1.4-rc):
+- When considering upgrading circuits from "waiting for guard" to
+  "open", always ignore circuits that are marked for close. Otherwise,
+  we can end up in the situation where a subsystem is notified that
+  a closing circuit has just opened, leading to undesirable
+  behavior. Fixes bug 30871; bugfix on 0.3.0.1-alpha.
+
+  o Major bugfixes (Onion service reachability, backport from 0.4.1.3-alpha):
+- Properly clean up the introduction point map when circuits change
+  purpose from onion service circuits to pathbias, measurement, or
+  other circuit types. This should fix some service-side instances
+  of introduction point failure. Fixes bug 29034; bugfix
+  on 0.3.2.1-alpha.
+
+  o Major bugfixes (onion service v3, backport from 0.4.1.1-alpha):
+- Fix an unreachable bug in which an introduction point could try to
+  send an INTRODUCE_ACK with a status code that Trunnel would refuse
+  to encode, leading the relay to assert(). We've consolidated the
+  ABI values into Trunnel now. Fixes bug 30454; bugfix
+  on 0.3.0.1-alpha.
+- Clients can now handle unknown status codes from INTRODUCE_ACK
+  cells. (The NACK behavior will stay the same.) This will allow us
+  to extend status codes in the future without breaking the normal
+  client behavior. Fixes another part of bug 30454; bugfix
+  on 0.3.0.1-alpha.
+
+  o Major bugfixes (relay, backport from 0.4.2.3-alpha):
+- Relays now respect their AccountingMax bandwidth again. When
+  relays entered "soft" hibernation (which typically starts when
+  we've hit 90% of our AccountingMax), we had stopped checking
+  whether we should enter hard hibernation. Soft hibernation refuses
+  new connections and new circuits, but the existing circuits can
+  continue, meaning that relays could have exceeded their configured
+  AccountingMax. Fixes bug 32108; bugfix on 0.4.0.1-alpha.
+
+  o Major bugfixes (torrc parsing, backport from 0.4.2.2-alpha):
+- Stop ignoring torrc options after an %include directive, when the
+  included directory ends with a file that does not contain any
+  config options (but does contain comments or whitespace). Fixes
+  bug 31408; bugfix on 0.3.1.1-alpha.
+
+  o Major bugfixes (v3 onion services, backport from 0.4.2.3-alpha):
+- Onion services now always use the exact number of intro points
+  configured with the HiddenServiceNumIntroductionPoints option (or
+  fewer if nodes are excluded). Before, a service could sometimes
+  pick more intro points than configured. Fixes bug 31548; bugfix
+  on 0.3.2.1-alpha.
+
+  o Minor features (compile-time modules, backport from version 0.4.1.1-alpha):
+- Add a "--list-modules" command to print a list of which compile-
+  time modules are enabled. Closes ticket 30452.
+
+  o Minor

[tor-commits] [tor/release-0.3.5] Copy ChangeLog to ReleaseNotes.

2019-12-09 Thread nickm

commit 72595eb021048ae9156185c0f75f19d000446f96
Author: Nick Mathewson 
Date:   Mon Dec 9 11:50:47 2019 -0500

Copy ChangeLog to ReleaseNotes.
---
 ReleaseNotes | 473 +++
 1 file changed, 473 insertions(+)

diff --git a/ReleaseNotes b/ReleaseNotes
index 83cdd185f..e7384d99f 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,479 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.3.5.9 - 2019-12-09
+  Tor 0.3.5.9 backports serveral fixes from later releases, including
+  several that affect bridge users, relay stability, onion services,
+  and much more.
+
+  o Directory authority changes (backport from 0.4.1.5):
+- The directory authority "dizum" has a new IP address. Closes
+  ticket 31406.
+
+  o Major bugfixes (bridges, backport from 0.4.1.2-alpha):
+- Consider our directory information to have changed when our list
+  of bridges changes. Previously, Tor would not re-compute the
+  status of its directory information when bridges changed, and
+  therefore would not realize that it was no longer able to build
+  circuits. Fixes part of bug 29875.
+- Do not count previously configured working bridges towards our
+  total of working bridges. Previously, when Tor's list of bridges
+  changed, it would think that the old bridges were still usable,
+  and delay fetching router descriptors for the new ones. Fixes part
+  of bug 29875; bugfix on 0.3.0.1-alpha.
+
+  o Major bugfixes (circuit build, guard, backport from 0.4.1.4-rc):
+- When considering upgrading circuits from "waiting for guard" to
+  "open", always ignore circuits that are marked for close. Otherwise,
+  we can end up in the situation where a subsystem is notified that
+  a closing circuit has just opened, leading to undesirable
+  behavior. Fixes bug 30871; bugfix on 0.3.0.1-alpha.
+
+  o Major bugfixes (NSS, relay, backport from 0.4.0.4-rc):
+- When running with NSS, disable TLS 1.2 ciphersuites that use
+  SHA384 for their PRF. Due to an NSS bug, the TLS key exporters for
+  these ciphersuites don't work -- which caused relays to fail to
+  handshake with one another when these ciphersuites were enabled.
+  Fixes bug 29241; bugfix on 0.3.5.1-alpha.
+
+  o Major bugfixes (Onion service reachability, backport from 0.4.1.3-alpha):
+- Properly clean up the introduction point map when circuits change
+  purpose from onion service circuits to pathbias, measurement, or
+  other circuit types. This should fix some service-side instances
+  of introduction point failure. Fixes bug 29034; bugfix
+  on 0.3.2.1-alpha.
+
+  o Major bugfixes (onion service v3, backport from 0.4.1.1-alpha):
+- Fix an unreachable bug in which an introduction point could try to
+  send an INTRODUCE_ACK with a status code that Trunnel would refuse
+  to encode, leading the relay to assert(). We've consolidated the
+  ABI values into Trunnel now. Fixes bug 30454; bugfix
+  on 0.3.0.1-alpha.
+- Clients can now handle unknown status codes from INTRODUCE_ACK
+  cells. (The NACK behavior will stay the same.) This will allow us
+  to extend status codes in the future without breaking the normal
+  client behavior. Fixes another part of bug 30454; bugfix
+  on 0.3.0.1-alpha.
+
+  o Major bugfixes (torrc parsing, backport from 0.4.2.2-alpha):
+- Stop ignoring torrc options after an %include directive, when the
+  included directory ends with a file that does not contain any
+  config options (but does contain comments or whitespace). Fixes
+  bug 31408; bugfix on 0.3.1.1-alpha.
+
+  o Major bugfixes (v3 onion services, backport from 0.4.2.3-alpha):
+- Onion services now always use the exact number of intro points
+  configured with the HiddenServiceNumIntroductionPoints option (or
+  fewer if nodes are excluded). Before, a service could sometimes
+  pick more intro points than configured. Fixes bug 31548; bugfix
+  on 0.3.2.1-alpha.
+
+  o Minor features (address selection, backport from 0.4.0.3-alpha):
+- Treat the subnet 100.64.0.0/10 as public for some purposes;
+  private for others. This subnet is the RFC 6598 (Carrier Grade
+  NAT) IP range, and is deployed by many ISPs as an alternative to
+  RFC 1918 that does not break existing internal networks. Tor now
+  blocks SOCKS and control ports on these addresses and warns users
+  if client ports or ExtORPorts are listening on a RFC 6598 address.
+  Closes ticket 28525. Patch by Neel Chauhan.
+
+  o Minor features (bandwidth authority, backport from 0.4.0.4-rc):
+- Make bandwidth authorities ignore relays that are reported in the
+  bandwidth file with the flag "vote=0". This chan

[tor-commits] [dip-configs/master] Modify secrets

2019-12-09 Thread hiro

commit 2960de6405eef89b1a22c33b3e47fff09bcd5269
Author: hiro 
Date:   Mon Dec 9 17:44:46 2019 +0100

Modify secrets
---
 secrets/group_vars/all.yml.sample | 1 +
 1 file changed, 1 insertion(+)

diff --git a/secrets/group_vars/all.yml.sample 
b/secrets/group_vars/all.yml.sample
index e181bc9..55633fc 100644
--- a/secrets/group_vars/all.yml.sample
+++ b/secrets/group_vars/all.yml.sample
@@ -1,5 +1,6 @@
 ---
 docker_registry_auth_key: docker-registry-auth-key
+docker_registry_auth_cert: docker-registry-auth-cert
 admin_token_ldapsync: admin-token-ldapsync
 logs_password: logs-password
 ldap_org: torproject

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

[tor-commits] [dip-configs/master] Modify secrets

2019-12-09 Thread hiro

commit 43a57d98de1c9b88e9e486c5a1b9104c37147698
Author: hiro 
Date:   Mon Dec 9 17:37:21 2019 +0100

Modify secrets
---
 secrets/group_vars/all.yml.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/secrets/group_vars/all.yml.sample 
b/secrets/group_vars/all.yml.sample
index 0634dbc..e181bc9 100644
--- a/secrets/group_vars/all.yml.sample
+++ b/secrets/group_vars/all.yml.sample
@@ -4,5 +4,5 @@ admin_token_ldapsync: admin-token-ldapsync
 logs_password: logs-password
 ldap_org: torproject
 ldap_host: db.torproject.org
-admin_token_ldapsync: admin-token-ldapsync
+systemhook_secret_token: admin-token-ldapsync
 google_service_account:

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

[tor-commits] [dip-configs/master] Add hosts file

2019-12-09 Thread hiro

commit 87849693430647ec31c8c6ccdd69a0dcbe4682dc
Author: hiro 
Date:   Mon Dec 9 17:32:55 2019 +0100

Add hosts file
---
 hosts | 8 
 1 file changed, 8 insertions(+)

diff --git a/hosts b/hosts
new file mode 100644
index 000..439099f
--- /dev/null
+++ b/hosts
@@ -0,0 +1,8 @@
+[gitlab]
+gitlab-01.torproject.org ansible_connection=local
+
+[salsa-webhook]
+webhook.dip.torproject.org ansible_connection=local
+
+[docker-registry]
+registry.dip.torproject.org ansible_connection=local

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

[tor-commits] [dip/master] Update hosts files for prod and test

2019-12-09 Thread hiro

commit 412188fd7ba2d782fe329ccaee1d1228a3f72c52
Author: hiro 
Date:   Mon Dec 9 17:29:42 2019 +0100

Update hosts files for prod and test
---
 inventories/prod/hosts | 6 ++
 inventories/test/hosts | 6 ++
 2 files changed, 12 insertions(+)

diff --git a/inventories/prod/hosts b/inventories/prod/hosts
index 348adae..439099f 100644
--- a/inventories/prod/hosts
+++ b/inventories/prod/hosts
@@ -1,2 +1,8 @@
 [gitlab]
 gitlab-01.torproject.org ansible_connection=local
+
+[salsa-webhook]
+webhook.dip.torproject.org ansible_connection=local
+
+[docker-registry]
+registry.dip.torproject.org ansible_connection=local
diff --git a/inventories/test/hosts b/inventories/test/hosts
index 348adae..439099f 100644
--- a/inventories/test/hosts
+++ b/inventories/test/hosts
@@ -1,2 +1,8 @@
 [gitlab]
 gitlab-01.torproject.org ansible_connection=local
+
+[salsa-webhook]
+webhook.dip.torproject.org ansible_connection=local
+
+[docker-registry]
+registry.dip.torproject.org ansible_connection=local

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

[tor-commits] [dip-configs/master] Update variables

2019-12-09 Thread hiro

commit cd6cad4216bcfb9ee70d8a8fa6fd28c13f5356f0
Author: hiro 
Date:   Mon Dec 9 17:20:07 2019 +0100

Update variables
---
 group_vars/all.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/group_vars/all.yml b/group_vars/all.yml
index 75528b3..742d347 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -4,5 +4,7 @@ external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
+gitlab_storage_lfs:
+gitlab_storage_artifacts:
 ldap_org: torproject
 ldap_host: db.torproject.org

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

[tor-commits] [dip/master] Update variables

2019-12-09 Thread hiro

commit 372c6b44504ec1226745eb139c5489593a9c2954
Author: hiro 
Date:   Mon Dec 9 17:20:00 2019 +0100

Update variables
---
 inventories/prod/group_vars/all.yml | 2 ++
 inventories/test/group_vars/all.yml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/inventories/prod/group_vars/all.yml 
b/inventories/prod/group_vars/all.yml
index 75528b3..2ede584 100644
--- a/inventories/prod/group_vars/all.yml
+++ b/inventories/prod/group_vars/all.yml
@@ -4,5 +4,7 @@ external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
+gitlab_storage_lfs: 
+gitlab_storage_artifacts:
 ldap_org: torproject
 ldap_host: db.torproject.org
diff --git a/inventories/test/group_vars/all.yml 
b/inventories/test/group_vars/all.yml
index 75528b3..742d347 100644
--- a/inventories/test/group_vars/all.yml
+++ b/inventories/test/group_vars/all.yml
@@ -4,5 +4,7 @@ external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
+gitlab_storage_lfs:
+gitlab_storage_artifacts:
 ldap_org: torproject
 ldap_host: db.torproject.org

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

[tor-commits] [dip/master] Update variables

2019-12-09 Thread hiro

commit 8b2d47daee0693c1a3490859d48e764da6a51f37
Author: hiro 
Date:   Mon Dec 9 17:18:35 2019 +0100

Update variables
---
 inventories/prod/group_vars/all.yml  |  2 --
 inventories/test/group_vars/all.yml  |  2 --
 roles/gitlab/defaults/main.yml   |  1 +
 roles/gitlab/templates/gitlab.yml.j2 | 13 +
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/inventories/prod/group_vars/all.yml 
b/inventories/prod/group_vars/all.yml
index 0c38d7c..75528b3 100644
--- a/inventories/prod/group_vars/all.yml
+++ b/inventories/prod/group_vars/all.yml
@@ -4,7 +4,5 @@ external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
-gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
-gitlab_storage_artifacts:
 ldap_org: torproject
 ldap_host: db.torproject.org
diff --git a/inventories/test/group_vars/all.yml 
b/inventories/test/group_vars/all.yml
index 0c38d7c..75528b3 100644
--- a/inventories/test/group_vars/all.yml
+++ b/inventories/test/group_vars/all.yml
@@ -4,7 +4,5 @@ external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
-gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
-gitlab_storage_artifacts:
 ldap_org: torproject
 ldap_host: db.torproject.org
diff --git a/roles/gitlab/defaults/main.yml b/roles/gitlab/defaults/main.yml
index b95ec25..09cfb48 100644
--- a/roles/gitlab/defaults/main.yml
+++ b/roles/gitlab/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
 gitlab_home: ~/gitlab
 gitlab_omniauth_providers: []
+gitlab_storage_artifacts:
 gitlab_storage_lfs:
diff --git a/roles/gitlab/templates/gitlab.yml.j2 
b/roles/gitlab/templates/gitlab.yml.j2
index 2c3add0..79f0dd0 100644
--- a/roles/gitlab/templates/gitlab.yml.j2
+++ b/roles/gitlab/templates/gitlab.yml.j2
@@ -152,8 +152,21 @@ production: &base
   ## Build Artifacts
   artifacts:
 enabled: true
+{% if gitlab_storage_artifacts %}
+object_store:
+  enabled: true
+  remote_directory: {{ gitlab_storage_artifacts }}
+  direct_upload: true
+  proxy_download: true
+  connection:
+provider: Google
+google_project: {{ google_service_account.project_id }}
+google_client_email: {{ google_service_account.client_email }}
+google_json_key_location: config/storage.json
+{% else %}
 object_store:
   enabled: false
+{% endif %}
 
   ## Merge request external diff storage
   external_diffs:

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

[tor-commits] [dip-configs/master] Update variables

2019-12-09 Thread hiro

commit 5ed61eb1d7cc19d814879c1b7ffc710c59ef0d60
Author: hiro 
Date:   Mon Dec 9 17:18:23 2019 +0100

Update variables
---
 group_vars/all.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/group_vars/all.yml b/group_vars/all.yml
index 80a95e4..75528b3 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -1,9 +1,8 @@
+---
 external_domain: dip.torproject.org
 external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
-gitlab_storage_artifacts: 
-gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
 ldap_org: torproject
 ldap_host: db.torproject.org

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

[tor-commits] [dip/master] Update gitlab default role

2019-12-09 Thread hiro

commit 52b2fd8a20dec5a70d82ea01b8bb977f9938f908
Author: hiro 
Date:   Mon Dec 9 17:15:49 2019 +0100

Update gitlab default role
---
 roles/gitlab/defaults/main.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/roles/gitlab/defaults/main.yml b/roles/gitlab/defaults/main.yml
index 09cfb48..b95ec25 100644
--- a/roles/gitlab/defaults/main.yml
+++ b/roles/gitlab/defaults/main.yml
@@ -1,5 +1,4 @@
 ---
 gitlab_home: ~/gitlab
 gitlab_omniauth_providers: []
-gitlab_storage_artifacts:
 gitlab_storage_lfs:

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

[tor-commits] [dip/master] Update gitlab.yml.j2

2019-12-09 Thread hiro

commit fe4fd3187f5fc611ab4c7c4f0d951b2d8c4b3afe
Author: hiro 
Date:   Mon Dec 9 17:13:39 2019 +0100

Update gitlab.yml.j2
---
 roles/gitlab/templates/gitlab.yml.j2 | 13 -
 1 file changed, 13 deletions(-)

diff --git a/roles/gitlab/templates/gitlab.yml.j2 
b/roles/gitlab/templates/gitlab.yml.j2
index 79f0dd0..2c3add0 100644
--- a/roles/gitlab/templates/gitlab.yml.j2
+++ b/roles/gitlab/templates/gitlab.yml.j2
@@ -152,21 +152,8 @@ production: &base
   ## Build Artifacts
   artifacts:
 enabled: true
-{% if gitlab_storage_artifacts %}
-object_store:
-  enabled: true
-  remote_directory: {{ gitlab_storage_artifacts }}
-  direct_upload: true
-  proxy_download: true
-  connection:
-provider: Google
-google_project: {{ google_service_account.project_id }}
-google_client_email: {{ google_service_account.client_email }}
-google_json_key_location: config/storage.json
-{% else %}
 object_store:
   enabled: false
-{% endif %}
 
   ## Merge request external diff storage
   external_diffs:

___
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] Pick a release date.

2019-12-09 Thread nickm

commit a88a315ba03b05eead05ac2dd31433f3388adf7f
Author: Nick Mathewson 
Date:   Mon Dec 9 11:12:13 2019 -0500

Pick a release date.
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5c7726752..699f5133d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.1.7 - 2019-12-??
+Changes in version 0.4.1.7 - 2019-12-09
   This release backports several bugfixes to improve stability and
   correctness.  Anyone experiencing build problems or crashes with 0.4.1.6,
   including all relays relying on AccountingMax, should upgrade.

___
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] Pick a release date.

2019-12-09 Thread nickm

commit 6ccb9bc8b992d51b857d12ce49ffb75d34d8847a
Author: Nick Mathewson 
Date:   Mon Dec 9 11:12:25 2019 -0500

Pick a release date.
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 5b8b62c7b..a7942422f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.0.6 - 2019-12-??
+Changes in version 0.4.0.6 - 2019-12-09
   This is the second stable release in the 0.4.0.x series. This release
   backports several bugfixes to improve stability and correctness.  Anyone
   experiencing build problems or crashes with 0.4.0.5, including all relays

___
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] Pick a release date.

2019-12-09 Thread nickm

commit c00c24a4005066391cce0058e50f20baea31db7a
Author: Nick Mathewson 
Date:   Mon Dec 9 11:12:37 2019 -0500

Pick a release date.
---
 ChangeLog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d17070b79..dde2a8f71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.3.5.9 - 2019-12-??
+Changes in version 0.3.5.9 - 2019-12-09
   Tor 0.3.5.9 backports serveral fixes from later releases, including
   several that affect bridge users, relay stability, onion services,
   and much more.

___
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] Pick a release date, write a blurb.

2019-12-09 Thread nickm

commit bede4ea1008920d8b1b9ea72b0f44cb2ea4dbc6b
Author: Nick Mathewson 
Date:   Mon Dec 9 11:11:47 2019 -0500

Pick a release date, write a blurb.
---
 ChangeLog| 20 ++--
 ReleaseNotes | 15 +--
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fa66eacc9..2f7808078 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
-Changes in version 0.4.2.5 - 2019-12-??
-  Blurb blurb.
+Changes in version 0.4.2.5 - 2019-12-09
+  This is the first stable release in the 0.4.2.x series. This series
+  improves reliability and stability, and includes several stability and
+  correctness improvements for onion services. It also fixes many smaller
+  bugs present in previous series.
+
+  Per our support policy, we will support the 0.4.2.x series for nine
+  months, or until three months after the release of a stable 0.4.3.x:
+  whichever is longer. If you need longer-term support, please stick
+  with 0.3.5.x, which will we plan to support until Feb 2022.
+
+  Per our support policy, we will support the 0.4.2.x series for nine
+  months, or until three months after the release of a stable 0.4.3.x:
+  whichever is longer. If you need longer-term support, please stick
+  with 0.3.5.x, which will we plan to support until Feb 2022.
+
+  Below are the changes since 0.4.1.4-rc. For a complete list of changes
+  since 0.4.1.5, see the ReleaseNotes file.
 
   o Minor features (geoip):
 - Update geoip and geoip6 to the December 3 2019 Maxmind GeoLite2
diff --git a/ReleaseNotes b/ReleaseNotes
index 3f95bdf6c..33bcfff35 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,8 +2,19 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
-Changes in version 0.4.2.5 - 2019-12-??
-  Blurb blurb.
+Changes in version 0.4.2.5 - 2019-12-09
+  This is the first stable release in the 0.4.2.x series. This series
+  improves reliability and stability, and includes several stability and
+  correctness improvements for onion services. It also fixes many smaller
+  bugs present in previous series.
+
+  Per our support policy, we will support the 0.4.2.x series for nine
+  months, or until three months after the release of a stable 0.4.3.x:
+  whichever is longer. If you need longer-term support, please stick
+  with 0.3.5.x, which will we plan to support until Feb 2022.
+
+  Below are the changes since 0.4.1.4-rc. For a complete list of only
+  the changes since 0.4.2.4-rc, see the ChangeLog file.
 
   o Major features (directory authorities):
 - Directory authorities now reject relays running all currently

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

[tor-commits] [dip-configs/master] Update gitlab_storage_artifacts

2019-12-09 Thread hiro

commit 2d24e1ce914a9877fcfe3835f661ce635f33cb30
Author: hiro 
Date:   Mon Dec 9 17:11:56 2019 +0100

Update gitlab_storage_artifacts
---
 group_vars/all.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/group_vars/all.yml b/group_vars/all.yml
index 7d2d45e..80a95e4 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -3,7 +3,7 @@ external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
-gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts
+gitlab_storage_artifacts: 
 gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
 ldap_org: torproject
 ldap_host: db.torproject.org

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

[tor-commits] [dip/master] Update gitlab_storage_artifacts variable

2019-12-09 Thread hiro

commit 30fb169d6ff16858e05348c8d84d4d96f018fd59
Author: hiro 
Date:   Mon Dec 9 17:11:26 2019 +0100

Update gitlab_storage_artifacts variable
---
 inventories/prod/group_vars/all.yml | 1 +
 inventories/test/group_vars/all.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/inventories/prod/group_vars/all.yml 
b/inventories/prod/group_vars/all.yml
index 10849cf..0c38d7c 100644
--- a/inventories/prod/group_vars/all.yml
+++ b/inventories/prod/group_vars/all.yml
@@ -5,5 +5,6 @@ external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
 gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
+gitlab_storage_artifacts:
 ldap_org: torproject
 ldap_host: db.torproject.org
diff --git a/inventories/test/group_vars/all.yml 
b/inventories/test/group_vars/all.yml
index 10849cf..0c38d7c 100644
--- a/inventories/test/group_vars/all.yml
+++ b/inventories/test/group_vars/all.yml
@@ -5,5 +5,6 @@ external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
 gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
+gitlab_storage_artifacts:
 ldap_org: torproject
 ldap_host: db.torproject.org

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

[tor-commits] [dip/master] Update prod vars

2019-12-09 Thread hiro

commit 774adb7b0dc8096227cbe0f6d3bf84234ef60511
Author: hiro 
Date:   Mon Dec 9 17:04:56 2019 +0100

Update prod vars
---
 inventories/prod/group_vars/all.yml | 1 -
 inventories/test/group_vars/all.yml | 1 -
 2 files changed, 2 deletions(-)

diff --git a/inventories/prod/group_vars/all.yml 
b/inventories/prod/group_vars/all.yml
index f25d011..10849cf 100644
--- a/inventories/prod/group_vars/all.yml
+++ b/inventories/prod/group_vars/all.yml
@@ -4,7 +4,6 @@ external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
-gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts
 gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
 ldap_org: torproject
 ldap_host: db.torproject.org
diff --git a/inventories/test/group_vars/all.yml 
b/inventories/test/group_vars/all.yml
index f25d011..10849cf 100644
--- a/inventories/test/group_vars/all.yml
+++ b/inventories/test/group_vars/all.yml
@@ -4,7 +4,6 @@ external_domain_pages: pages.dip.torproject.org
 external_domain_registry: registry.dip.torproject.org
 external_domain_logs: logs.dip.torproject.org
 ldapsync_filter: (supplementaryGid=TorProject)
-gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts
 gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
 ldap_org: torproject
 ldap_host: db.torproject.org

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

[tor-commits] [dip/master] Change submodule path

2019-12-09 Thread hiro

commit 2dac1e2c62dec702e2fcd4ecfab68d48b947dd26
Author: hiro 
Date:   Mon Dec 9 17:01:54 2019 +0100

Change submodule path
---
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 85a091f..9553193 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "inventories/current/secrets/group_vars"]
-   path = inventories/current/secrets/group_vars
+   path = inventories/current/
url = https://git.torproject.org/admin/services/gitlab/dip-configs.git

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

[tor-commits] [dip-configs/master] Structure folders

2019-12-09 Thread hiro

commit a8cda471a8b41f4852163b91abff5ec5d357e9bf
Author: hiro 
Date:   Mon Dec 9 17:01:13 2019 +0100

Structure folders
---
 group_vars/all.yml  | 9 +
 all.yml.sample => secrets/group_vars/all.yml.sample | 0
 2 files changed, 9 insertions(+)

diff --git a/group_vars/all.yml b/group_vars/all.yml
new file mode 100644
index 000..7d2d45e
--- /dev/null
+++ b/group_vars/all.yml
@@ -0,0 +1,9 @@
+external_domain: dip.torproject.org
+external_domain_pages: pages.dip.torproject.org
+external_domain_registry: registry.dip.torproject.org
+external_domain_logs: logs.dip.torproject.org
+ldapsync_filter: (supplementaryGid=TorProject)
+gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts
+gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
+ldap_org: torproject
+ldap_host: db.torproject.org
diff --git a/all.yml.sample b/secrets/group_vars/all.yml.sample
similarity index 100%
rename from all.yml.sample
rename to secrets/group_vars/all.yml.sample

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

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

2019-12-09 Thread translation

commit 997a4766b52b930d661c9347c2989400adbf9851
Author: Translation commit bot 
Date:   Mon Dec 9 15:45:41 2019 +


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

diff --git a/locale/mk/LC_MESSAGES/messages.po 
b/locale/mk/LC_MESSAGES/messages.po
index fcd8953c10..78edbf069b 100644
--- a/locale/mk/LC_MESSAGES/messages.po
+++ b/locale/mk/LC_MESSAGES/messages.po
@@ -5,10 +5,11 @@
 # Liljana Ackovska , 2019
 # Matej Plavevski , 2019
 # Zarko Gjurov , 2019
+# Dan Nikoloski , 2019
 # 
 msgid ""
 msgstr ""
-"Last-Translator: Zarko Gjurov , 2019\n"
+"Last-Translator: Dan Nikoloski , 2019\n"
 "Language-Team: Macedonian (https://www.transifex.com/otf/teams/1519/mk/)\n"
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
@@ -89,12 +90,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 "ÐÑÐ¸Ð²Ð°ÑÐ½Ð¾ÑÑa Ð¸ ÑÐ»Ð¾Ð±Ð¾Ð´Ð°ÑÐ° Ð¿ÑÐµÐºÑ 
Ð¸Ð½ÑÐµÑÐ½ÐµÑ ÑÑÐµÐ±Ð° Ð´Ð° Ð±Ð¸Ð´Ð°Ñ ÑÑÐ°Ð½Ð´Ð°ÑÐ´Ð½Ð¾."
 
 #: 
tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:49
 #: 
tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:72
 msgid "Donate to the Tor Project."
-msgstr ""
+msgstr "ÐÐ¾Ð½Ð¸ÑÐ°ÑÑÐµ Ð½Ð° Tor Ð¿ÑÐ¾ÐµÐºÑÐ¾Ñ."
 
 #: 
tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:58
 msgid "summary_large_image"
@@ -102,7 +103,7 @@ msgstr ""
 
 #: 
tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:62
 msgid "@torproject"
-msgstr ""
+msgstr "@tÐ¾rproject"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:54
 #: 
tmp/cache_locale/af/af919ed4d7946ee7ed7d71a5580f4c75c5fb2b9374dd8d99d3a0671f71654f60.php:54
@@ -113,21 +114,23 @@ msgstr "ÐÐ¾Ð´ÑÐ¶ÐµÑÐµ Ð³Ð¾ Tor Ð¿ÑÐ¾ÐµÐºÑÐ¾Ñ 
Ð´ÐµÐ½ÐµÑ!"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:83
 msgid "Want to donate by credit card or PayPal?"
-msgstr ""
+msgstr "Ð¡Ð°ÐºÐ°Ñ Ð´Ð° Ð´Ð¾Ð½Ð¸ÑÐ°Ñ ÑÐ¾ ÐºÑÐµÐ´Ð¸ÑÐ½Ð° ÐºÐ°ÑÑÐ¸ÑÐºÐ° 
Ð¸Ð»Ð¸ PayPal?"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:92
 msgid "Donate using BTCPayServer"
-msgstr ""
+msgstr "ÐÐ¾Ð½Ð¸ÑÐ°Ñ ÐºÐ¾ÑÐ¸ÑÑÐµÑÑÐ¸ BTCPayServer"
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:126
 msgid "Donate using wallet addresses"
-msgstr ""
+msgstr "ÐÐ¾Ð½Ð¸ÑÐ°Ñ ÐºÐ¾ÑÐ¸ÑÑÐµÑÑÐ¸ wallet Ð°Ð´ÑÐµÑÐ¸."
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:133
 msgid ""
 "Please fill out this form and then send your coins to the appropriate "
 "wallet."
 msgstr ""
+"ÐÐµ Ð¼Ð¾Ð»Ð¸Ð¼Ðµ Ð¿Ð¾Ð¿Ð¾Ð»Ð½ÐµÑÐµ ÑÐ° ÑÐ¾ÑÐ¼Ð°ÑÐ° Ð¸ Ð¿ÑÐ°ÑÐµÑÐµ 
Ð³Ð¸ Ð²Ð°ÑÐ¸ÑÐµ coins Ð½Ð° ÑÐ¾Ð¾Ð´Ð²ÐµÑÐ½Ð¸Ð¾Ñ "
+"wallet."
 
 #: 
tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:135
 msgid ""

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

[tor-commits] [dip/master] Fix inventory configuration

2019-12-09 Thread hiro

commit 4ca6f5ae7feec4e494a6d96de431fade8d9278ae
Author: hiro 
Date:   Mon Dec 9 16:44:17 2019 +0100

Fix inventory configuration
---
 inventories/prod/hosts  | 25 +
 inventories/test/group_vars/all.yml | 17 +
 inventories/test/hosts  | 23 +--
 3 files changed, 11 insertions(+), 54 deletions(-)

diff --git a/inventories/prod/hosts b/inventories/prod/hosts
index 9029e4d..348adae 100644
--- a/inventories/prod/hosts
+++ b/inventories/prod/hosts
@@ -1,25 +1,2 @@
-[system/logs]
-salsa-logs.debian.net
-
-[system/runner]
-salsa-runner.debian.net
-
 [gitlab]
-godard.debian.org ansible_connection=local
-
-[gitlab-pages]
-salsa-pages.godard.debian.org ansible_connection=local ansible_become=True 
ansible_host=godard.debian.org ansible_become_user=salsa-pages
-
-[gitlab-runner]
-salsa-runner.salsa-runner.debian.net ansible_host=salsa-runner.debian.net 
ansible_user=salsa-runner
-
-[salsa-webhook]
-salsa-webhook.godard.debian.org ansible_connection=local ansible_become=True 
ansible_host=godard.debian.org ansible_become_user=salsa-webhook
-
-[docker-registry]
-salsa-registry.godard.debian.org ansible_connection=local ansible_become=True 
ansible_host=godard.debian.org ansible_become_user=salsa-registry
-
-[runners]
-
-gitlabrunner2.debian.net ansible_user=root
-
+gitlab-01.torproject.org ansible_connection=local
diff --git a/inventories/test/group_vars/all.yml 
b/inventories/test/group_vars/all.yml
index d90ab9b..f25d011 100644
--- a/inventories/test/group_vars/all.yml
+++ b/inventories/test/group_vars/all.yml
@@ -1,9 +1,10 @@
 ---
-external_domain: salsa-test.debian.net
-external_domain_logs: salsa-test-logs.debian.net
-external_domain_pages: salsa-test-pages.debian.net
-external_domain_registry: salsa-test-registry.debian.net
-external_domain_webhook: salsa-test-webhook.debian.net
-ldapsync_filter: (supplementaryGid=gitdoadm)
-gitlab_storage_artifacts: debian-salsa-test-gitlab-artifacts
-gitlab_storage_lfs: debian-salsa-test-gitlab-lfs
+external_domain: dip.torproject.org
+external_domain_pages: pages.dip.torproject.org
+external_domain_registry: registry.dip.torproject.org
+external_domain_logs: logs.dip.torproject.org
+ldapsync_filter: (supplementaryGid=TorProject)
+gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts
+gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
+ldap_org: torproject
+ldap_host: db.torproject.org
diff --git a/inventories/test/hosts b/inventories/test/hosts
index fbc8f9a..348adae 100644
--- a/inventories/test/hosts
+++ b/inventories/test/hosts
@@ -1,23 +1,2 @@
-[system/gitlab]
-salsa-test.debian.net
-
-[system/logs]
-salsa-test-logs.debian.net
-
-[system/runner]
-salsa-test-runner.debian.net
-
 [gitlab]
-git.salsa-test.debian.net ansible_connection=local
-
-[gitlab-pages]
-salsa-pages.salsa-test.debian.net ansible_connection=local ansible_become=True 
ansible_host=git.salsa-test.debian.net ansible_become_user=salsa-pages
-
-[gitlab-runner]
-salsa-runner.salsa-test-runner.debian.net 
ansible_host=salsa-test-runner.debian.net ansible_user=salsa-runner
-
-[salsa-webhook]
-salsa-webhook.salsa-test.debian.net ansible_connection=local 
ansible_become=True ansible_host=git.salsa-test.debian.net 
ansible_become_user=salsa-webhook
-
-[docker-registry]
-salsa-registry.salsa-test.debian.net ansible_connection=local 
ansible_become=True ansible_host=git.salsa-test.debian.net 
ansible_become_user=salsa-registry
+gitlab-01.torproject.org ansible_connection=local

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

[tor-commits] [dip/master] Upgrade to 12.5.0

2019-12-09 Thread hiro

commit 3e1c344e42964b18c7003cc83f80eb2020295fc3
Author: Bastian Blank 
Date:   Sun Nov 24 19:48:09 2019 +0100

Upgrade to 12.5.0
---
 playbooks/group_vars/all.yml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml
index e663c8a..af5a9d2 100644
--- a/playbooks/group_vars/all.yml
+++ b/playbooks/group_vars/all.yml
@@ -1,11 +1,11 @@
 ---
 gitlab_repo: https://salsa.debian.org/salsa/gitlab.git
-gitlab_version: v12.4.2-salsa-1
-gitlab_pages_version: v1.11.0
+gitlab_version: v12.5.0-salsa-1
+gitlab_pages_version: v1.12.0
 gitlab_shell_version: v10.2.0
 gitlab_workhorse_version: v8.14.0
-gitaly_version: v1.67.0
-gitlab_runner_version: v12.4.1
+gitaly_version: v1.72.0
+gitlab_runner_version: v12.5.0
 docker_machine_version: v0.16.1
 docker_registry_version: v2.7.1
 minio_version: RELEASE.2018-07-23T18-34-49Z



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

[tor-commits] [dip/master] Update vars

2019-12-09 Thread hiro

commit 53443dc7e4712fadea10be6d587c04d6ef7fbd4e
Author: hiro 
Date:   Mon Dec 9 15:42:13 2019 +0100

Update vars
---
 playbooks/group_vars/all.yml | 9 -
 1 file changed, 9 deletions(-)

diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml
index e5fc2c6..b8aed7a 100644
--- a/playbooks/group_vars/all.yml
+++ b/playbooks/group_vars/all.yml
@@ -1,20 +1,11 @@
 ---
 gitlab_repo: https://salsa.debian.org/salsa/gitlab.git
-<<< HEAD
 gitlab_version: v12.5.2-salsa-1
 gitlab_pages_version: v1.12.0
 gitlab_shell_version: v10.2.0
 gitlab_workhorse_version: v8.14.1
 gitaly_version: v1.72.1
 gitlab_runner_version: v12.5.0
-===
-gitlab_version: v12.4.2-salsa-1
-gitlab_pages_version: v1.11.0
-gitlab_shell_version: v10.2.0
-gitlab_workhorse_version: v8.14.0
-gitaly_version: v1.67.0
-gitlab_runner_version: v12.4.1
->>> Update from upstream
 docker_machine_version: v0.16.1
 docker_registry_version: v2.7.1
 minio_version: RELEASE.2018-07-23T18-34-49Z

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

[tor-commits] [dip/master] Upgrade to 12.5.2

2019-12-09 Thread hiro

commit 82f006fc8a583cfbb6ac503c08ea42e4cf67d174
Author: Bastian Blank 
Date:   Sat Nov 30 19:41:47 2019 +0100

Upgrade to 12.5.2
---
 playbooks/group_vars/all.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml
index af5a9d2..b8aed7a 100644
--- a/playbooks/group_vars/all.yml
+++ b/playbooks/group_vars/all.yml
@@ -1,10 +1,10 @@
 ---
 gitlab_repo: https://salsa.debian.org/salsa/gitlab.git
-gitlab_version: v12.5.0-salsa-1
+gitlab_version: v12.5.2-salsa-1
 gitlab_pages_version: v1.12.0
 gitlab_shell_version: v10.2.0
-gitlab_workhorse_version: v8.14.0
-gitaly_version: v1.72.0
+gitlab_workhorse_version: v8.14.1
+gitaly_version: v1.72.1
 gitlab_runner_version: v12.5.0
 docker_machine_version: v0.16.1
 docker_registry_version: v2.7.1



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

[tor-commits] [dip/master] Support new Rack::Attack

2019-12-09 Thread hiro

commit fa94c7b46953d60e88862d6323a5c89ce8c88b64
Author: Bastian Blank 
Date:   Sun Nov 24 19:47:27 2019 +0100

Support new Rack::Attack
---
 roles/gitlab/templates/rack_attack.rb.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/roles/gitlab/templates/rack_attack.rb.j2 
b/roles/gitlab/templates/rack_attack.rb.j2
index d4dec95..b48bf5e 100644
--- a/roles/gitlab/templates/rack_attack.rb.j2
+++ b/roles/gitlab/templates/rack_attack.rb.j2
@@ -28,7 +28,7 @@ unless Rails.env.test? || !rack_attack_enabled
   end
 end
 
-Rack::Attack.blacklist("block from ip blacklist") do |req|
+Rack::Attack.blocklist("block from ip blacklist") do |req|
   ::Gitlab::Redis::SharedState.with do |redis|
 begin
   ip = IPAddr.new(req.ip)
@@ -58,7 +58,7 @@ Rack::Attack.blacklist("block from ip blacklist") do |req|
   end
 end
 
-Rack::Attack.blacklisted_response = lambda do |env|
+Rack::Attack.blocklisted_response = lambda do |env|
   reason = env['RACK_ATTACK_BLACKLIST_REASON']
   if reason != ''
 text = "Forbidden, #{reason}\n"



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

[tor-commits] [dip/master] Update gitlab

2019-12-09 Thread hiro

commit ff47731b5adf8d83f4285cecc14da21da282aadf
Author: hiro 
Date:   Mon Dec 9 15:40:15 2019 +0100

Update gitlab
---
 playbooks/group_vars/all.yml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/playbooks/group_vars/all.yml b/playbooks/group_vars/all.yml
index b8aed7a..e5fc2c6 100644
--- a/playbooks/group_vars/all.yml
+++ b/playbooks/group_vars/all.yml
@@ -1,11 +1,20 @@
 ---
 gitlab_repo: https://salsa.debian.org/salsa/gitlab.git
+<<< HEAD
 gitlab_version: v12.5.2-salsa-1
 gitlab_pages_version: v1.12.0
 gitlab_shell_version: v10.2.0
 gitlab_workhorse_version: v8.14.1
 gitaly_version: v1.72.1
 gitlab_runner_version: v12.5.0
+===
+gitlab_version: v12.4.2-salsa-1
+gitlab_pages_version: v1.11.0
+gitlab_shell_version: v10.2.0
+gitlab_workhorse_version: v8.14.0
+gitaly_version: v1.67.0
+gitlab_runner_version: v12.4.1
+>>> Update from upstream
 docker_machine_version: v0.16.1
 docker_registry_version: v2.7.1
 minio_version: RELEASE.2018-07-23T18-34-49Z



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

[tor-commits] [dip/master] Fix typo in ldap host variable

2019-12-09 Thread hiro

commit b4689eb43c73c44d88c174572d439950366a1a3f
Author: hiro 
Date:   Mon Dec 9 15:21:31 2019 +0100

Fix typo in ldap host variable
---
 inventories/prod/group_vars/all.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inventories/prod/group_vars/all.yml 
b/inventories/prod/group_vars/all.yml
index 8fa8e97..f25d011 100644
--- a/inventories/prod/group_vars/all.yml
+++ b/inventories/prod/group_vars/all.yml
@@ -7,4 +7,4 @@ ldapsync_filter: (supplementaryGid=TorProject)
 gitlab_storage_artifacts: torproject-dip-prod-gitlab-artifacts
 gitlab_storage_lfs: torproject-dip-prod-gitlab-lfs
 ldap_org: torproject
-ldap_host: db.torproject.orgs
+ldap_host: db.torproject.org



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

[tor-commits] [metrics-cloud/master] Add license

2019-12-09 Thread irl

commit d49d06ba01d36fe55698ec3709e55653019d682a
Author: Iain R. Learmonth 
Date:   Mon Dec 9 14:12:39 2019 +

Add license
---
 COPYING | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/COPYING b/COPYING
new file mode 100644
index 000..8c0fa8b
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,14 @@
+Copyright (c) 2019 Iain Learmonth 
+Copyright (c) 2019 Ana Custura 
+
+Permission to use, copy, modify, and distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

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

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

2019-12-09 Thread translation

commit 245a2d879d43195359ad30a2f13bca6860ba596b
Author: Translation commit bot 
Date:   Mon Dec 9 12:53:27 2019 +

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

diff --git a/contents+cs.po b/contents+cs.po
index e8ef187617..be0d75297a 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -1,9 +1,9 @@
 # Translators:
 # Zuzana LÃ¡skorÃ¡dovÃ¡, 2019
 # erinm, 2019
-# Ondrej FÃ¼hrer , 2019
 # Emma Peel, 2019
 # Michal Stanke , 2019
+# Ondrej FÃ¼hrer , 2019
 # 
 msgid ""
 msgstr ""
@@ -11,7 +11,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-14 16:04+CET\n"
 "PO-Revision-Date: 2018-10-02 22:41+\n"
-"Last-Translator: Michal Stanke , 2019\n"
+"Last-Translator: Ondrej FÃ¼hrer , 2019\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -8250,7 +8250,7 @@ msgstr "# apt install tor"
 #: lego/templates/banner.html:2 lego/templates/banner.html:4
 #: templates/banner.html:2 templates/banner.html:4
 msgid "Close banner"
-msgstr ""
+msgstr "ZavÅÃt baner"
 
 #: lego/templates/banner.html:10 templates/banner.html:10
 msgid "Tracking, surveillance, and censorship are widespread online."
@@ -8299,7 +8299,7 @@ msgstr "PÅispÄjte"
 
 #: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
-msgstr ""
+msgstr "OdebÃrat naÅ¡e novinky"
 
 #: lego/templates/footer.html:55 templates/footer.html:55
 msgid "Get monthly updates and opportunities from the Tor Project:"
@@ -8318,7 +8318,7 @@ msgstr ""
 
 #: lego/templates/navbar.html:21 templates/navbar.html:21
 msgid "Menu"
-msgstr ""
+msgstr "Menu"
 
 #: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
@@ -8368,7 +8368,7 @@ msgstr "Tor"
 #: lego/templates/secure-connections.html:32
 #: templates/secure-connections.html:32
 msgid "POTENTIALLY VISIBLE DATA"
-msgstr ""
+msgstr "PotenciÃ¡lnÄ viditelnÃ© Ãºdaje"
 
 #: lego/templates/secure-connections.html:37
 #: templates/secure-connections.html:37
@@ -8434,15 +8434,15 @@ msgstr "TÃ©mata"
 
 #: templates/macros/question.html:16
 msgid "Contributors to this page:"
-msgstr ""
+msgstr "PÅispÄvatelÃ© tÃ©to strÃ¡nky:"
 
 #: templates/macros/question.html:18
 msgid "Edit this page"
-msgstr ""
+msgstr "Upravit tuto strÃ¡nku"
 
 #: templates/macros/question.html:19
 msgid "Suggest Feedback"
-msgstr ""
+msgstr "Navrhnout zpÄtnou vazbu"
 
 #: templates/macros/question.html:20
 msgid "Permalink"

___
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-12-09 Thread translation

commit db199981b736bcb26d25566110322bbb162276bc
Author: Translation commit bot 
Date:   Mon Dec 9 12:52:57 2019 +

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

diff --git a/contents+cs.po b/contents+cs.po
index b00773568a..e3df11c385 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -1,8 +1,8 @@
 # Translators:
 # erinm, 2019
 # IDRASSI Mounir , 2019
-# Ondrej FÃ¼hrer , 2019
 # Michal Stanke , 2019
+# Ondrej FÃ¼hrer , 2019
 # 
 msgid ""
 msgstr ""
@@ -10,7 +10,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-15 12:00+CET\n"
 "PO-Revision-Date: 2019-03-09 10:41+\n"
-"Last-Translator: Michal Stanke , 2019\n"
+"Last-Translator: Ondrej FÃ¼hrer , 2019\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -646,7 +646,7 @@ msgstr ""
 #: lego/templates/banner.html:2 lego/templates/banner.html:4
 #: templates/banner.html:2 templates/banner.html:4
 msgid "Close banner"
-msgstr ""
+msgstr "ZavÅÃt baner"
 
 #: lego/templates/banner.html:10 templates/banner.html:10
 msgid "Tracking, surveillance, and censorship are widespread online."
@@ -691,7 +691,7 @@ msgstr ""
 
 #: lego/templates/footer.html:54 templates/footer.html:54
 msgid "Subscribe to our Newsletter"
-msgstr ""
+msgstr "OdebÃrat naÅ¡e novinky"
 
 #: lego/templates/footer.html:55 templates/footer.html:55
 msgid "Get monthly updates and opportunities from the Tor Project:"
@@ -710,7 +710,7 @@ msgstr ""
 
 #: lego/templates/navbar.html:21 templates/navbar.html:21
 msgid "Menu"
-msgstr ""
+msgstr "Menu"
 
 #: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
@@ -757,7 +757,7 @@ msgstr "Tor"
 
 #: lego/templates/secure-connections.html:32
 msgid "POTENTIALLY VISIBLE DATA"
-msgstr ""
+msgstr "PotenciÃ¡lnÄ viditelnÃ© Ãºdaje"
 
 #: lego/templates/secure-connections.html:37
 msgid "Site.com"
@@ -1372,15 +1372,15 @@ msgstr ""
 
 #: templates/macros/question.html:12
 msgid "Contributors to this page:"
-msgstr ""
+msgstr "PÅispÄvatelÃ© tÃ©to strÃ¡nky:"
 
 #: templates/macros/question.html:14
 msgid "Edit this page"
-msgstr ""
+msgstr "Upravit tuto strÃ¡nku"
 
 #: templates/macros/question.html:15
 msgid "Suggest Feedback"
-msgstr ""
+msgstr "Navrhnout zpÄtnou vazbu"
 
 #: templates/macros/question.html:16
 msgid "Permalink"

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

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

2019-12-09 Thread translation

commit b9a6e7d8644c1249c1fcfa59c679bbe1dd8cd989
Author: Translation commit bot 
Date:   Mon Dec 9 12:50:00 2019 +

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

diff --git a/contents+cs.po b/contents+cs.po
index caeac50e3c..4f4de8f486 100644
--- a/contents+cs.po
+++ b/contents+cs.po
@@ -6,8 +6,8 @@
 # erinm, 2019
 # penda , 2019
 # Plarome, 2019
-# Ondrej FÃ¼hrer , 2019
 # Michal Stanke , 2019
+# Ondrej FÃ¼hrer , 2019
 # 
 msgid ""
 msgstr ""
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-29 10:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Michal Stanke , 2019\n"
+"Last-Translator: Ondrej FÃ¼hrer , 2019\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/1519/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -340,7 +340,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "### TO USE GETTOR VIA EMAIL:"
-msgstr ""
+msgstr "### POUÅ½ITÃ GETTOR POMOCÃ E-MAILU:"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -372,7 +372,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
 msgid "### TO USE GETTOR VIA JABBER/XMPP (JITSI, COYIM, ETC.):"
-msgstr ""
+msgstr "### POUÅ½ITÃ GETTOR POMOCÃ JABBER/XMPP (JITSI, COYIM, atd):"
 
 #: https//tb-manual.torproject.org/downloading/
 #: (content/downloading/contents+en.lrtopic.body)
@@ -1767,6 +1767,8 @@ msgid ""
 ""
 msgstr ""
+""
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -1798,7 +1800,7 @@ msgstr ""
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
 msgid "On Linux:"
-msgstr ""
+msgstr "Na Linuxu:"
 
 #: https//tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lrtopic.body)
@@ -1841,22 +1843,22 @@ msgstr ""
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid "* Webroot SecureAnywhere"
-msgstr ""
+msgstr "* Webroot SecureAnywhere"
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid "* Kaspersky Internet Security 2012"
-msgstr ""
+msgstr "* Kaspersky Internet Security 2012"
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid "* Sophos Antivirus for Mac"
-msgstr ""
+msgstr "* Sophos Antivirus pro Mac"
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
 msgid "* Microsoft Security Essentials"
-msgstr ""
+msgstr "* Microsoft Security Essentials"
 
 #: https//tb-manual.torproject.org/known-issues/
 #: (content/known-issues/contents+en.lrtopic.body)
@@ -2005,7 +2007,7 @@ msgstr ""
 #: lego/templates/banner.html:3 lego/templates/banner.html:5
 #: templates/banner.html:3 templates/banner.html:5
 msgid "Close banner"
-msgstr ""
+msgstr "ZavÅÃt baner"
 
 #: lego/templates/banner.html:11 templates/banner.html:11
 msgid "Tracking, surveillance, and censorship are widespread online."
@@ -2064,7 +2066,7 @@ msgstr "PÅispÄjte"
 
 #: lego/templates/footer.html:65 templates/footer.html:65
 msgid "Subscribe to our Newsletter"
-msgstr ""
+msgstr "OdebÃrat naÅ¡e novinky"
 
 #: lego/templates/footer.html:66 templates/footer.html:66
 msgid "Get monthly updates and opportunities from the Tor Project:"
@@ -2083,7 +2085,7 @@ msgstr ""
 
 #: lego/templates/navbar.html:26 templates/navbar.html:26
 msgid "Menu"
-msgstr ""
+msgstr "Menu"
 
 #: lego/templates/search.html:5 templates/search.html:5
 msgid "Search"
@@ -2138,7 +2140,7 @@ msgstr "Tor"
 #: lego/templates/secure-connections.html:32
 #: templates/secure-connections.html:32
 msgid "POTENTIALLY VISIBLE DATA"
-msgstr ""
+msgstr "POTENCIÃLNÄ VIDITELNÃ DATA"
 
 #: lego/templates/secure-connections.html:37
 #: templates/secure-connections.html:37
@@ -2196,7 +2198,7 @@ msgstr ""
 
 #: templates/layout.html:11
 msgid "Tor Project | Tor Browser Manual"
-msgstr ""
+msgstr "Tor Projekt | PÅÃruÄka Tor prohlÃÅ¾eÄe"
 
 #: templates/sidenav.html:4 templates/sidenav.html:35
 msgid "Topics"
@@ -2204,15 +2206,15 @@ msgstr "TÃ©mata"
 
 #: templates/macros/topic.html:22
 msgid "Contributors to this page:"
-msgstr ""
+msgstr "PÅispÄvatelÃ© tÃ©to strÃ¡nky:"
 
 #: templates/macros/topic.html:24
 msgid "Edit this page"
-msgstr ""
+msgstr "Upravit tuto strÃ¡nku"
 
 #: templates/macros/topic.html:25
 msgid "Suggest Feedback"
-msgstr ""
+msgstr "Navrhnout zpÄtnou vazbu"
 
 #: templates/macros/topic.html:26
 msgid "Permalink"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproj

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

2019-12-09 Thread translation

commit b285b504b1f7c41cc33a2f58ff3765d02da7c0b6
Author: Translation commit bot 
Date:   Mon Dec 9 12:23:05 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
---
 ro/network-settings.dtd | 26 +-
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ro/network-settings.dtd b/ro/network-settings.dtd
index 9efedab830..4260ea0cde 100644
--- a/ro/network-settings.dtd
+++ b/ro/network-settings.dtd
@@ -37,7 +37,7 @@
 
 
 
-
+
 
 
 
@@ -63,21 +63,21 @@
 
 
 
-
-
+
+
 
 
-
-
+
+
 
-
+
 
-
-
-
-
+
+
+
+
 
 
-
-
-
+
+
+

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

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

2019-12-09 Thread translation

commit bb605942abe35fb173d1f464e85d8e37737eb7c7
Author: Translation commit bot 
Date:   Mon Dec 9 12:22:16 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties
---
 ro/browserOnboarding.properties | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ro/browserOnboarding.properties b/ro/browserOnboarding.properties
index 2798959704..09e58f8932 100644
--- a/ro/browserOnboarding.properties
+++ b/ro/browserOnboarding.properties
@@ -15,8 +15,8 @@ onboarding.tour-tor-privacy.button=Sari la ReÈeaua Tor
 onboarding.tour-tor-network=ReÈea Tor
 onboarding.tour-tor-network.title=NavigheazÄ Ã®ntr-o reÈea descentralizatÄ
 onboarding.tour-tor-network.description=Navigatorul Tor Browser te conecteazÄ 
la reÈeaua Tor, menÈinutÄ de mii de voluntari din Ã®ntreaga lume. Spre 
deosebire de o reÈea VPN, nu existÄ un punct ce poate eÈua sau o entitate 
centralizatÄ cÄreia trebuie sÄ ii acorzi Ã®ncrederea pentru a te bucura de 
Internet Ã®n mod total privat. 
-onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, 
including the ability to request bridges where Tor is blocked, can now be found 
in Preferences.
-onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
+onboarding.tour-tor-network.description-para2=NOU: SetÄrile reÈelei Tor, 
inclusiv posibilitatea de a solicita poduri unde este blocat Tor, pot fi 
gÄsite acum Ã®n PreferinÈe.
+onboarding.tour-tor-network.action-button=AjustaÈi SetÄrile reÈelei Tor
 onboarding.tour-tor-network.button=Sari la AfiÈaj Circuit
 
 onboarding.tour-tor-circuit-display=AfiÈaj Circuit
@@ -49,10 +49,10 @@ onboarding.tour-tor-update.prefix-new=Nou
 onboarding.tour-tor-update.prefix-updated=Actualizat
 
 onboarding.tour-tor-toolbar=Bara cu instrumente
-onboarding.tour-tor-toolbar-update-9.0.title=Goodbye Onion Button.
-onboarding.tour-tor-toolbar-update-9.0.description=We want your experience 
using Tor to be fully integrated within Tor Browser.
-onboarding.tour-tor-toolbar-update-9.0.description-para2=That's why now, 
rather than using the onion button, you can see your Tor Circuit via the [i] in 
the URL bar and request a New Identity using the toolbar button or the [â¡] 
menu.
-onboarding.tour-tor-toolbar-update-9.0.button=How to Request a New Identity
+onboarding.tour-tor-toolbar-update-9.0.title=La revedere buton onion.
+onboarding.tour-tor-toolbar-update-9.0.description=Dorim ca experienÈa dvs. 
folosind Tor sÄ fie complet integratÄ Ã®n Tor Browser.
+onboarding.tour-tor-toolbar-update-9.0.description-para2=De aceea acum, Ã®n 
loc sÄ folosiÈi butonul ceapÄ, puteÈi vedea Circuitul Tor dvs. prin [i] Ã®n 
bara URL Èi puteÈi solicita o nouÄ identitate folosind butonul barei de 
instrumente sau meniul [â¡].
+onboarding.tour-tor-toolbar-update-9.0.button=Cum sÄ solicitaÈi o nouÄ 
identitate
 onboarding.tour-tor-toolbar-update-9.0.next-button=Sari la ReÈeaua Tor 
 
 # Circuit Display onboarding.

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

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

2019-12-09 Thread translation

commit 10bd7ff0b2a9c2faa80582e784482976b0ff1f99
Author: Translation commit bot 
Date:   Mon Dec 9 12:22:22 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-browseronboardingproperties_completed
---
 ro/browserOnboarding.properties | 35 ++-
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/ro/browserOnboarding.properties b/ro/browserOnboarding.properties
index 102d2c5162..e73546c83e 100644
--- a/ro/browserOnboarding.properties
+++ b/ro/browserOnboarding.properties
@@ -5,7 +5,7 @@
 onboarding.tour-tor-welcome=Bine aÈi venit
 onboarding.tour-tor-welcome.title=Gata. 
 onboarding.tour-tor-welcome.description=Navigatorul Tor Browser oferÄ cel mai 
ridicat standard de intimitate Èi securitate Ã®n timpul navigÄrii pe 
Internet. Acesta protejeazÄ acum Ã®mpotriva urmÄririi, supravegherii Èi 
aplicÄrii cenzurii. Acest scurt tur Ã®Èi va arÄta cum.
-onboarding.tour-tor-welcome.next-button=AccesaÈi Politica de 
ConfidenÈialitate
+# onboarding.tour-tor-welcome.next-button=Go to Privacy
 
 onboarding.tour-tor-privacy=Intimitate
 onboarding.tour-tor-privacy.title=Cei ce Ã®Èi urmÄresc activitatea.
@@ -15,44 +15,45 @@ onboarding.tour-tor-privacy.button=Sari la ReÈeaua Tor
 onboarding.tour-tor-network=ReÈea Tor
 onboarding.tour-tor-network.title=NavigheazÄ Ã®ntr-o reÈea descentralizatÄ
 onboarding.tour-tor-network.description=Navigatorul Tor Browser te conecteazÄ 
la reÈeaua Tor, menÈinutÄ de mii de voluntari din Ã®ntreaga lume. Spre 
deosebire de o reÈea VPN, nu existÄ un punct ce poate eÈua sau o entitate 
centralizatÄ cÄreia trebuie sÄ ii acorzi Ã®ncrederea pentru a te bucura de 
Internet Ã®n mod total privat. 
+# onboarding.tour-tor-network.description-para2=NEW: Tor Network Settings, 
including the ability to request bridges where Tor is blocked, can now be found 
in Preferences.
+# onboarding.tour-tor-network.action-button=Adjust Your Tor Network Settings
 onboarding.tour-tor-network.button=Sari la AfiÈaj Circuit
 
 onboarding.tour-tor-circuit-display=AfiÈaj Circuit
 onboarding.tour-tor-circuit-display.title=Vezi ruta ta.
 onboarding.tour-tor-circuit-display.description=Pentru fiecare domeniu pe care 
Ã®l vizitezi, traficul tau este criptat Èi expediat printr-un circuit format 
din trei releuri Tor din jurul lumii. Nici un site web nu Ètie de unde te 
conectezi. PoÈi cere un circuit nou apÄsÃ¢nd butonul 'Circuit Nou pentru 
acest Site' sub AfiÈaj Circuit.
 onboarding.tour-tor-circuit-display.button=Vezi Ruta Mea
-onboarding.tour-tor-circuit-display.next-button=AccesaÈi pagina de Securitate
+# onboarding.tour-tor-circuit-display.next-button=Go to Security
 
 onboarding.tour-tor-security=Securitate
 onboarding.tour-tor-security.title=Alege-Èi experienÈa.
 onboarding.tour-tor-security.description=De asemenea Ã®Èi punem la 
dispoziÈie setÄri suplimentare pentru a Ã®Èi spori siguranÈa navigatorului. 
SetÄrile de securitate Ã®Èi permit sÄ blochezi elemente ce pot fi folosite 
pentru a Ã®Èi ataca calculatorul. ApasÄ butonul de mai jos pentru a explora 
aceste opÈiuni.
-onboarding.tour-tor-security.description-suffix=NotÄ: Ãn mod implicit, 
NoScript Èi HTTPS Everywhere nu sunt incluse Ã®n bara de instrumente, dar 
puteÈi personaliza bara de instrumente pentru a le adÄuga.
-onboarding.tour-tor-security-level.button=VerificÄ Nivelul TÄu de Securitate
-onboarding.tour-tor-security-level.next-button=AccesaÈi Sfaturi pentru 
experienÈÄ
+# onboarding.tour-tor-security.description-suffix=Note: By default, NoScript 
and HTTPS Everywhere are not included on the toolbar, but you can customize 
your toolbar to add them.
+# onboarding.tour-tor-security-level.button=See Your Security Level
+# onboarding.tour-tor-security-level.next-button=Go to Experience Tips
 
 onboarding.tour-tor-expect-differences=Sfaturi pentru ExperienÈÄ
 onboarding.tour-tor-expect-differences.title=AÈteaptÄ-te la niÈte 
diferenÈe.
 onboarding.tour-tor-expect-differences.description=Cu toate elementele de 
securitate si intimitate puse la dispoziÈie de Tor, experienÈa ta de navigare 
pe internet ar putea fi diferitÄ. Paginile se pot Ã®ncÄrca mai lent 
depinzÃ¢nd de nivelul tÄu de securitate, iar alte elemente ar putea sÄ nu se 
Ã®ncarce sau sÄ nu meargÄ de loc. De asemenea, se poate sÄ Èi se cearÄ sÄ 
demonstrezi cÄ esti om Èi nu robot.
 onboarding.tour-tor-expect-differences.button=Vezi SecÈiunea de ÃntrebÄri 
Frecvente
-onboarding.tour-tor-expect-differences.next-button=AccesaÈi Servicii Onion
+# onboarding.tour-tor-expect-differences.next-button=Go to Onion Services
 
 onboarding.tour-tor-onion-services=Servicii Onion
 onboarding.tour-tor-onion-services.title=Fii extra protejat.
 onboarding.tour-tor-onion-services.description=Serviciile Onion sunt site-uri 
a cÄror adresÄ se terminÄ cu '.onion', ce oferÄ extra protecÈie atÃ¢t 
celor care le publicÄ cÃ¢t Èi celor care le viziteazÄ, Èi care inclu

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

2019-12-09 Thread translation

commit 82d80d2722bd0746281810860e50ffa6d6b5adc4
Author: Translation commit bot 
Date:   Mon Dec 9 12:21:37 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties_completed
---
 ro/torbutton.properties | 48 +---
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/ro/torbutton.properties b/ro/torbutton.properties
index 670c4fd94e..8b2d32988f 100644
--- a/ro/torbutton.properties
+++ b/ro/torbutton.properties
@@ -24,37 +24,47 @@ torbutton.popup.dontask = DescarcÄ fiÅiere automat de 
acum Ã®nainte
 torbutton.popup.no_newnym = Torbutton nu Ã®Èi poate oferi o identitate nouÄ, 
deoarece nu are acces la Tor Control Port.\n\nEÈti sigur cÄ ruleazÄ Tor 
Browser Bundle?
 torbutton.security_settings.menu.title = SetÄri de Securitate
 torbutton.title.prompt_torbrowser = InformaÈii importante Torbutton
-torbutton.popup.prompt_torbrowser = Torbutton funcÈioneazÄ acum Ã®n mod 
diferit: nu mai poate fi Ã®nchis.\n\nAm fÄcut aceastÄ schimbare deoarece 
Torbutton nu poate fi folosit Ã®n siguranÈÄ Ã®ntr-un browser care e utilizat 
Èi pentru navigare non-Tor. Erau prea multe buguri pe care nu le puteam 
remedia Ã®n alt fel.\n\nDacÄ doriÈi sÄ continuaÈi sÄ folosiÈi Firefox 
normal, ar trebui sÄ dezinstalaÈi Torbutton Èi sÄ descÄrcaÈi Tor Browser 
Bundle. ProprietÄÈile de navigare privatÄ ale Tor Browser sunt deasemenea 
superioare celor ale Firefox normal, chiar Èi atunci cÃ¢nd Firefox este 
folosit cu Torbutton.\n\nPentru a elimina Torbutton, accesaÈi 
Unelte->Suplimente->Extensii Èi faceÈi click pe butonul EliminÄ / Remove de 
lÃ¢ngÄ Torbutton.
-torbutton.popup.short_torbrowser = InformaÈie Torbutton 
importantÄ!\n\nTorbutton este acum permanent activat.\n\nFaceÈi click pe 
Torbutton pentru mai multe informaÈii.
+# torbutton.popup.prompt_torbrowser = Torbutton works differently now: you 
can't turn it off any more.\n\nWe made this change because it isn't safe to use 
Torbutton in a browser that's also used for non-Tor browsing. There were too 
many bugs there that we couldn't fix any other way.\n\nIf you want to keep 
using Firefox normally, you should uninstall Torbutton and download Tor Browser 
Bundle. The privacy properties of Tor Browser are also superior to those of 
normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove 
Torbutton, go to Tools->Addons->Extensions and then click the Remove button 
next to Torbutton.
+# torbutton.popup.short_torbrowser = Important Torbutton 
Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for 
more information.
 
-torbutton.popup.confirm_plugins = Plugin-urile cum ar fi "Flash" Ã®Èi pot 
afecta intimitatea Èi anonimitatea.\n\nDeasemenea ele pot ocoli Tor Èi Ã®Èi 
pot dezvÄlui locaÈia curentÄ Èi adresa IP.\n\nSigur doriÈi sÄ activaÈi 
plugin-urile?\n\n
-torbutton.popup.never_ask_again = Nu mai Ã®ntreba din nou
-torbutton.popup.confirm_newnym = Navigatorul web Tor va Ã®nchide toate 
ferestrele Èi tab-urile. Toate sesiunile se vor pierde.\n\nDoreÈti sÄ 
reiniÈializezi Navigatorul Tot acum pentru a-Èi putea reseta identitatea?\n\n
+# torbutton.popup.confirm_plugins = Plugins such as Flash can harm your 
privacy and anonymity.\n\nThey can also bypass Tor to reveal your current 
location and IP address.\n\nAre you sure you want to enable plugins?\n\n
+# torbutton.popup.never_ask_again = Never ask me again
+# torbutton.popup.confirm_newnym = Tor Browser will close all windows and 
tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset 
your identity?\n\n
 
-torbutton.maximize_warning = Maximizarea navigatorului Tor poate permite 
anumitor site-uri sÄ determine mÄrimea monitorului tÄu, care poate fi 
folositÄ pentru a te urmÄri. ÃÈi recomandÄm sÄ foloseÈti fereastra 
Navigatorului Tor la dimensiunea originalÄ implicitÄ.  
+# torbutton.maximize_warning = Maximizing Tor Browser can allow websites to 
determine your monitor size, which can be used to track you. We recommend that 
you leave Tor Browser windows in their original default size.
 
 # Canvas permission prompt. Strings are kept here for ease of translation.
-canvas.siteprompt=Acest site web (%S) Ã®ncearcÄ sÄ extragÄ datele imaginii 
HTML5, care pot fi utilizate la identificarea Ã®n mod unic a computerului 
dumneavoastrÄ.\n\nAr trebui ca navigatorul Tor sÄ permitÄ acestui site web 
sÄ extragÄ datele imaginii HTML5?
-canvas.notNow=Nu acum
-canvas.notNowAccessKey=N
-canvas.allow=Permite Ã®n viitor
-canvas.allowAccessKey=A
-canvas.never=NiciodatÄ pentru acest site (recomandat)
-canvas.neverAccessKey=e
+# canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image 
data, which may be used to uniquely identify your computer.\n\nShould Tor 
Browser allow this website to extract HTML5 canvas image data?
+# canvas.notNow=Not Now
+# canvas.notNowAccessKey=N
+# canvas.allow=Allow in the future

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

2019-12-09 Thread translation

commit b8af4bd1deca7c19f8a13af752f66c1e327e6582
Author: Translation commit bot 
Date:   Mon Dec 9 12:21:31 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
---
 ro/torbutton.properties | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ro/torbutton.properties b/ro/torbutton.properties
index 259825e218..77da0e24cc 100644
--- a/ro/torbutton.properties
+++ b/ro/torbutton.properties
@@ -61,10 +61,10 @@ pageInfo_OnionEncryption=Conexiune CriptatÄ (Serviciu 
Onion)
 
 # Onion services strings.  Strings are kept here for ease of translation.
 # LOCALIZATION NOTE: %S will be replaced with the .onion address.
-onionServices.clientAuthMissing=Tor onion service missing client authorization
-onionServices.authPrompt.description=%S is requesting your private key.
-onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion 
service
+onionServices.clientAuthMissing=Serviciul onion Tor nu are autorizaÈia 
clientului
+onionServices.authPrompt.description=%S solicitÄ cheia dvs. privatÄ.
+onionServices.authPrompt.keyPlaceholder=IntroduceÈi cheia privatÄ pentru 
acest serviciu de ceapÄ
 onionServices.authPrompt.done=Gata
 onionServices.authPrompt.doneAccessKey=d
-onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 
characters or 44 base64 characters)
-onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key
+onionServices.authPrompt.invalidKey=VÄ rugÄm sÄ introduceÈi o cheie 
validÄ (52 de caractere base32 sau 44 de caractere base64)
+onionServices.authPrompt.failedToSetKey=Imposibil de configurat Tor cu cheia 
dvs.

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

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

2019-12-09 Thread translation

commit 18659aadc6a0a52fcd31f000b8104339dab3f7a2
Author: Translation commit bot 
Date:   Mon Dec 9 12:20:18 2019 +

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

diff --git a/contents+ro.po b/contents+ro.po
index 8824de7c3d..2307047f62 100644
--- a/contents+ro.po
+++ b/contents+ro.po
@@ -5,6 +5,7 @@
 # Iasmina Gruicin , 2019
 # eduard pintilie , 2019
 # Emma Peel, 2019
+# polearnik , 2019
 # 
 msgid ""
 msgstr ""
@@ -12,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-29 10:58+CET\n"
 "PO-Revision-Date: 2018-11-14 12:31+\n"
-"Last-Translator: Emma Peel, 2019\n"
+"Last-Translator: polearnik , 2019\n"
 "Language-Team: Romanian (https://www.transifex.com/otf/teams/1519/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1653,6 +1654,9 @@ msgid ""
 " fonts and math symbols are disabled; audio and video (HTML5 media) are "
 "click-to-play."
 msgstr ""
+"* JavaScript este dezactivat pe toate site-urile non- [HTTPS] (/ conexiuni "
+"sigure); unele fonturi Èi simboluri matematice sunt dezactivate; audio Èi "
+"video (HTML5 media) sunt clicuri pentru a reda."
 
 #: https//tb-manual.torproject.org/security-settings/
 #: (content/security-settings/contents+en.lrtopic.body)

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

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

2019-12-09 Thread translation

commit f14aec3e435680f622fdc43b0a4536722fc781fa
Author: Translation commit bot 
Date:   Mon Dec 9 12:18:56 2019 +

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

diff --git a/ro.po b/ro.po
index e8b4955889..a6447f4b7c 100644
--- a/ro.po
+++ b/ro.po
@@ -9,13 +9,14 @@
 # Isus Satanescu , 2014
 # laura berindei , 2014
 # kyx , 2016
+# polearnik , 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: Tails developers \n"
 "POT-Creation-Date: 2019-11-28 16:51+0100\n"
-"PO-Revision-Date: 2019-11-29 03:10+\n"
-"Last-Translator: carolyn \n"
+"PO-Revision-Date: 2019-12-09 11:53+\n"
+"Last-Translator: polearnik \n"
 "Language-Team: Romanian 
(http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -49,7 +50,7 @@ msgstr "pentru aceastÄ versiune nu existÄ actualizare 
automatÄ pe website"
 
 #: ../lib/Tails/IUK/Frontend.pm:242
 msgid "your device was not created using a USB image or Tails Installer"
-msgstr ""
+msgstr "dispozitivul dvs. nu a fost creat folosind o imagine USB sau Tails 
Installer"
 
 #: ../lib/Tails/IUK/Frontend.pm:247
 msgid "Tails was started from a DVD or a read-only device"
@@ -137,7 +138,7 @@ msgid ""
 "It is not possible to automatically upgrade your device to this new version: 
%{explanation}s.\n"
 "\n"
 "To learn how to do a manual upgrade, go to 
https://tails.boum.org/doc/upgrade/#manual";
-msgstr ""
+msgstr "Ar trebui sÄ efectuaÈi o actualizare manualÄ la% {nume} s% 
{versiune}.\n\nPentru mai multe informaÈii despre aceastÄ nouÄ versiune, 
accesaÈi% {details_url} s\n\nNu este posibil sÄ actualizaÈi automat 
dispozitivul la aceastÄ nouÄ versiune:% {explicaÈie} s.\n\nPentru a afla cum 
sÄ faceÈi o actualizare manualÄ, accesaÈi 
https://tails.boum.org/doc/upgrade/#manual";
 
 #: ../lib/Tails/IUK/Frontend.pm:412
 msgid "New version available"

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

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

2019-12-09 Thread translation

commit 292e5a99afdb3034cb88ff2f85994e4d2d1fe8c9
Author: Translation commit bot 
Date:   Mon Dec 9 12:18:48 2019 +

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

diff --git a/ro.po b/ro.po
index 46b1d81175..86b2f3978d 100644
--- a/ro.po
+++ b/ro.po
@@ -16,6 +16,7 @@
 # kyx , 2016
 # Nicola Radu , 2014
 # Paul Ionut Anton, 2014
+# polearnik , 2019
 # Roxana Ardelean (Ene) , 2014
 # titus , 2014-2015
 # tudor isopescu , 2015
@@ -26,8 +27,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-28 17:02+0100\n"
-"PO-Revision-Date: 2019-11-29 02:19+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-12-09 11:53+\n"
+"Last-Translator: polearnik \n"
 "Language-Team: Romanian 
(http://www.transifex.com/otf/torproject/language/ro/)\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/snowflakeaddon-messages.json] https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json

2019-12-09 Thread translation

commit c2c34077a19631761afab352af10b9b209954abf
Author: Translation commit bot 
Date:   Mon Dec 9 12:17:23 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=snowflakeaddon-messages.json
---
 ro/messages.json | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ro/messages.json b/ro/messages.json
index fb149dfd7c..b521a080f1 100644
--- a/ro/messages.json
+++ b/ro/messages.json
@@ -33,7 +33,7 @@
 "message": "Snowflake este un sistem pentru a Ã®nvinge cenzura pe 
internet. Oamenii care sunt pentru a Ã®nvinge cenzura pe internet. Oameni care 
sunt cenzuraÈi pot folosi Snowflake, pentru a accesa Internetul. Conexiunea 
lor trece prin proxy Snowflake, care cunt rulate de voluntari. Pentru 
informaÈii detaliate despre modul de lucru al Snowflake accesaÈi https://trac.torproject.org/projects/tor/wiki/doc/Snowflake/\"; 
data-msgid=\"__MSG_docWiki__\">documentaÈia wiki."
   },
   "docWiki": {
-"message": "documentation wiki"
+"message": "documentare wiki"
   },
   "browser": {
 "message": "Bowser"
@@ -48,13 +48,13 @@
 "message": "DacÄ accesul dvs. la Internet nu este 
cenzurat, ar trebui sÄ instalaÈi extensia Snowflake pentru a ajuta 
utilizatorii cenzuraÈi din reÈea. Nu trebuie sÄ vÄ faceÈi griji despre 
persoanele care acceseazÄ. Internetul prin proxy-ul dvs. Adresa  IP de 
navigare pe Internet se va potrivi cu nodul lor de ieÈire, nu cu al dvs."
   },
   "installFirefox": {
-"message": "Install in Firefox"
+"message": "InstalaÈi Ã®n Firefox"
   },
   "installChrome": {
-"message": "Install in Chrome"
+"message": "InstalaÈi Ã®n Chrome"
   },
   "reportingBugs": {
-"message": "Reporting Bugs"
+"message": "Raportarea erorilor"
   },
   "fileBug": {
 "message": "DacÄ apar probleme cu Snowflake ca Èi client sau proxy, vÄ 
rugÄm sÄ ne trimiteÈi eroarea,"
@@ -69,7 +69,7 @@
 "message": "VÄ rugÄm ca Ã®n bilet sÄ descrieÈi problenma cÃ¢t mai 
detaliat Èi dacÄ este posibil, sÄ includeÈi Èi mesajul din fiÈierul log 
care ne poate ajuta sÄ reproducem acea eroare. AdÄugaÈi cuvintele cheie 
snowflake-webextension sau snowflake-client pentru ca sÄ 
Ã®nÈelegem care parte din sistemul Snowflake are probleme."
   },
   "embed": {
-"message": "Embed"
+"message": "Ãncorporat"
   },
   "possible": {
 "message": "Acum este posibil sÄ Ã®ncorporaÈi ecusonul Snowflake pe 
orice site web:"

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

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

2019-12-09 Thread translation

commit 4a360404fe562143466607dbde0749308f39f0cc
Author: Translation commit bot 
Date:   Mon Dec 9 12:17:33 2019 +

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

diff --git a/ro.po b/ro.po
index c044b981b9..b73d0c8cb9 100644
--- a/ro.po
+++ b/ro.po
@@ -16,6 +16,7 @@
 # kyx , 2016
 # Nicola Radu , 2014
 # Paul Ionut Anton, 2014
+# polearnik , 2019
 # Roxana Ardelean (Ene) , 2014
 # titus , 2014-2015
 # tudor isopescu , 2015
@@ -26,8 +27,8 @@ msgstr ""
 "Project-Id-Version: Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2019-11-28 17:02+0100\n"
-"PO-Revision-Date: 2019-11-29 02:19+\n"
-"Last-Translator: erinm\n"
+"PO-Revision-Date: 2019-12-09 11:53+\n"
+"Last-Translator: polearnik \n"
 "Language-Team: Romanian 
(http://www.transifex.com/otf/torproject/language/ro/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -389,7 +390,7 @@ msgstr "PuteÈi instala {packages} automat la pornirea 
Tails"
 
 #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:345
 msgid "To do so, you need to run Tails from a USB stick."
-msgstr ""
+msgstr "Pentru a face acest lucru, trebuie sÄ rulaÈi Tails de pe un stick 
USB."
 
 #. Translators: Don't translate {packages}, it's a placeholder and will be
 #. replaced.
@@ -497,7 +498,7 @@ msgstr "Pentru a face acest lucru, creaÈi niÈte stocare 
persistentÄ Èi insta
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:205
 msgid ""
 "To do so, install Tails on a USB stick and create a persistent storage."
-msgstr ""
+msgstr "Pentru a face acest lucru, instalaÈi Tails pe un stick USB Èi 
creaÈi un spaÈiu de stocare persistent."
 
 #: 
config/chroot_local-includes/usr/local/bin/tails-additional-software-config:251
 msgid "[package not available]"

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

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

2019-12-09 Thread translation

commit 9aea630e1d4a8a68d570c129f60462c34c16b57d
Author: Translation commit bot 
Date:   Mon Dec 9 12:16:19 2019 +


https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere_completed
---
 ro/https-everywhere.dtd | 29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/ro/https-everywhere.dtd b/ro/https-everywhere.dtd
index c09a437315..34a7e66e48 100644
--- a/ro/https-everywhere.dtd
+++ b/ro/https-everywhere.dtd
@@ -7,19 +7,19 @@
 
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
 
 
-
+
 
 
 
@@ -36,7 +36,7 @@
 
 
 
-
+
 
 
 
@@ -45,10 +45,11 @@
 
 
 
+
 
-
-
-
+
+
+
 
 
 

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

1 2 >

1 - 100 of 112 matches

Mail list logo