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

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 9be65c440baae43dd38ffef216f6198c714ba5ba Merge: 955cf9620 2cdc6b200 Author: teor <teor(a)torproject.org> 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(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit e5be039494745a3b0d101e422aa5793aaeac3567 Merge: f65f4b5c3 37aae2394 Author: teor <teor(a)torproject.org> 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 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit a1d8409ee28b609a7d6a1a138a53628cb214a113 Merge: bad001080 bdf685e47 Author: teor <teor(a)torproject.org> 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 insertions(+)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 31fb2bceb546fb84899e5c797e3f101b86dd8687 Merge: 789fdbed0 c09e7a4e7 Author: teor <teor(a)torproject.org> 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 ++- src/feature/client/entrynodes.c | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 955cf9620c68c17f6531e80f9f4a7fa7d9f0f479 Merge: 3287cae68 4dd96f744 Author: teor <teor(a)torproject.org> 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 ++++++ src/lib/tls/tortls_nss.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+)

1 0

[tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 6ed56ee4eaf679d4352d034af5951d36fc9a6f8e Merge: 2d4772dc4 802ac8ad6 Author: teor <teor(a)torproject.org> 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 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 552688c5ccf23f48582a804a01f972e8fc715c8f Merge: 3d04e0bf7 20943d00f Author: teor <teor(a)torproject.org> Date: Mon Aug 12 13:10:10 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug22619 | 3 +++ changes/bug29034 | 5 +++++ changes/bug29670 | 4 ++++ changes/bug29875 | 11 +++++++++++ changes/bug30148 | 4 ++++ changes/bug30190 | 3 +++ changes/bug30614 | 4 ++++ changes/ticket29617 | 4 ++++ src/app/config/config.c | 5 +++-- src/core/mainloop/connection.c | 33 +++++++++++++++++++++------------ src/core/or/circuituse.c | 6 ++++++ src/feature/client/entrynodes.c | 3 +++ src/feature/relay/dns.c | 3 ++- src/feature/relay/routerkeys.c | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 8 ++++++++ src/lib/malloc/map_anon.c | 4 ++++ src/test/test_config.c | 12 +++++------- 17 files changed, 91 insertions(+), 23 deletions(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 8ea0903222610b75e8b0c58297148267a299af31 Merge: 6ed56ee4e 0ab4dc7ef Author: teor <teor(a)torproject.org> 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 changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit f65f4b5c38bc79e2b3f1a10c21cedce9376ad87e Merge: 8ea090322 0c451b31d Author: teor <teor(a)torproject.org> 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 ++++ src/app/config/config.c | 13 +++++++++++++ src/app/main/main.c | 1 + src/feature/dirauth/authmode.h | 4 ++++ 5 files changed, 25 insertions(+)

1 0

[tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5
by teor＠torproject.org 12 Aug '19

12 Aug '19

commit 6ed56ee4eaf679d4352d034af5951d36fc9a6f8e Merge: 2d4772dc4 802ac8ad6 Author: teor <teor(a)torproject.org> 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 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-)

1 0