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

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

19 Dec '19

commit 7c2ea9f47fbc8c68c2c78be24f3d8b96d14b5ec9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 19 13:45:20 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- en_GB/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po index 5343f926bb..dd57921e8e 100644 --- a/en_GB/LC_MESSAGES/bridgedb.po +++ b/en_GB/LC_MESSAGES/bridgedb.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the bridgedb project. # # Translators: -# Andi Chandler <andi(a)gowling.com>, 2014-2015 +# Andi Chandler <andi(a)gowling.com>, 2014-2015,2019 # Richard Shaylor <rshaylor(a)me.com>, 2014 # ronnietse <tseronnie(a)ymail.com>, 2014 msgid "" @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-10-22 01:44+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-12-19 13:17+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -291,7 +291,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s or %s." -msgstr "" +msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -304,7 +304,7 @@ msgstr "My bridges don't work! I need help!" #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." -msgstr "" +msgstr "If your Tor Browser cannot connect, please take a look at the %s and our %s." #: bridgedb/strings.py:123 msgid "Here are your bridge lines:"

1 0

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

19 Dec '19

commit 7f90bb98ebd6a9d9a220aa5de553032a73603ea7 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 19 13:45:12 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=abouttor-homepage_c… --- en-GB/aboutTor.dtd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/en-GB/aboutTor.dtd b/en-GB/aboutTor.dtd index 0b0da0607a..65a2d38e37 100644 --- a/en-GB/aboutTor.dtd +++ b/en-GB/aboutTor.dtd @@ -30,3 +30,8 @@ <!ENTITY aboutTor.newsletter.link_text ""> <!ENTITY aboutTor.donationBanner.line2e ""> <!ENTITY aboutTor.donationBanner.buttonA ""> + + +<!ENTITY aboutTor.ey2019.mozilla ""> +<!ENTITY aboutTor.ey2019.tracking ""> +<!ENTITY aboutTor.ey2019.takeback "">

1 0

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

19 Dec '19

commit f2ecb318553495aad83be5ea3d0b4839f4d8b6b4 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 19 13:24:59 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+en_GB.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+en_GB.po b/contents+en_GB.po index d46a2046d3..7ef47b9f21 100644 --- a/contents+en_GB.po +++ b/contents+en_GB.po @@ -1,7 +1,7 @@ # Translators: # de2286e7b84b28568a252c2543472b1e, 2019 -# Andi Chandler <andi(a)gowling.com>, 2019 # erinm, 2019 +# Andi Chandler <andi(a)gowling.com>, 2019 # msgid "" msgstr "" @@ -9,7 +9,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+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>, 2019\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/otf/teams/1519/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -649,7 +649,7 @@ msgstr "" #: lego/templates/banner.html:10 templates/banner.html:10 msgid "Tracking, surveillance, and censorship are widespread online." -msgstr "" +msgstr "Tracking, surveillance, and censorship are widespread online." #: lego/templates/banner.html:14 templates/banner.html:14 msgid "TAKE BACK THE INTERNET WITH TOR"

1 0

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

19 Dec '19

commit d68f6b05a88a5010befd098c6747c0e0a010a921 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 19 13:21:23 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+en-GB.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+en-GB.po b/contents+en-GB.po index 6fdc5d3e2a..ee7425e3f4 100644 --- a/contents+en-GB.po +++ b/contents+en-GB.po @@ -1,6 +1,6 @@ # Translators: -# Andi Chandler <andi(a)gowling.com>, 2019 # erinm, 2019 +# Andi Chandler <andi(a)gowling.com>, 2019 # msgid "" msgstr "" @@ -8,7 +8,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-11-29 10:58+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: erinm, 2019\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>, 2019\n" "Language-Team: English (United Kingdom) (https://www.transifex.com/otf/teams/1519/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2048,7 +2048,7 @@ msgstr "" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Tracking, surveillance, and censorship are widespread online." -msgstr "" +msgstr "Tracking, surveillance, and censorship are widespread online." #: lego/templates/banner.html:20 templates/banner.html:20 msgid "TAKE BACK THE INTERNET WITH TOR"

1 0

[translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
by translation＠torproject.org 19 Dec '19

19 Dec '19

commit 7bf5be26f16df41fdd3ccf6423d334cf90dc9f98 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 19 13:20:45 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- en_GB/en_GB.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/en_GB/en_GB.po b/en_GB/en_GB.po index 01e854d269..2b44f98783 100644 --- a/en_GB/en_GB.po +++ b/en_GB/en_GB.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2019-10-07 08:43+0200\n" -"PO-Revision-Date: 2019-10-07 13:48+0000\n" -"Last-Translator: erinm\n" +"POT-Creation-Date: 2019-10-21 09:06+0200\n" +"PO-Revision-Date: 2019-12-19 13:16+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -85,7 +85,7 @@ msgstr "Device %s is optical." #: ../lib/Tails/Persistence/Setup.pm:444 #, perl-format msgid "Device %s was not created using a USB image or Tails Installer." -msgstr "" +msgstr "Device %s was not created using a USB image or Tails Installer." #: ../lib/Tails/Persistence/Setup.pm:688 msgid "Persistence wizard - Finished"

1 0

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

19 Dec '19

commit 5063d46d95f5ea9ad95398ab5af0c7297a2882a3 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 19 13:19:25 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- en_GB.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en_GB.po b/en_GB.po index 3054c3a06a..83c2d017e2 100644 --- a/en_GB.po +++ b/en_GB.po @@ -12,8 +12,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+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-12-19 13:17+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

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

19 Dec '19

commit b01a6e7fe3a6dbe95bb119ab0db8b6b517e32a40 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 19 13:17:30 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- en_GB.po | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/en_GB.po b/en_GB.po index 914d1f947b..1f3e694b8e 100644 --- a/en_GB.po +++ b/en_GB.po @@ -12,8 +12,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+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-12-19 13:17+0000\n" +"Last-Translator: Andi Chandler <andi(a)gowling.com>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,7 +83,7 @@ msgstr "Persistence is disabled for Electrum" msgid "" "When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\n" "It is strongly recommended to only run Electrum when its persistence feature is activated." -msgstr "" +msgstr "When you reboot Tails, all of Electrum's data will be lost, including your Bitcoin wallet.\nIt is strongly recommended to only run Electrum when its persistence feature is activated." #: config/chroot_local-includes/usr/local/bin/electrum:65 msgid "Do you want to start Electrum anyway?" @@ -234,7 +234,7 @@ msgid "" "${filename}\n" "\n" "Renaming it to keepassx.kdbx would allow KeePassXC to open it automatically in the future." -msgstr "" +msgstr "<big>Do you want to rename your KeePassXC database?</big>\n\nYou have a KeePassXC database in your Persistent folder:\n\n${filename}\n\nRenaming it to keepassx.kdbx would allow KeePassXC to open it automatically in the future." #: config/chroot_local-includes/usr/local/bin/keepassxc:23 msgid "Rename" @@ -375,7 +375,7 @@ msgstr "You could install {packages} automatically when starting 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 "To do so, you need to run Tails from a USB stick." #. Translators: Don't translate {packages}, it's a placeholder and will be #. replaced. @@ -483,7 +483,7 @@ msgstr "To do so, create a persistent storage and install some software using <a #: 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 "To do so, install Tails on a USB stick and create a persistent storage." #: config/chroot_local-includes/usr/local/bin/tails-additional-software-config:251 msgid "[package not available]" @@ -697,7 +697,7 @@ msgstr "Couldn't unlock volume {volume_name}:\n{error_message}" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:336 msgid "One or more applications are keeping the volume busy." -msgstr "" +msgstr "One or more applications are keeping the volume busy." #. Translators: Don't translate {volume_name} or {error_message}, #. they are placeholder and will be replaced. @@ -706,11 +706,11 @@ msgstr "" msgid "" "Couldn't lock volume {volume_name}:\n" "{error_message}" -msgstr "" +msgstr "Couldn't lock volume {volume_name}:\n{error_message}" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume.py:344 msgid "Locking the volume failed" -msgstr "" +msgstr "Locking the volume failed" #: config/chroot_local-includes/usr/lib/python3/dist-packages/unlock_veracrypt_volumes/volume_list.py:83 msgid "No file containers added" @@ -848,11 +848,11 @@ msgstr "Tails documentation" #: ../config/chroot_local-includes/usr/share/applications/root-terminal.desktop.in.h:1 msgid "Root Terminal" -msgstr "" +msgstr "Root Terminal" #: ../config/chroot_local-includes/usr/share/applications/root-terminal.desktop.in.h:2 msgid "Opens a terminal as the root user, using gksu to ask for the password" -msgstr "" +msgstr "Opens a terminal as the root user, using gksu to ask for the password" #: ../config/chroot_local-includes/usr/share/applications/tails-documentation.desktop.in.h:2 msgid "Learn how to use Tails"

1 0

[tor/master] Allow struct_magic to be disabled.
by nickm＠torproject.org 19 Dec '19

19 Dec '19

commit 419ba97df5bd168bf773478270c0043f20328e15 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 15 18:42:01 2019 -0500 Allow struct_magic to be disabled. When a subsystem is disabled, there will be no corresponding object allocated, and no magic numbers on it. --- src/lib/conf/conftypes.h | 3 +++ src/lib/confmgt/structvar.c | 22 ++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index 44171068a..52f9fceb2 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -131,6 +131,9 @@ typedef struct struct_member_t { * * These 'magic numbers' are 32-bit values used to tag objects to make sure * that they have the correct type. + * + * If all fields in this structure are zero or 0, the magic-number check is + * not performed. */ typedef struct struct_magic_decl_t { /** The name of the structure */ diff --git a/src/lib/confmgt/structvar.c b/src/lib/confmgt/structvar.c index de678d18c..a2411477d 100644 --- a/src/lib/confmgt/structvar.c +++ b/src/lib/confmgt/structvar.c @@ -30,13 +30,28 @@ #include <stddef.h> /** + * Return true iff all fields on decl are NULL or 0, indicating that + * there is no object or no magic number to check. + **/ +static inline bool +magic_is_null(const struct_magic_decl_t *decl) +{ + return decl->typename == NULL && + decl->magic_offset == 0 && + decl->magic_val == 0; +} + +/** * Set the 'magic number' on object to correspond to decl. **/ void struct_set_magic(void *object, const struct_magic_decl_t *decl) { - tor_assert(object); tor_assert(decl); + if (magic_is_null(decl)) + return; + + tor_assert(object); uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset); *ptr = decl->magic_val; } @@ -47,8 +62,11 @@ struct_set_magic(void *object, const struct_magic_decl_t *decl) void struct_check_magic(const void *object, const struct_magic_decl_t *decl) { - tor_assert(object); tor_assert(decl); + if (magic_is_null(decl)) + return; + + tor_assert(object); const uint32_t *ptr = STRUCT_VAR_P(object, decl->magic_offset); tor_assertf(*ptr == decl->magic_val,

1 0

[tor/master] Add torint.h include to confdecl.h.
by nickm＠torproject.org 19 Dec '19

19 Dec '19

commit 1d0ccda5955957c6c09a081502b315ba21c7c62e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 15 11:46:05 2019 -0500 Add torint.h include to confdecl.h. This change allows other modules to include confdecl.h without having first to include integer types they might not even use. --- src/lib/conf/confdecl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/conf/confdecl.h b/src/lib/conf/confdecl.h index 294a1e717..064ab324f 100644 --- a/src/lib/conf/confdecl.h +++ b/src/lib/conf/confdecl.h @@ -51,6 +51,7 @@ #undef CONF_CONTEXT #include "lib/cc/tokpaste.h" +#include "lib/cc/torint.h" /** * Begin the definition of a configuration object called `name`.

1 0

[tor/master] Support a flag to indicate that a config var is disabled
by nickm＠torproject.org 19 Dec '19

19 Dec '19

commit 9082a6db3f31c768ba862ed22f0824e99b4e0e22 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Dec 15 18:40:12 2019 -0500 Support a flag to indicate that a config var is disabled Like "obsolete" variables, these variables produce a warning when you try to set them, but the warning says that the relevant module doesn't have support. The confdecl macros now have a CONF_CONTEXT that you can define to make all the modules in a given table disabled. --- src/lib/conf/confdecl.h | 22 ++++++++++++++++++++++ src/lib/conf/conftypes.h | 12 ++++++++++++ src/lib/confmgt/confmgt.c | 3 +++ 3 files changed, 37 insertions(+) diff --git a/src/lib/conf/confdecl.h b/src/lib/conf/confdecl.h index 064ab324f..723aea187 100644 --- a/src/lib/conf/confdecl.h +++ b/src/lib/conf/confdecl.h @@ -135,6 +135,28 @@ .initvalue = initval \ }, /**@}*/ + +/* @defgroup STUB_TABLE_MACROS Internal macros: stub table declarations, + * for use when a module is disabled. + * Implementation helpers: the regular confdecl macros expand to these + * when CONF_CONTEXT is defined to LL_TABLE. Don't use them directly. + * @{*/ +#define BEGIN_CONF_STRUCT__STUB_TABLE(structname) \ + static const config_var_t structname##_vars[] = { +#define END_CONF_STRUCT__STUB_TABLE(structname) \ + { .member = { .name = NULL } } \ + }; +#define CONF_VAR__STUB_TABLE(varname, vartype, varflags, initval) \ + { \ + .member = \ + { .name = #varname, \ + .type = CONFIG_TYPE_IGNORE, \ + .offset = -1, \ + }, \ + .flags = CFLG_GROUP_DISABLED, \ + }, +/**@}*/ + #endif /* !defined(COCCI) */ /** Type aliases for the "commonly used" configuration types. diff --git a/src/lib/conf/conftypes.h b/src/lib/conf/conftypes.h index 19ea99731..44171068a 100644 --- a/src/lib/conf/conftypes.h +++ b/src/lib/conf/conftypes.h @@ -199,6 +199,11 @@ typedef struct struct_magic_decl_t { * whenever the user tries to use it. **/ #define CFLG_WARN_OBSOLETE (1u<<7) +/** + * Flag to indicate that we should warn that an option applies only to + * a disabled module, whenever the user tries to use it. + **/ +#define CFLG_WARN_DISABLED (1u<<8) /** * A group of flags that should be set on all obsolete options and types. @@ -207,6 +212,13 @@ typedef struct struct_magic_decl_t { (CFLG_NOCOPY|CFLG_NOCMP|CFLG_NODUMP|CFLG_NOSET|CFLG_NOLIST|\ CFLG_WARN_OBSOLETE) +/** + * A group of fflags that should be set on all disabled options. + **/ +#define CFLG_GROUP_DISABLED \ + (CFLG_NOCOPY|CFLG_NOCMP|CFLG_NODUMP|CFLG_NOSET|CFLG_NOLIST|\ + CFLG_WARN_DISABLED) + /** A variable allowed in the configuration file or on the command line. */ typedef struct config_var_t { struct_member_t member; /** A struct member corresponding to this diff --git a/src/lib/confmgt/confmgt.c b/src/lib/confmgt/confmgt.c index c72efa847..eaa4468d5 100644 --- a/src/lib/confmgt/confmgt.c +++ b/src/lib/confmgt/confmgt.c @@ -660,6 +660,9 @@ config_assign_value(const config_mgr_t *mgr, void *options, if (config_var_has_flag(var->cvar, CFLG_WARN_OBSOLETE)) { log_warn(LD_GENERAL, "Skipping obsolete configuration option \"%s\".", var->cvar->member.name); + } else if (config_var_has_flag(var->cvar, CFLG_WARN_DISABLED)) { + log_warn(LD_GENERAL, "This copy of Tor was built without support for " + "the option \"%s\". Skipping.", var->cvar->member.name); } return struct_var_kvassign(object, c, msg, &var->cvar->member);

1 0