[tor-commits] [tor/release-0.4.0] Fix a logic error in deciding whether to accept SessionGroup=

2019-08-11 Thread teor
commit 70b85358afd0a8d4291489f9e9f5654ab2d53371 Author: Nick Mathewson Date: Fri May 31 08:26:10 2019 -0400 Fix a logic error in deciding whether to accept SessionGroup= Fixes bug 22619; bugfix on 0.2.7.2-alpha --- changes/bug22619| 3 +++ src/app/config/config.c | 2 +-

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

2019-08-11 Thread teor
commit 13d2a46621cc28dacf8394521d7f8f5f458ab2dc Merge: 1d9e1da6e d253b31ce Author: teor Date: Mon Aug 12 13:09:36 2019 +1000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/29241_diagnostic | 4 changes/bug22619 | 3 +++ changes/bug29034

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5

2019-08-11 Thread teor
commit 8ea0903222610b75e8b0c58297148267a299af31 Merge: 6ed56ee4e 0ab4dc7ef Author: teor Date: Mon Aug 12 09:45:32 2019 +1000 Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5 changes/bug30316 | 4 src/feature/dirauth/dirvote.c | 7 +++ 2 files

[tor-commits] [tor/release-0.4.0] Do not warn about compatible OpenSSL upgrades

2019-08-11 Thread teor
commit 8c4e68438dd680b6b36f9b337b12d098b08db9d8 Author: Bernhard M. Wiedemann Date: Mon Apr 15 13:57:24 2019 +0200 Do not warn about compatible OpenSSL upgrades When releasing OpenSSL patch-level maintenance updates, we do not want to rebuild binaries using it. And since

[tor-commits] [tor/release-0.4.0] Use MAP_INHERIT_ZERO or MAP_INHERIT_NONE if available.

2019-08-11 Thread teor
commit 7971b3a5a6fc8b964339b144ae33faf9db1c3869 Author: Taylor R Campbell Date: Sat May 25 03:55:24 2019 + Use MAP_INHERIT_ZERO or MAP_INHERIT_NONE if available. Fixes assertion failure in tests on NetBSD: slow/prob_distr/stochastic_log_logistic: [forking] May 25

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5

2019-08-11 Thread teor
commit e5be039494745a3b0d101e422aa5793aaeac3567 Merge: f65f4b5c3 37aae2394 Author: teor Date: Mon Aug 12 09:50:42 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5 changes/ticket29617 | 4 src/feature/relay/dns.c | 3 ++- 2 files changed, 6

[tor-commits] [tor/release-0.4.0] Consider dir info to have changed when the bridges change

2019-08-11 Thread teor
commit 5b3c8865842f3b12d3ea35db19e8feb135bb46dc Author: Nick Mathewson Date: Fri May 31 11:46:58 2019 -0400 Consider dir info to have changed when the bridges change Otherwise, we won't realize that we haven't got enough bridge information to build circuits. Part of a fix for

[tor-commits] [tor/release-0.4.0] Changes file for bug 30614

2019-08-11 Thread teor
commit bdf685e47614ef5dca935b9fe9a608ffdd63a816 Author: Nick Mathewson Date: Wed May 29 09:05:26 2019 -0400 Changes file for bug 30614 --- changes/bug30614 | 4 1 file changed, 4 insertions(+) diff --git a/changes/bug30614 b/changes/bug30614 new file mode 100644 index

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5

2019-08-11 Thread teor
commit 2d4772dc47e6e7c43c3909540e73a139333fc7d6 Merge: ef345ab56 8c4e68438 Author: teor Date: Mon Aug 12 09:43:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5 changes/bug30190 | 3 +++ src/lib/crypt_ops/crypto_openssl_mgt.c | 8

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5

2019-08-11 Thread teor
commit e5be039494745a3b0d101e422aa5793aaeac3567 Merge: f65f4b5c3 37aae2394 Author: teor Date: Mon Aug 12 09:50:42 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5 changes/ticket29617 | 4 src/feature/relay/dns.c | 3 ++- 2 files changed, 6

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5

2019-08-11 Thread teor
commit 3287cae68c8e6f2f72967bf6fb07e601792ecd2c Merge: a57e168ca 669ec6432 Author: teor Date: Mon Aug 12 09:38:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5 changes/cid1444119 | 3 +++ src/feature/dircommon/consdiff.c | 2 +- 2 files

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5

2019-08-11 Thread teor
commit a57e168caa21f9798be85adb56af726da7385810 Merge: 5df0b3662 9b7cdd23d Author: teor Date: Mon Aug 12 09:36:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5 doc/tor.1.txt | 13 +++-- src/config/torrc.sample.in | 21

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5

2019-08-11 Thread teor
commit 224825e7ee993da72b3027558ba263dae6fcae22 Merge: e5be03949 245dccb77 Author: teor Date: Mon Aug 12 09:51:00 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5 changes/ticket30454| 10 src/feature/hs/hs_cell.c |

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5

2019-08-11 Thread teor
commit a92b05392e2e88357b0e2a1c31cfdb7e94406838 Merge: 224825e7e 5cbd71b97 Author: teor Date: Mon Aug 12 09:51:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5 changes/bug29670 | 4 src/core/mainloop/connection.c | 33

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5

2019-08-11 Thread teor
commit a57e168caa21f9798be85adb56af726da7385810 Merge: 5df0b3662 9b7cdd23d Author: teor Date: Mon Aug 12 09:36:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5 doc/tor.1.txt | 13 +++-- src/config/torrc.sample.in | 21

[tor-commits] [tor/release-0.3.5] hs: Add changes file for #30454

2019-08-11 Thread teor
commit 9f52b875184098aef91bfdebcfd272a60b3b879e Author: David Goulet Date: Thu May 9 13:23:14 2019 -0400 hs: Add changes file for #30454 Signed-off-by: David Goulet --- changes/ticket30454 | 10 ++ 1 file changed, 10 insertions(+) diff --git a/changes/ticket30454

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5

2019-08-11 Thread teor
commit ef345ab56d26e51f5d1f1a0b51e55a589465669b Merge: 9be65c440 85ff6f911 Author: teor Date: Mon Aug 12 09:42:15 2019 +1000 Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5 changes/bug30148 | 4 src/feature/relay/routerkeys.c | 2 +- 2 files changed,

[tor-commits] [tor/release-0.3.5] num_bridges_usable(): only count configured bridges.

2019-08-11 Thread teor
commit 8015979eeba2c8b10fb058318628debf228fb023 Author: Nick Mathewson Date: Fri May 31 12:19:29 2019 -0400 num_bridges_usable(): only count configured bridges. When this function was implemented, it counted all the entry guards in the bridge set. But this included previously

[tor-commits] [tor/release-0.3.5] hs: Get rid of duplicate hs_cell_introd_ack_status_t

2019-08-11 Thread teor
commit dcc1d8d15bf11ca1c4e2760bbc47d5fa3df3814d Author: David Goulet Date: Thu May 9 13:01:15 2019 -0400 hs: Get rid of duplicate hs_cell_introd_ack_status_t This enum was the exact same as hs_intro_ack_status_t that was removed at the previous commit. It was used client side

[tor-commits] [tor/release-0.3.5] Make get_proxy_type() connection-specific

2019-08-11 Thread teor
commit 5cbd71b977f1c3ae0b9dc0f9e63094941ece015c Author: Nick Mathewson Date: Wed May 29 11:00:09 2019 -0400 Make get_proxy_type() connection-specific Previously, we were looking at our global settings to see what kind of proxy we had. But doing this would sometimes give us

[tor-commits] [tor/release-0.3.5] hs: Remove hs_cell_onion_key_type_t enum

2019-08-11 Thread teor
commit 56908c6f1c63d32bef7011c811976e24156f17d3 Author: David Goulet Date: Wed May 15 15:30:29 2019 -0400 hs: Remove hs_cell_onion_key_type_t enum Unify this with the trunnel ABI so we don't duplicate. Part of #30454 Signed-off-by: David Goulet ---

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5

2019-08-11 Thread teor
commit 955cf9620c68c17f6531e80f9f4a7fa7d9f0f479 Merge: 3287cae68 4dd96f744 Author: teor Date: Mon Aug 12 09:40:08 2019 +1000 Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5 changes/29241_diagnostic | 4 changes/bug29241 | 6 ++

[tor-commits] [tor/release-0.3.5] Add changes file for #30040.

2019-08-11 Thread teor
commit 2cdc6b2005d2ad09b44cf9a455a70f258e7f6fca Author: George Kadianakis Date: Tue Apr 9 17:30:14 2019 +0300 Add changes file for #30040. --- changes/bug30040 | 9 + 1 file changed, 9 insertions(+) diff --git a/changes/bug30040 b/changes/bug30040 new file mode 100644 index

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5

2019-08-11 Thread teor
commit 2d4772dc47e6e7c43c3909540e73a139333fc7d6 Merge: ef345ab56 8c4e68438 Author: teor Date: Mon Aug 12 09:43:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5 changes/bug30190 | 3 +++ src/lib/crypt_ops/crypto_openssl_mgt.c | 8

[tor-commits] [tor/release-0.3.5] Fix some tests for CL_PORT_NO_STREAM_OPTIONS

2019-08-11 Thread teor
commit 3c3158f1826826d9b4e8841bc67855cca0fc883b Author: Nick Mathewson Date: Fri May 31 09:03:16 2019 -0400 Fix some tests for CL_PORT_NO_STREAM_OPTIONS The comment in the tests was correct: this option _was_ inverted wrt SessionGroup=. --- src/test/test_config.c | 12

[tor-commits] [tor/release-0.3.5] OOM-purge the DNS cache one part at a time

2019-08-11 Thread teor
commit 37aae23945c45c459091b38699130a14466d33ef Author: Nick Mathewson Date: Fri May 17 10:03:41 2019 -0400 OOM-purge the DNS cache one part at a time Previously we purged it in 1-hour increments -- but one-hour is the maximum TTL for the cache! Now we do it in 25%-TTL

[tor-commits] [tor/release-0.3.5] Do not warn about compatible OpenSSL upgrades

2019-08-11 Thread teor
commit 8c4e68438dd680b6b36f9b337b12d098b08db9d8 Author: Bernhard M. Wiedemann Date: Mon Apr 15 13:57:24 2019 +0200 Do not warn about compatible OpenSSL upgrades When releasing OpenSSL patch-level maintenance updates, we do not want to rebuild binaries using it. And since

[tor-commits] [tor/release-0.3.5] Bug 29034: Cleanup hs circuitmap when purpose changes.

2019-08-11 Thread teor
commit a6399da598101d8046cbf7ab2d80051fd8820e2f Author: Mike Perry Date: Wed Jun 5 11:50:44 2019 -0700 Bug 29034: Cleanup hs circuitmap when purpose changes. Leave the other rend and hs_ident data around until circuit free, since code may still try to inspect it after marking

[tor-commits] [tor/release-0.3.5] Move bandwidth-file-headers line to appear in the correct vote section

2019-08-11 Thread teor
commit 0ab4dc7ef7c6468c1d0d87a7cbc834217214f16b Author: Nick Mathewson Date: Mon Apr 29 13:43:50 2019 -0400 Move bandwidth-file-headers line to appear in the correct vote section Fixes bug 30316; bugfix on 0.3.5.1-alpha. --- changes/bug30316 | 4

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5

2019-08-11 Thread teor
commit 9be65c440baae43dd38ffef216f6198c714ba5ba Merge: 955cf9620 2cdc6b200 Author: teor Date: Mon Aug 12 09:41:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5 changes/bug30040 | 9 + src/ext/getdelim.c | 3 ++- 2 files changed, 11 insertions(+),

[tor-commits] [tor/release-0.3.5] Make --list-modules imply --hush

2019-08-11 Thread teor
commit 0c451b31d2694c96ec20145e3b0e9b22cd54819d Author: Nick Mathewson Date: Tue May 14 19:55:35 2019 -0400 Make --list-modules imply --hush --- src/app/main/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/main/main.c b/src/app/main/main.c index c45c87d8d..67f2181cd

[tor-commits] [tor/release-0.3.5] Consider dir info to have changed when the bridges change

2019-08-11 Thread teor
commit 5b3c8865842f3b12d3ea35db19e8feb135bb46dc Author: Nick Mathewson Date: Fri May 31 11:46:58 2019 -0400 Consider dir info to have changed when the bridges change Otherwise, we won't realize that we haven't got enough bridge information to build circuits. Part of a fix for

[tor-commits] [tor/release-0.3.5] hs: Remove usage of HS_INTRO_ACK_STATUS_CANT_RELAY

2019-08-11 Thread teor
commit cbcc570ff4a8e03fc08bfd020d6b4c7365d4d137 Author: David Goulet Date: Thu May 9 12:45:17 2019 -0400 hs: Remove usage of HS_INTRO_ACK_STATUS_CANT_RELAY The INTRODUCE1 trunnel definition file doesn't support that value so it can not be used else it leads to an assert on the

[tor-commits] [tor/release-0.3.5] Fix a logic error in deciding whether to accept SessionGroup=

2019-08-11 Thread teor
commit 70b85358afd0a8d4291489f9e9f5654ab2d53371 Author: Nick Mathewson Date: Fri May 31 08:26:10 2019 -0400 Fix a logic error in deciding whether to accept SessionGroup= Fixes bug 22619; bugfix on 0.2.7.2-alpha --- changes/bug22619| 3 +++ src/app/config/config.c | 2 +-

[tor-commits] [tor/release-0.3.5] hs: Remove hs_intro_auth_key_type_t enum

2019-08-11 Thread teor
commit 79cfe2ddd7c030e679104588c7e4842c2ff6b239 Author: David Goulet Date: Thu May 9 13:09:44 2019 -0400 hs: Remove hs_intro_auth_key_type_t enum Like the previous commit about the INTRODUCE_ACK status code, change all auth key type to use the one defined in the trunnel file.

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5

2019-08-11 Thread teor
commit 2d4772dc47e6e7c43c3909540e73a139333fc7d6 Merge: ef345ab56 8c4e68438 Author: teor Date: Mon Aug 12 09:43:37 2019 +1000 Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5 changes/bug30190 | 3 +++ src/lib/crypt_ops/crypto_openssl_mgt.c | 8

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5

2019-08-11 Thread teor
commit d253b31cec04c35c551618b9b1ffa50ae4426303 Merge: 31fb2bceb a6399da59 Author: teor Date: Mon Aug 12 09:54:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5 changes/bug29034 | 5 + src/core/or/circuituse.c | 6 ++ 2 files changed, 11

[tor-commits] [tor/release-0.4.0] changes file for bug 29875.

2019-08-11 Thread teor
commit c09e7a4e715d8266517896cfbc8fc80f19feba85 Author: Nick Mathewson Date: Fri May 31 12:39:52 2019 -0400 changes file for bug 29875. --- changes/bug29875 | 11 +++ 1 file changed, 11 insertions(+) diff --git a/changes/bug29875 b/changes/bug29875 new file mode 100644 index

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5

2019-08-11 Thread teor
commit 955cf9620c68c17f6531e80f9f4a7fa7d9f0f479 Merge: 3287cae68 4dd96f744 Author: teor Date: Mon Aug 12 09:40:08 2019 +1000 Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5 changes/29241_diagnostic | 4 changes/bug29241 | 6 ++

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5

2019-08-11 Thread teor
commit 224825e7ee993da72b3027558ba263dae6fcae22 Merge: e5be03949 245dccb77 Author: teor Date: Mon Aug 12 09:51:00 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5 changes/ticket30454| 10 src/feature/hs/hs_cell.c |

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5

2019-08-11 Thread teor
commit 6ed56ee4eaf679d4352d034af5951d36fc9a6f8e Merge: 2d4772dc4 802ac8ad6 Author: teor Date: Mon Aug 12 09:44:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5 changes/bug30189 | 4 src/lib/log/util_bug.c | 14 ++

[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5

2019-08-11 Thread teor
commit ef345ab56d26e51f5d1f1a0b51e55a589465669b Merge: 9be65c440 85ff6f911 Author: teor Date: Mon Aug 12 09:42:15 2019 +1000 Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5 changes/bug30148 | 4 src/feature/relay/routerkeys.c | 2 +- 2 files changed,

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5

2019-08-11 Thread teor
commit 6ed56ee4eaf679d4352d034af5951d36fc9a6f8e Merge: 2d4772dc4 802ac8ad6 Author: teor Date: Mon Aug 12 09:44:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5 changes/bug30189 | 4 src/lib/log/util_bug.c | 14 ++

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5

2019-08-11 Thread teor
commit d253b31cec04c35c551618b9b1ffa50ae4426303 Merge: 31fb2bceb a6399da59 Author: teor Date: Mon Aug 12 09:54:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5 changes/bug29034 | 5 + src/core/or/circuituse.c | 6 ++ 2 files changed, 11

[tor-commits] [tor/release-0.4.0] OOM-purge the DNS cache one part at a time

2019-08-11 Thread teor
commit 37aae23945c45c459091b38699130a14466d33ef Author: Nick Mathewson Date: Fri May 17 10:03:41 2019 -0400 OOM-purge the DNS cache one part at a time Previously we purged it in 1-hour increments -- but one-hour is the maximum TTL for the cache! Now we do it in 25%-TTL

[tor-commits] [tor/release-0.4.0] Fix a memory leak on failure to create keys directory.

2019-08-11 Thread teor
commit 85ff6f9114eb2d492d88ed55d01a69f7bafb10be Author: Nick Mathewson Date: Thu Apr 11 18:18:14 2019 -0400 Fix a memory leak on failure to create keys directory. Fixes bug 30148, which is also CID 1437429 and CID 1437454. Bugfix on 0.3.3.1-alpha, when separate key directories

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5

2019-08-11 Thread teor
commit 789fdbed0586aeec5b312195a453c9ddaf8d58be Merge: a92b05392 3c3158f18 Author: teor Date: Mon Aug 12 09:52:56 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5 changes/bug22619| 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5

2019-08-11 Thread teor
commit f65f4b5c38bc79e2b3f1a10c21cedce9376ad87e Merge: 8ea090322 0c451b31d Author: teor Date: Mon Aug 12 09:49:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5 changes/bug30452 | 3 +++ doc/tor.1.txt | 4

[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5

2019-08-11 Thread teor
commit 31fb2bceb546fb84899e5c797e3f101b86dd8687 Merge: 789fdbed0 c09e7a4e7 Author: teor Date: Mon Aug 12 09:53:59 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5 changes/bug29875| 11 +++ src/app/config/config.c | 3 ++-

[tor-commits] [tor/release-0.4.0] Fix some tests for CL_PORT_NO_STREAM_OPTIONS

2019-08-11 Thread teor
commit 3c3158f1826826d9b4e8841bc67855cca0fc883b Author: Nick Mathewson Date: Fri May 31 09:03:16 2019 -0400 Fix some tests for CL_PORT_NO_STREAM_OPTIONS The comment in the tests was correct: this option _was_ inverted wrt SessionGroup=. --- src/test/test_config.c | 12

[tor-commits] [tor/release-0.4.0] Make get_proxy_type() connection-specific

2019-08-11 Thread teor
commit 5cbd71b977f1c3ae0b9dc0f9e63094941ece015c Author: Nick Mathewson Date: Wed May 29 11:00:09 2019 -0400 Make get_proxy_type() connection-specific Previously, we were looking at our global settings to see what kind of proxy we had. But doing this would sometimes give us

[tor-commits] [tor/release-0.4.0] num_bridges_usable(): only count configured bridges.

2019-08-11 Thread teor
commit 8015979eeba2c8b10fb058318628debf228fb023 Author: Nick Mathewson Date: Fri May 31 12:19:29 2019 -0400 num_bridges_usable(): only count configured bridges. When this function was implemented, it counted all the entry guards in the bridge set. But this included previously

[tor-commits] [tor/release-0.3.5] hs: Define INTRODUCE_ACK status code in trunnel

2019-08-11 Thread teor
commit 590d97bc1065bdb93c70695c91de9c548ef802af Author: David Goulet Date: Thu May 9 12:55:52 2019 -0400 hs: Define INTRODUCE_ACK status code in trunnel Remove the hs_intro_ack_status_t enum and move the value into trunnel. Only use these values from now on in the intro point

[tor-commits] [tor/release-0.3.5] Add a --list-modules command

2019-08-11 Thread teor
commit 1b16fcb70cb9507184fe7316396c93c1daa12674 Author: Nick Mathewson Date: Thu May 9 11:26:13 2019 -0400 Add a --list-modules command Closes ticket 30452. --- changes/bug30452 | 3 +++ doc/tor.1.txt | 4 src/app/config/config.c| 13

[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5

2019-08-11 Thread teor
commit 9be65c440baae43dd38ffef216f6198c714ba5ba Merge: 955cf9620 2cdc6b200 Author: teor Date: Mon Aug 12 09:41:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5 changes/bug30040 | 9 + src/ext/getdelim.c | 3 ++- 2 files changed, 11 insertions(+),

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5

2019-08-11 Thread teor
commit ef345ab56d26e51f5d1f1a0b51e55a589465669b Merge: 9be65c440 85ff6f911 Author: teor Date: Mon Aug 12 09:42:15 2019 +1000 Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5 changes/bug30148 | 4 src/feature/relay/routerkeys.c | 2 +- 2 files changed,

[tor-commits] [tor/maint-0.3.5] Make get_proxy_type() connection-specific

2019-08-11 Thread teor
commit 5cbd71b977f1c3ae0b9dc0f9e63094941ece015c Author: Nick Mathewson Date: Wed May 29 11:00:09 2019 -0400 Make get_proxy_type() connection-specific Previously, we were looking at our global settings to see what kind of proxy we had. But doing this would sometimes give us

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5

2019-08-11 Thread teor
commit 3287cae68c8e6f2f72967bf6fb07e601792ecd2c Merge: a57e168ca 669ec6432 Author: teor Date: Mon Aug 12 09:38:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5 changes/cid1444119 | 3 +++ src/feature/dircommon/consdiff.c | 2 +- 2 files

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5

2019-08-11 Thread teor
commit 9be65c440baae43dd38ffef216f6198c714ba5ba Merge: 955cf9620 2cdc6b200 Author: teor Date: Mon Aug 12 09:41:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5 changes/bug30040 | 9 + src/ext/getdelim.c | 3 ++- 2 files changed, 11 insertions(+),

[tor-commits] [tor/maint-0.3.5] changes file for bug 29875.

2019-08-11 Thread teor
commit c09e7a4e715d8266517896cfbc8fc80f19feba85 Author: Nick Mathewson Date: Fri May 31 12:39:52 2019 -0400 changes file for bug 29875. --- changes/bug29875 | 11 +++ 1 file changed, 11 insertions(+) diff --git a/changes/bug29875 b/changes/bug29875 new file mode 100644 index

[tor-commits] [tor/maint-0.3.5] Fix a logic error in deciding whether to accept SessionGroup=

2019-08-11 Thread teor
commit 70b85358afd0a8d4291489f9e9f5654ab2d53371 Author: Nick Mathewson Date: Fri May 31 08:26:10 2019 -0400 Fix a logic error in deciding whether to accept SessionGroup= Fixes bug 22619; bugfix on 0.2.7.2-alpha --- changes/bug22619| 3 +++ src/app/config/config.c | 2 +-

[tor-commits] [tor/maint-0.3.5] hs: Remove hs_intro_auth_key_type_t enum

2019-08-11 Thread teor
commit 79cfe2ddd7c030e679104588c7e4842c2ff6b239 Author: David Goulet Date: Thu May 9 13:09:44 2019 -0400 hs: Remove hs_intro_auth_key_type_t enum Like the previous commit about the INTRODUCE_ACK status code, change all auth key type to use the one defined in the trunnel file.

[tor-commits] [tor/maint-0.3.5] Fix some tests for CL_PORT_NO_STREAM_OPTIONS

2019-08-11 Thread teor
commit 3c3158f1826826d9b4e8841bc67855cca0fc883b Author: Nick Mathewson Date: Fri May 31 09:03:16 2019 -0400 Fix some tests for CL_PORT_NO_STREAM_OPTIONS The comment in the tests was correct: this option _was_ inverted wrt SessionGroup=. --- src/test/test_config.c | 12

[tor-commits] [tor/maint-0.3.5] Move bandwidth-file-headers line to appear in the correct vote section

2019-08-11 Thread teor
commit 0ab4dc7ef7c6468c1d0d87a7cbc834217214f16b Author: Nick Mathewson Date: Mon Apr 29 13:43:50 2019 -0400 Move bandwidth-file-headers line to appear in the correct vote section Fixes bug 30316; bugfix on 0.3.5.1-alpha. --- changes/bug30316 | 4

[tor-commits] [tor/maint-0.3.5] hs: Get rid of duplicate hs_cell_introd_ack_status_t

2019-08-11 Thread teor
commit dcc1d8d15bf11ca1c4e2760bbc47d5fa3df3814d Author: David Goulet Date: Thu May 9 13:01:15 2019 -0400 hs: Get rid of duplicate hs_cell_introd_ack_status_t This enum was the exact same as hs_intro_ack_status_t that was removed at the previous commit. It was used client side

[tor-commits] [tor/maint-0.3.5] Do not warn about compatible OpenSSL upgrades

2019-08-11 Thread teor
commit 8c4e68438dd680b6b36f9b337b12d098b08db9d8 Author: Bernhard M. Wiedemann Date: Mon Apr 15 13:57:24 2019 +0200 Do not warn about compatible OpenSSL upgrades When releasing OpenSSL patch-level maintenance updates, we do not want to rebuild binaries using it. And since

[tor-commits] [tor/maint-0.3.5] trunnel: Remove INTRODUCE1 status code IN statement

2019-08-11 Thread teor
commit 7d3e904a27ac714c33f9b1e14b4d1d18d4042147 Author: David Goulet Date: Wed May 15 15:27:27 2019 -0400 trunnel: Remove INTRODUCE1 status code IN statement We want to support parsing a cell with unknown status code so we are forward compatible. Part of #30454

[tor-commits] [tor/maint-0.3.5] hs: Remove hs_cell_onion_key_type_t enum

2019-08-11 Thread teor
commit 56908c6f1c63d32bef7011c811976e24156f17d3 Author: David Goulet Date: Wed May 15 15:30:29 2019 -0400 hs: Remove hs_cell_onion_key_type_t enum Unify this with the trunnel ABI so we don't duplicate. Part of #30454 Signed-off-by: David Goulet ---

[tor-commits] [tor/maint-0.3.5] hs: Define INTRODUCE_ACK status code in trunnel

2019-08-11 Thread teor
commit 590d97bc1065bdb93c70695c91de9c548ef802af Author: David Goulet Date: Thu May 9 12:55:52 2019 -0400 hs: Define INTRODUCE_ACK status code in trunnel Remove the hs_intro_ack_status_t enum and move the value into trunnel. Only use these values from now on in the intro point

[tor-commits] [tor/maint-0.3.5] hs: Add changes file for #30454

2019-08-11 Thread teor
commit 9f52b875184098aef91bfdebcfd272a60b3b879e Author: David Goulet Date: Thu May 9 13:23:14 2019 -0400 hs: Add changes file for #30454 Signed-off-by: David Goulet --- changes/ticket30454 | 10 ++ 1 file changed, 10 insertions(+) diff --git a/changes/ticket30454

[tor-commits] [tor/maint-0.3.5] Add changes file for #30040.

2019-08-11 Thread teor
commit 2cdc6b2005d2ad09b44cf9a455a70f258e7f6fca Author: George Kadianakis Date: Tue Apr 9 17:30:14 2019 +0300 Add changes file for #30040. --- changes/bug30040 | 9 + 1 file changed, 9 insertions(+) diff --git a/changes/bug30040 b/changes/bug30040 new file mode 100644 index

[tor-commits] [tor/maint-0.3.5] Bug 29034: Cleanup hs circuitmap when purpose changes.

2019-08-11 Thread teor
commit a6399da598101d8046cbf7ab2d80051fd8820e2f Author: Mike Perry Date: Wed Jun 5 11:50:44 2019 -0700 Bug 29034: Cleanup hs circuitmap when purpose changes. Leave the other rend and hs_ident data around until circuit free, since code may still try to inspect it after marking

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5

2019-08-11 Thread teor
commit ef345ab56d26e51f5d1f1a0b51e55a589465669b Merge: 9be65c440 85ff6f911 Author: teor Date: Mon Aug 12 09:42:15 2019 +1000 Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5 changes/bug30148 | 4 src/feature/relay/routerkeys.c | 2 +- 2 files changed,

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5

2019-08-11 Thread teor
commit 224825e7ee993da72b3027558ba263dae6fcae22 Merge: e5be03949 245dccb77 Author: teor Date: Mon Aug 12 09:51:00 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5 changes/ticket30454| 10 src/feature/hs/hs_cell.c |

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5

2019-08-11 Thread teor
commit 789fdbed0586aeec5b312195a453c9ddaf8d58be Merge: a92b05392 3c3158f18 Author: teor Date: Mon Aug 12 09:52:56 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5 changes/bug22619| 3 +++ src/app/config/config.c | 2 +- src/test/test_config.c | 12

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5

2019-08-11 Thread teor
commit a92b05392e2e88357b0e2a1c31cfdb7e94406838 Merge: 224825e7e 5cbd71b97 Author: teor Date: Mon Aug 12 09:51:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5 changes/bug29670 | 4 src/core/mainloop/connection.c | 33

[tor-commits] [tor/maint-0.3.5] doc: update the man page and sample torrc for ExitRelay

2019-08-11 Thread teor
commit 9b7cdd23deb5830cce794ce6e901b82fa094dd9f Author: teor Date: Thu Feb 28 11:22:20 2019 +1000 doc: update the man page and sample torrc for ExitRelay We changed the default of ExitRelay in #21530 in 0.3.5.1-alpha, but forgot to update the documentation. Closes

[tor-commits] [tor/maint-0.3.5] Fix a memory leak on failure to create keys directory.

2019-08-11 Thread teor
commit 85ff6f9114eb2d492d88ed55d01a69f7bafb10be Author: Nick Mathewson Date: Thu Apr 11 18:18:14 2019 -0400 Fix a memory leak on failure to create keys directory. Fixes bug 30148, which is also CID 1437429 and CID 1437454. Bugfix on 0.3.3.1-alpha, when separate key directories

[tor-commits] [tor/maint-0.3.5] NSS: Log an error message when SSL_ExportKeyingMaterial() fails

2019-08-11 Thread teor
commit 680fd3f8fb7157432398a3552ee9c98c72bd7397 Author: Nick Mathewson Date: Fri Mar 29 13:38:14 2019 -0400 NSS: Log an error message when SSL_ExportKeyingMaterial() fails Diagnostic for 29241. --- changes/29241_diagnostic | 4 src/lib/tls/tortls_nss.c | 8 2 files

[tor-commits] [tor/maint-0.3.5] Add a --list-modules command

2019-08-11 Thread teor
commit 1b16fcb70cb9507184fe7316396c93c1daa12674 Author: Nick Mathewson Date: Thu May 9 11:26:13 2019 -0400 Add a --list-modules command Closes ticket 30452. --- changes/bug30452 | 3 +++ doc/tor.1.txt | 4 src/app/config/config.c| 13

[tor-commits] [tor/maint-0.3.5] NSS: disable TLS1.2 SHA-384 ciphersuites.

2019-08-11 Thread teor
commit 5cb94cbf9d89804ea37a2f1e68d354a86edb223e Author: Nick Mathewson Date: Fri Mar 29 13:38:48 2019 -0400 NSS: disable TLS1.2 SHA-384 ciphersuites. In current NSS versions, these ciphersuites don't work with SSL_ExportKeyingMaterial(), which was causing relays to fail when

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5

2019-08-11 Thread teor
commit a57e168caa21f9798be85adb56af726da7385810 Merge: 5df0b3662 9b7cdd23d Author: teor Date: Mon Aug 12 09:36:14 2019 +1000 Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5 doc/tor.1.txt | 13 +++-- src/config/torrc.sample.in | 21

[tor-commits] [tor/maint-0.3.5] Make --list-modules imply --hush

2019-08-11 Thread teor
commit 0c451b31d2694c96ec20145e3b0e9b22cd54819d Author: Nick Mathewson Date: Tue May 14 19:55:35 2019 -0400 Make --list-modules imply --hush --- src/app/main/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/main/main.c b/src/app/main/main.c index c45c87d8d..67f2181cd

[tor-commits] [tor/maint-0.3.5] num_bridges_usable(): only count configured bridges.

2019-08-11 Thread teor
commit 8015979eeba2c8b10fb058318628debf228fb023 Author: Nick Mathewson Date: Fri May 31 12:19:29 2019 -0400 num_bridges_usable(): only count configured bridges. When this function was implemented, it counted all the entry guards in the bridge set. But this included previously

[tor-commits] [tor/maint-0.3.5] OOM-purge the DNS cache one part at a time

2019-08-11 Thread teor
commit 37aae23945c45c459091b38699130a14466d33ef Author: Nick Mathewson Date: Fri May 17 10:03:41 2019 -0400 OOM-purge the DNS cache one part at a time Previously we purged it in 1-hour increments -- but one-hour is the maximum TTL for the cache! Now we do it in 25%-TTL

[tor-commits] [tor/maint-0.3.5] Fix CID 1444119

2019-08-11 Thread teor
commit 669ec64325fde2f145b1798ee04c5fb74313b0e8 Author: rl1987 Date: Wed Mar 20 19:44:54 2019 +0200 Fix CID 1444119 Let's use the same function exit point for BUG() codepath that we're using for every other exit condition. That way, we're not forgetting to clean up the

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5

2019-08-11 Thread teor
commit 6ed56ee4eaf679d4352d034af5951d36fc9a6f8e Merge: 2d4772dc4 802ac8ad6 Author: teor Date: Mon Aug 12 09:44:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5 changes/bug30189 | 4 src/lib/log/util_bug.c | 14 ++

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

2019-08-11 Thread teor
commit 6eb5a811d732f59d5cd203c966d09ac820421642 Merge: fc89397fa 20943d00f Author: teor Date: Mon Aug 12 13:10:14 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/maint-0.3.5] changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha

2019-08-11 Thread teor
commit 4dd96f7b0eeb8b3b2c36f6f129e464d4 Author: teor Date: Sat Apr 6 11:07:20 2019 +1000 changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha --- changes/bug29241 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug29241 b/changes/bug29241

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5

2019-08-11 Thread teor
commit 8ea0903222610b75e8b0c58297148267a299af31 Merge: 6ed56ee4e 0ab4dc7ef Author: teor Date: Mon Aug 12 09:45:32 2019 +1000 Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5 changes/bug30316 | 4 src/feature/dirauth/dirvote.c | 7 +++ 2 files

[tor-commits] [tor/maint-0.3.5] Use a tor_abort_() wrapper in our util_bug.h macros

2019-08-11 Thread teor
commit 802ac8ad618a0674c26bb973a2277e07b20f8c7b Author: Nick Mathewson Date: Mon Apr 15 14:16:23 2019 -0400 Use a tor_abort_() wrapper in our util_bug.h macros Previously, our use of abort() would break anywhere that we didn't include stdlib.h. This was especially troublesome

[tor-commits] [tor/maint-0.3.5] Prevent double free on huge files with 32 bit.

2019-08-11 Thread teor
commit 9ce0bdd22636a332399d65f280915e899a24b69b Author: Tobias Stoeckmann Date: Sun Mar 31 12:27:55 2019 +0200 Prevent double free on huge files with 32 bit. The function compat_getdelim_ is used for tor_getline if tor is compiled on a system that lacks getline and getdelim.

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

2019-08-11 Thread teor
commit 20943d00f10af11133d9ece90f1cbed658a21aed Merge: a1d8409ee d253b31ce Author: teor Date: Mon Aug 12 13:10:05 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/bug22619 | 3 +++ changes/bug29034 | 5 + changes/bug29670

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5

2019-08-11 Thread teor
commit d253b31cec04c35c551618b9b1ffa50ae4426303 Merge: 31fb2bceb a6399da59 Author: teor Date: Mon Aug 12 09:54:35 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5 changes/bug29034 | 5 + src/core/or/circuituse.c | 6 ++ 2 files changed, 11

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

2019-08-11 Thread teor
commit c9841eb67e44fa3420eb51a69d3766dd95aeebf0 Merge: 63ec50e01 6eb5a811d Author: teor Date: Mon Aug 12 13:10:30 2019 +1000 Merge branch 'maint-0.4.1' ___ tor-commits mailing list tor-commits@lists.torproject.org

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5

2019-08-11 Thread teor
commit 31fb2bceb546fb84899e5c797e3f101b86dd8687 Merge: 789fdbed0 c09e7a4e7 Author: teor Date: Mon Aug 12 09:53:59 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5 changes/bug29875| 11 +++ src/app/config/config.c | 3 ++-

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5

2019-08-11 Thread teor
commit e5be039494745a3b0d101e422aa5793aaeac3567 Merge: f65f4b5c3 37aae2394 Author: teor Date: Mon Aug 12 09:50:42 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5 changes/ticket29617 | 4 src/feature/relay/dns.c | 3 ++- 2 files changed, 6

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0

2019-08-11 Thread teor
commit a1d8409ee28b609a7d6a1a138a53628cb214a113 Merge: bad001080 bdf685e47 Author: teor Date: Mon Aug 12 09:55:29 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0 changes/bug30614 | 4 src/lib/malloc/map_anon.c | 4 2 files changed, 8

[tor-commits] [tor/maint-0.3.5] hs: Remove usage of HS_INTRO_ACK_STATUS_CANT_RELAY

2019-08-11 Thread teor
commit cbcc570ff4a8e03fc08bfd020d6b4c7365d4d137 Author: David Goulet Date: Thu May 9 12:45:17 2019 -0400 hs: Remove usage of HS_INTRO_ACK_STATUS_CANT_RELAY The INTRODUCE1 trunnel definition file doesn't support that value so it can not be used else it leads to an assert on the

[tor-commits] [tor/master] Bug 29034: Cleanup hs circuitmap when purpose changes.

2019-08-11 Thread teor
commit a6399da598101d8046cbf7ab2d80051fd8820e2f Author: Mike Perry Date: Wed Jun 5 11:50:44 2019 -0700 Bug 29034: Cleanup hs circuitmap when purpose changes. Leave the other rend and hs_ident data around until circuit free, since code may still try to inspect it after marking

  1   2   3   >