May 2021 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'ticket40374_046' into maint-0.4.6
by nickm＠torproject.org 10 May '21

10 May '21

commit 8851861ff087efe3ab95069952ab93108dbb6bf1 Merge: af6da4a36b 8d0d7a665a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 14:30:00 2021 -0400 Merge branch 'ticket40374_046' into maint-0.4.6 changes/ticket40374 | 4 ++++ src/feature/dirparse/parsecommon.c | 27 +++++---------------------- src/feature/dirparse/parsecommon.h | 1 - src/test/test_parsecommon.c | 7 ++----- 4 files changed, 11 insertions(+), 28 deletions(-)

1 0

[tor/master] Remove NEED_SKEY_1024 parsing.
by nickm＠torproject.org 10 May '21

10 May '21

commit 8d0d7a665a5f86caa5486308ce25ac1b1f7b52bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 23 15:55:51 2021 -0400 Remove NEED_SKEY_1024 parsing. Only v2 onion services needed this, and they are now gone. Closes #40374. --- changes/ticket40374 | 4 ++++ src/feature/dirparse/parsecommon.c | 27 +++++---------------------- src/feature/dirparse/parsecommon.h | 1 - src/test/test_parsecommon.c | 7 ++----- 4 files changed, 11 insertions(+), 28 deletions(-) diff --git a/changes/ticket40374 b/changes/ticket40374 new file mode 100644 index 0000000000..8b6e99b8af --- /dev/null +++ b/changes/ticket40374 @@ -0,0 +1,4 @@ + o Removed features: + - Remove unneeded code for parsing private keys in directory documents. + This code was only used for client authentication in v2 onion + services, which are now unsupported. Closes ticket 40374. diff --git a/src/feature/dirparse/parsecommon.c b/src/feature/dirparse/parsecommon.c index 2519071c8c..d7a6d65346 100644 --- a/src/feature/dirparse/parsecommon.c +++ b/src/feature/dirparse/parsecommon.c @@ -216,7 +216,6 @@ token_check_object(memarea_t *area, const char *kwd, } break; case NEED_KEY_1024: /* There must be a 1024-bit public key. */ - case NEED_SKEY_1024: /* There must be a 1024-bit private key. */ if (tok->key && crypto_pk_num_bits(tok->key) != PK_BYTES*8) { tor_snprintf(ebuf, sizeof(ebuf), "Wrong size on key for %s: %d bits", kwd, crypto_pk_num_bits(tok->key)); @@ -228,18 +227,11 @@ token_check_object(memarea_t *area, const char *kwd, tor_snprintf(ebuf, sizeof(ebuf), "Missing public key for %s", kwd); RET_ERR(ebuf); } - if (o_syn != NEED_SKEY_1024) { - if (crypto_pk_key_is_private(tok->key)) { - tor_snprintf(ebuf, sizeof(ebuf), - "Private key given for %s, which wants a public key", kwd); - RET_ERR(ebuf); - } - } else { /* o_syn == NEED_SKEY_1024 */ - if (!crypto_pk_key_is_private(tok->key)) { - tor_snprintf(ebuf, sizeof(ebuf), - "Public key given for %s, which wants a private key", kwd); - RET_ERR(ebuf); - } + + if (crypto_pk_key_is_private(tok->key)) { + tor_snprintf(ebuf, sizeof(ebuf), + "Private key given for %s, which wants a public key", kwd); + RET_ERR(ebuf); } break; case OBJ_OK: @@ -409,15 +401,6 @@ get_next_token(memarea_t *area, tok->key = crypto_pk_asn1_decode(tok->object_body, tok->object_size); if (! tok->key) RET_ERR("Couldn't parse public key."); - } else if (!strcmp(tok->object_type, "RSA PRIVATE KEY")) { /* private key */ - if (o_syn != NEED_SKEY_1024 && o_syn != OBJ_OK) { - RET_ERR("Unexpected private key."); - } - tok->key = crypto_pk_asn1_decode_private(tok->object_body, - tok->object_size, - 1024); - if (! tok->key) - RET_ERR("Couldn't parse private key."); } *s = eol; diff --git a/src/feature/dirparse/parsecommon.h b/src/feature/dirparse/parsecommon.h index 5de2bbe1b3..0f343e9c62 100644 --- a/src/feature/dirparse/parsecommon.h +++ b/src/feature/dirparse/parsecommon.h @@ -218,7 +218,6 @@ typedef struct directory_token_t { typedef enum { NO_OBJ, /**< No object, ever. */ NEED_OBJ, /**< Object is required. */ - NEED_SKEY_1024,/**< Object is required, and must be a 1024 bit private key */ NEED_KEY_1024, /**< Object is required, and must be a 1024 bit public key */ NEED_KEY, /**< Object is required, and must be a public key. */ OBJ_OK, /**< Object is optional. */ diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c index d270a430d8..b32840264e 100644 --- a/src/test/test_parsecommon.c +++ b/src/test/test_parsecommon.c @@ -326,18 +326,15 @@ test_parsecommon_get_next_token_parse_keys(void *arg) const char *end2 = str2 + strlen(str2); const char **s2 = (const char **)&str2; - token_rule_t rule2 = T01("client-key", C_CLIENT_KEY, NO_ARGS, - NEED_SKEY_1024); - + token_rule_t rule2 = T01("client-key", C_CLIENT_KEY, NO_ARGS, OBJ_OK); token2 = get_next_token(area, s2, end2, &rule2); tt_assert(token2); - tt_int_op(token2->tp, OP_EQ, C_CLIENT_KEY); tt_int_op(token2->n_args, OP_EQ, 0); tt_str_op(token2->object_type, OP_EQ, "RSA PRIVATE KEY"); tt_int_op(token2->object_size, OP_EQ, 608); tt_assert(token2->object_body); - tt_assert(token2->key); + tt_assert(token2->key == NULL); tt_assert(!token->error); done:

1 0

[tor/master] Merge branch 'maint-0.4.6'
by nickm＠torproject.org 10 May '21

10 May '21

commit d82970c8c316e70abf49b2e37f6e7ba3db32585b Merge: 6cc87bc269 8851861ff0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 14:30:09 2021 -0400 Merge branch 'maint-0.4.6' changes/ticket40374 | 4 ++++ src/feature/dirparse/parsecommon.c | 27 +++++---------------------- src/feature/dirparse/parsecommon.h | 1 - src/test/test_parsecommon.c | 7 ++----- 4 files changed, 11 insertions(+), 28 deletions(-)

1 0

[tor/release-0.4.6] Remove NEED_SKEY_1024 parsing.
by nickm＠torproject.org 10 May '21

10 May '21

commit 8d0d7a665a5f86caa5486308ce25ac1b1f7b52bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Apr 23 15:55:51 2021 -0400 Remove NEED_SKEY_1024 parsing. Only v2 onion services needed this, and they are now gone. Closes #40374. --- changes/ticket40374 | 4 ++++ src/feature/dirparse/parsecommon.c | 27 +++++---------------------- src/feature/dirparse/parsecommon.h | 1 - src/test/test_parsecommon.c | 7 ++----- 4 files changed, 11 insertions(+), 28 deletions(-) diff --git a/changes/ticket40374 b/changes/ticket40374 new file mode 100644 index 0000000000..8b6e99b8af --- /dev/null +++ b/changes/ticket40374 @@ -0,0 +1,4 @@ + o Removed features: + - Remove unneeded code for parsing private keys in directory documents. + This code was only used for client authentication in v2 onion + services, which are now unsupported. Closes ticket 40374. diff --git a/src/feature/dirparse/parsecommon.c b/src/feature/dirparse/parsecommon.c index 2519071c8c..d7a6d65346 100644 --- a/src/feature/dirparse/parsecommon.c +++ b/src/feature/dirparse/parsecommon.c @@ -216,7 +216,6 @@ token_check_object(memarea_t *area, const char *kwd, } break; case NEED_KEY_1024: /* There must be a 1024-bit public key. */ - case NEED_SKEY_1024: /* There must be a 1024-bit private key. */ if (tok->key && crypto_pk_num_bits(tok->key) != PK_BYTES*8) { tor_snprintf(ebuf, sizeof(ebuf), "Wrong size on key for %s: %d bits", kwd, crypto_pk_num_bits(tok->key)); @@ -228,18 +227,11 @@ token_check_object(memarea_t *area, const char *kwd, tor_snprintf(ebuf, sizeof(ebuf), "Missing public key for %s", kwd); RET_ERR(ebuf); } - if (o_syn != NEED_SKEY_1024) { - if (crypto_pk_key_is_private(tok->key)) { - tor_snprintf(ebuf, sizeof(ebuf), - "Private key given for %s, which wants a public key", kwd); - RET_ERR(ebuf); - } - } else { /* o_syn == NEED_SKEY_1024 */ - if (!crypto_pk_key_is_private(tok->key)) { - tor_snprintf(ebuf, sizeof(ebuf), - "Public key given for %s, which wants a private key", kwd); - RET_ERR(ebuf); - } + + if (crypto_pk_key_is_private(tok->key)) { + tor_snprintf(ebuf, sizeof(ebuf), + "Private key given for %s, which wants a public key", kwd); + RET_ERR(ebuf); } break; case OBJ_OK: @@ -409,15 +401,6 @@ get_next_token(memarea_t *area, tok->key = crypto_pk_asn1_decode(tok->object_body, tok->object_size); if (! tok->key) RET_ERR("Couldn't parse public key."); - } else if (!strcmp(tok->object_type, "RSA PRIVATE KEY")) { /* private key */ - if (o_syn != NEED_SKEY_1024 && o_syn != OBJ_OK) { - RET_ERR("Unexpected private key."); - } - tok->key = crypto_pk_asn1_decode_private(tok->object_body, - tok->object_size, - 1024); - if (! tok->key) - RET_ERR("Couldn't parse private key."); } *s = eol; diff --git a/src/feature/dirparse/parsecommon.h b/src/feature/dirparse/parsecommon.h index 5de2bbe1b3..0f343e9c62 100644 --- a/src/feature/dirparse/parsecommon.h +++ b/src/feature/dirparse/parsecommon.h @@ -218,7 +218,6 @@ typedef struct directory_token_t { typedef enum { NO_OBJ, /**< No object, ever. */ NEED_OBJ, /**< Object is required. */ - NEED_SKEY_1024,/**< Object is required, and must be a 1024 bit private key */ NEED_KEY_1024, /**< Object is required, and must be a 1024 bit public key */ NEED_KEY, /**< Object is required, and must be a public key. */ OBJ_OK, /**< Object is optional. */ diff --git a/src/test/test_parsecommon.c b/src/test/test_parsecommon.c index d270a430d8..b32840264e 100644 --- a/src/test/test_parsecommon.c +++ b/src/test/test_parsecommon.c @@ -326,18 +326,15 @@ test_parsecommon_get_next_token_parse_keys(void *arg) const char *end2 = str2 + strlen(str2); const char **s2 = (const char **)&str2; - token_rule_t rule2 = T01("client-key", C_CLIENT_KEY, NO_ARGS, - NEED_SKEY_1024); - + token_rule_t rule2 = T01("client-key", C_CLIENT_KEY, NO_ARGS, OBJ_OK); token2 = get_next_token(area, s2, end2, &rule2); tt_assert(token2); - tt_int_op(token2->tp, OP_EQ, C_CLIENT_KEY); tt_int_op(token2->n_args, OP_EQ, 0); tt_str_op(token2->object_type, OP_EQ, "RSA PRIVATE KEY"); tt_int_op(token2->object_size, OP_EQ, 608); tt_assert(token2->object_body); - tt_assert(token2->key); + tt_assert(token2->key == NULL); tt_assert(!token->error); done:

1 0

[tor/release-0.4.6] Merge branch 'ticket40374_046' into maint-0.4.6
by nickm＠torproject.org 10 May '21

10 May '21

commit 8851861ff087efe3ab95069952ab93108dbb6bf1 Merge: af6da4a36b 8d0d7a665a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 14:30:00 2021 -0400 Merge branch 'ticket40374_046' into maint-0.4.6 changes/ticket40374 | 4 ++++ src/feature/dirparse/parsecommon.c | 27 +++++---------------------- src/feature/dirparse/parsecommon.h | 1 - src/test/test_parsecommon.c | 7 ++----- 4 files changed, 11 insertions(+), 28 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by nickm＠torproject.org 10 May '21

10 May '21

commit 086f01e224a3118d83d8b5a14d5dc27d9af41d0a Merge: 9b9fa62f26 8851861ff0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 14:30:09 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 changes/ticket40374 | 4 ++++ src/feature/dirparse/parsecommon.c | 27 +++++---------------------- src/feature/dirparse/parsecommon.h | 1 - src/test/test_parsecommon.c | 7 ++----- 4 files changed, 11 insertions(+), 28 deletions(-)

1 0

[gettor-web/translations] test to see if it is possible to build the website in jenkins with this file committed
by emmapeel＠torproject.org 10 May '21

10 May '21

commit dd3940c2aab3c2ca69b86e2a86bb3e336520ed49 Author: emma peel <emma.peel(a)riseup.net> Date: Mon May 10 19:46:40 2021 +0200 test to see if it is possible to build the website in jenkins with this file committed --- i18n/contents.pot | 351 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 351 insertions(+) diff --git a/i18n/contents.pot b/i18n/contents.pot new file mode 100644 index 0000000..7176908 --- /dev/null +++ b/i18n/contents.pot @@ -0,0 +1,351 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-04-17 07:56+CET\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: en <LL(a)li.org>\n" +"Language: en\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: (dynamic) +msgid "Tor Project" +msgstr "" + +#: (dynamic) +msgid "Donate" +msgstr "" + +#: (dynamic) +msgid "Donate Now" +msgstr "" + +#: (dynamic) +msgid "Menu" +msgstr "" + +#: (dynamic) +msgid "About" +msgstr "" + +#: (dynamic) +msgid "Documentation" +msgstr "" + +#: (dynamic) +msgid "Support" +msgstr "" + +#: (dynamic) +msgid "Community" +msgstr "" + +#: (dynamic) +msgid "Blog" +msgstr "" + +#: (dynamic) +msgid "Download Tor Browser" +msgstr "" + +#: (dynamic) +msgid "" +"Download Tor Browser to experience real private browsing without tracking, " +"surveillance, or censorship." +msgstr "" + +#: (dynamic) +msgid "Our mission:" +msgstr "" + +#: (dynamic) +msgid "" +"To advance human rights and freedoms by creating and deploying free and open " +"source anonymity and privacy technologies, supporting their unrestricted " +"availability and use, and furthering their scientific and popular " +"understanding." +msgstr "" + +#: (dynamic) +msgid "Jobs" +msgstr "" + +#: (dynamic) +msgid "Contact" +msgstr "" + +#: (dynamic) +msgid "Press" +msgstr "" + +#: (dynamic) +msgid "Subscribe to our Newsletter" +msgstr "" + +#: (dynamic) +msgid "Get monthly updates and opportunities from the Tor Project:" +msgstr "" + +#: (dynamic) +msgid "Sign up" +msgstr "" + +#: (dynamic) +msgid "" +"Trademark, copyright notices, and rules for use by third parties can be " +"found in our %(link_to_faq)s" +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.title) +msgid "What is GetTor?" +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"GetTor is a service that provides alternative methods to download the Tor " +"Browser, especially for people living in places with high levels of " +"censorship, where access to Tor Project's website is restricted." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "# How does it work?" +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "The idea behind GetTor is very simple:" +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"- Step 1: Send a request to GetTor (gettor(a)torproject.org) specifying your " +"operating system (and your locale). Ex: \"windows es\"" +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"- Step 2: GetTor will send you back a reply with links to download Tor " +"Browser from our supported providers." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"- Step 3: Download Tor Browser from one of the providers. When done, check " +"the integrity of the downloaded files by verifying its signature." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "- Step 4: If required, get some bridges!" +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "## GetTor Responder on Twitter" +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "GetTor is currently not working on Twitter." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "## How to verify a digital signature" +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"Digital signature is a process ensuring that a certain package was generated " +"by its developers and has not been tampered with." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"In GetTor emails we provide a link to a file with the same name as the " +"package and the extension \".asc\". These .asc files are OpenPGP signatures." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"They allow you to verify the file you've downloaded is exactly the one that " +"we intended you to get." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"For example, `torbrowser-install-win64-8.5.4_en-US.exe` is accompanied by " +"`torbrowser-install-win64-8.5.4_en-US.exe.asc`." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"Check [how to verify a digital signature](https://support.torproject.org/tbb/" +"how-to-verify-signature/)." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "## How to get bridges" +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"Bridge relays are Tor relays that are not listed in the public Tor directory." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"That means that ISPs or governments trying to block access to the Tor " +"network can't simply block all bridges." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"Bridges are useful for Tor users under oppressive regimes, and for people " +"who want an extra layer of security because they're worried somebody will " +"recognize that they are contacting a public Tor relay IP address." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"When you start TorBrowser for the first time you will be asked if you want " +"to use bridges. To use pluggable transports, click 'Configure' in the Tor " +"Launcher window that appears when you first run Tor Browser." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"You can also configure pluggable transports while Tor Browser is running by " +"selecting 'Preferences' from the settings menu to the right of the address " +"bar. Once in Preferences, navigate to 'Tor Settings' from the menu on the " +"left of the screen." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"Select 'Tor is censored in my country,' then click 'Select a built-in " +"bridge.' Click on the drop-down menu and select the pluggable transport " +"you'd like to use." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "Click 'OK' to save your settings." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"If built-in bridges do not work, you can also select 'Request a bridge from " +"torproject.org'. This will require you solve a CAPTCHA and will " +"automatically populate your settings with one or more bridges." +msgstr "" + +#: https://gettor.torproject.org/ (content/contents+en.lr:page.body) +msgid "" +"Another way to get bridges is to send an email to bridges(a)torproject.org. " +"Please note that you must send the email using an address from one of the " +"following email providers: Riseup or Gmail." +msgstr "" + +#: lego/templates/banner.html:3 lego/templates/banner.html:5 +#: templates/banner.html:3 templates/banner.html:5 +msgid "Close banner" +msgstr "" + +#: lego/templates/banner.html:11 templates/banner.html:11 +msgid "Use a Mask, Use Tor." +msgstr "" + +#: lego/templates/banner.html:20 templates/banner.html:20 +msgid "Resist the surveillance pandemic." +msgstr "" + +#: lego/templates/banner.html:32 templates/banner.html:32 +msgid "Your donation will be matched by Friends of Tor, up to $100,000." +msgstr "" + +#: lego/templates/banner.html:40 templates/banner.html:40 +msgid "DONATE NOW" +msgstr "" + +#: lego/templates/search.html:5 +msgid "Search" +msgstr "" + +#: lego/templates/secure-connections.html:1 +msgid "" +"The following visualization shows what information is visible to " +"eavesdroppers with and without Tor Browser and HTTPS encryption:" +msgstr "" + +#: lego/templates/secure-connections.html:4 +msgid "" +"Click the “Tor” button to see what data is visible to observers when you're " +"using Tor. The button will turn green to indicate that Tor is on." +msgstr "" + +#: lego/templates/secure-connections.html:5 +msgid "" +"Click the “HTTPS” button to see what data is visible to observers when " +"you're using HTTPS. The button will turn green to indicate that HTTPS is on." +msgstr "" + +#: lego/templates/secure-connections.html:6 +msgid "" +"When both buttons are green, you see the data that is visible to observers " +"when you are using both tools." +msgstr "" + +#: lego/templates/secure-connections.html:7 +msgid "" +"When both buttons are grey, you see the data that is visible to observers " +"when you don't use either tool." +msgstr "" + +#: lego/templates/secure-connections.html:11 +msgid "HTTPS" +msgstr "" + +#: lego/templates/secure-connections.html:15 +#: lego/templates/secure-connections.html:65 +msgid "Tor" +msgstr "" + +#: lego/templates/secure-connections.html:32 +msgid "POTENTIALLY VISIBLE DATA" +msgstr "" + +#: lego/templates/secure-connections.html:37 +msgid "Site.com" +msgstr "" + +#: lego/templates/secure-connections.html:40 +msgid "The site being visited." +msgstr "" + +#: lego/templates/secure-connections.html:44 +msgid "user / pw" +msgstr "" + +#: lego/templates/secure-connections.html:47 +msgid "Username and password used for authentication." +msgstr "" + +#: lego/templates/secure-connections.html:51 +msgid "data" +msgstr "" + +#: lego/templates/secure-connections.html:54 +msgid "Data being transmitted." +msgstr "" + +#: lego/templates/secure-connections.html:58 +msgid "location" +msgstr "" + +#: lego/templates/secure-connections.html:61 +msgid "" +"Network location of the computer used to visit the website (the public IP " +"address)." +msgstr "" + +#: lego/templates/secure-connections.html:68 +msgid "Whether or not Tor is being used." +msgstr ""

1 0

[tor/maint-0.4.6] Update to 0.4.5.8-dev
by nickm＠torproject.org 10 May '21

10 May '21

commit ce8d6d143c7a33d6dccf0cc6181f9045091c9156 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 10:53:00 2021 -0400 Update to 0.4.5.8-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 621fbd1612..6d7cd1dd6a 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.5.8]) +AC_INIT([tor],[0.4.5.8-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # 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, ["2021-05-07"], # for 0.4.5.8 +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-05-10"], # for 0.4.5.8-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 580f189525..8276264392 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.5.8" +!define VERSION "0.4.5.8-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 06e6ad8ff7..716363261c 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.5.8" +#define VERSION "0.4.5.8-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] Bump to 0.4.6.3-rc-dev
by nickm＠torproject.org 10 May '21

10 May '21

commit af6da4a36b533bdba0d0c8b47d18d63529a48ceb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 10:53:39 2021 -0400 Bump to 0.4.6.3-rc-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 af9dfb8057..2cdff796b1 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.6.3-rc]) +AC_INIT([tor],[0.4.6.3-rc-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -18,7 +18,7 @@ AC_DEFINE_UNQUOTED([CONFIG_FLAGS], ["$configure_flags"], [Flags passed to config # 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, ["2021-05-07"], # for 0.4.6.3-rc +AC_DEFINE(APPROX_RELEASE_DATE, ["2021-05-10"], # for 0.4.6.3-rc-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 1c96ffbaad..b56afe7f08 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.6.3-rc" +!define VERSION "0.4.6.3-rc-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 8061261e18..2301f40fe0 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.6.3-rc" +#define VERSION "0.4.6.3-rc-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 10 May '21

10 May '21

commit 0db0c5c739dc06e1e4ec1b93f7e62922a1bacfc7 Merge: e4f2b52deb ce8d6d143c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 10 10:53:10 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 "ours" to avoid version bump.

1 0