commit 7c86f34340acf7d8cf35501e71b03f2feba1245e
Merge: 7fe819c951 48dd87933d
Author: Nick Mathewson
Date: Fri May 7 10:41:34 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/bug40380 | 3 +++
src/core/or/circuituse.c | 8
2 files changed, 7 insertions(+), 4
commit 7fe819c9510bc0b738c55abf7339b64498265c05
Merge: ec0b4bdafd f68aeda549
Author: Nick Mathewson
Date: Fri May 7 09:53:58 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/geoip-2021-05-07 |3 +
src/config/geoip | 3227
commit a4a3721690b52b4e101593b42eac5072082a77e8
Merge: cd75eac743 87d96f7162
Author: Nick Mathewson
Date: Wed Apr 21 10:34:28 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 30fa80c0fc1a1996d72b4fb3dead58cf877395f9
Merge: 59bc377dce bba3393d20
Author: David Goulet
Date: Wed Apr 14 08:39:16 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
src/app/config/fallback_dirs.inc | 2 --
1 file changed, 2 deletions(-)
commit 59bc377dce760c3ef6a8b694d6c3a347c9e40d2b
Merge: 1f21b6e6a7 59f6248e09
Author: Nick Mathewson
Date: Tue Apr 13 16:59:16 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/ticket40265 |3 +
src/app/config/fallback_dirs.inc | 1040
commit 1f21b6e6a70036c7a1c90594ac5becc23320db8e
Merge: 218f9f90fb b323e6b8c2
Author: Nick Mathewson
Date: Tue Apr 13 10:36:01 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/geoip-2021-04-13 | 3 +
src/config/geoip | 10953
commit c359c3056b2dbf17987a8955af30884ee438108e
Merge: 59bbf8cde9 9ca2394d6b
Author: Nick Mathewson
Date: Wed Mar 24 12:25:05 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/ticket40345 | 5 +
src/core/or/channel.c | 2 +-
2 files changed, 6 insertions(+), 1
commit e2dd8f1532e0eb8ca6d6cbe9d588468482d14146
Merge: 7c00afe0fb 94fb308c5d
Author: Nick Mathewson
Date: Tue Mar 16 09:18:06 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
"ours" to avoid version bump.
___
tor-commits
commit 7c00afe0fbddd552f4e04e1ad37b1bdae6daf330
Merge: 61731e3550 f2cfd1ffad
Author: Nick Mathewson
Date: Mon Mar 15 09:41:38 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 61731e35507fea1c932f80f0849dcae924113df1
Merge: a6533af9e8 5ec579610a
Author: Nick Mathewson
Date: Mon Mar 15 09:01:59 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/bug40316 | 5 +
src/feature/dirauth/dirvote.c | 2 +-
2 files changed, 6
commit a6533af9e8d90fda13180064e98b49ac3c3cdf86
Merge: 7c5a67ccd9 2eb900f7e2
Author: Nick Mathewson
Date: Mon Mar 15 08:54:00 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/ticket40286_minimal| 7 ---
src/feature/dirparse/unparseable.c | 7 +--
2 files
commit 5e771327afb49a202044a33741f54abf897fe402
Merge: 433f526af6 fb2c889a38
Author: Nick Mathewson
Date: Mon Mar 15 07:40:56 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
"ours" to avoid version bump.
___
tor-commits
commit 7c5a67ccd983bb028d21a5e8aa48b4cd9d6a8a1c
Merge: be17a5a3cf b9f6539008
Author: Nick Mathewson
Date: Mon Mar 15 08:52:29 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/ticket40286_minimal| 5 +
src/feature/dirparse/unparseable.c | 6 ++
2 files
commit 433f526af69b9f7de1ef51bb2c4a9188477233c6
Merge: b014866f6a 9f59b6f458
Author: Nick Mathewson
Date: Fri Mar 12 11:36:34 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
LICENSE | 43 ++-
changes/geoip-2021-03-12 | 2 +-
commit b014866f6a64ab5f2cf168bc961a899b2aafc4ec
Merge: e8d224dfb1 41796158e6
Author: Nick Mathewson
Date: Fri Mar 12 11:30:22 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/geoip-2021-03-12 | 9 +
src/config/geoip | 144354
commit 49ce31b2b6c0cfbcccb605ee58b612f73e2a228a
Merge: 6ea7eb58c6 eb1759633a
Author: David Goulet
Date: Mon Mar 1 08:33:47 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit f420eacf1858220f1cb284353f975e03464b15e4
Merge: 4f4728a004 49c61c1bb8
Author: Alexander Færøy
Date: Fri Feb 5 19:18:47 2021 +
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
commit 4f4728a0049efcaffdda00274c070dc702aff51c
Merge: 3496804827 aa1a053d55
Author: Alexander Færøy
Date: Fri Feb 5 17:40:25 2021 +
Merge branch 'maint-0.4.4' into maint-0.4.5
scripts/maint/practracker/exceptions.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
commit 34968048273faf0cde4d0c69d466b4d8d7275ab7
Merge: 0a40892e8c 62b98716ff
Author: Alexander Færøy
Date: Fri Feb 5 17:17:05 2021 +
Merge branch 'maint-0.4.4' into maint-0.4.5
scripts/maint/practracker/exceptions.txt | 1 +
src/test/test_switch_id.c| 4 ++--
2
commit 0a40892e8c376a3106cec1a4e9ba74f4dd146e68
Merge: ff1b24fb73 6578a3e865
Author: Alexander Færøy
Date: Fri Feb 5 16:05:57 2021 +
Merge branch 'maint-0.4.4' into maint-0.4.5
src/test/test_switch_id.c | 60 ---
1 file changed, 57
commit ff1b24fb73cb8b32fdf4d4121ed958286ae1dab2
Merge: 44b4aa82aa 2933c37188
Author: Nick Mathewson
Date: Wed Feb 3 13:39:41 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
"ours" to avoid version bump.
___
tor-commits mailing
commit 9e91bb31ccf7ed8c221eab47332cca6c88cea162
Merge: a0b3e9116d 61e38deb56
Author: David Goulet
Date: Wed Feb 3 09:11:15 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
src/core/or/address_set.c | 74 ---
src/core/or/address_set.h | 15
commit a0b3e9116d1eb0cfa6a73b17d275c54516291b9b
Merge: 40eeb63b5e eda81ea27e
Author: David Goulet
Date: Wed Feb 3 08:58:02 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
src/core/or/address_set.c | 74 ++
src/core/or/address_set.h
commit 0ec507171dcdeccc52c7e26deb164b99fe5c73fa
Merge: 545fee6e4f ea38016202
Author: David Goulet
Date: Thu Jan 28 12:46:31 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 545fee6e4f6dc2785b425e08e76507a0b777b069
Merge: 50ac9f9229 be81ecba3a
Author: David Goulet
Date: Thu Jan 28 12:42:32 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 50ac9f9229adb91f2af15623c78cd1863061e00c
Merge: c652740515 a3f2bc8f13
Author: David Goulet
Date: Thu Jan 28 12:36:42 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit c652740515cdfad30d733b079a78154e85f3bb41
Merge: 09901aeb07 2c4a2a93d3
Author: David Goulet
Date: Thu Jan 28 12:14:10 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 09901aeb07e67a90bc2fc72c91a0d9cb274e2f84
Merge: aade1e8108 ed0fcfd2b8
Author: David Goulet
Date: Thu Jan 28 12:08:21 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit aade1e810894d66aa090c270c1c25b438da2401f
Merge: 26a07287a4 737cd79c42
Author: David Goulet
Date: Thu Jan 28 12:04:42 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit ceb5735652326f053d4e18c76549b1ce1770a0b7
Merge: 3c0d398847 f8fea8b979
Author: Nick Mathewson
Date: Thu Jan 28 11:19:23 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
"ours" to avoid version bump.
___
tor-commits
commit 68d1e02c3a7594dc3f293edfe69ce49eb856d3ce
Merge: e06a0e904c 09a1a34ad1
Author: David Goulet
Date: Thu Jan 21 16:18:43 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
.gitignore | 1 +
1 file changed, 1 insertion(+)
___
commit e06a0e904cdc80566147a3d718366abe7dd8929d
Merge: c54f4b81da 2a3cf37450
Author: David Goulet
Date: Thu Jan 21 16:07:16 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
.gitignore | 3 +++
Makefile.am| 14 ++
commit e3a5482681f9c4625df1e418b42038cded3cb082
Merge: 6c1bc570cf d54cd853ad
Author: Nick Mathewson
Date: Tue Jan 19 12:53:52 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 6c1bc570cf49c8e493d3278fefaf0c77e289f82c
Merge: f79a31f6d5 4c82c2d1d4
Author: Nick Mathewson
Date: Tue Jan 19 12:49:31 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/40241_v2| 4
src/core/or/channeltls.c| 4 +---
commit e5a0c739d4865b300e904d45c413d5c8f0da304c
Merge: c931eae981 61ee17eb1e
Author: David Goulet
Date: Wed Jan 13 10:38:05 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
.gitignore | 3 +++
1 file changed, 3 insertions(+)
___
commit d1f474160638e10478a2ab14fb93b1e8b6a720a2
Merge: edc9fda4f5 5a822b462a
Author: Nick Mathewson
Date: Mon Jan 11 14:37:29 2021 -0500
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/40241 | 4
src/core/or/channeltls.c| 3 ++-
commit b274e46309b4375f6014f3b698ea24b32d4935a5
Merge: ea52705e4b 77bb4b0838
Author: Alexander Færøy
Date: Thu Nov 19 17:44:00 2020 +
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/bug40179_part2 | 4
src/test/test_config.c | 6 --
2 files changed, 8 insertions(+), 2
commit c79957581e5d6c64fdae2be5b4d5a188ed18960a
Merge: d425dbf04a 9001732394
Author: Nick Mathewson
Date: Mon Nov 16 22:42:23 2020 -0500
Merge branch 'maint-0.4.4' into master
changes/bug40179_part1 | 4
src/test/hs_ntor_ref.py | 6 --
2 files changed, 8 insertions(+), 2
commit dde6b8906f9b26f594e24a4ebe75d38893a4fd76
Merge: 4806aa5da8 3f1544bbd9
Author: Nick Mathewson
Date: Thu Nov 12 08:13:26 2020 -0500
Merge branch 'maint-0.4.4' into master
"ours" to avoid version bump.
___
tor-commits mailing list
commit bc6c37b202e907ed721adbfe2c08977416c0e61c
Merge: 113d18dc57 494ced690d
Author: Nick Mathewson
Date: Mon Nov 9 17:14:01 2020 -0500
Merge branch 'maint-0.4.4' into master
"-s ours" to avoid version bump.
___
tor-commits mailing list
commit 113d18dc5770aac9a69bf360722eb25a8054202c
Merge: faa96f9a8e ec0f000445
Author: Nick Mathewson
Date: Mon Nov 9 16:17:50 2020 -0500
Merge branch 'maint-0.4.4' into master
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 03be7de168ccc1f02cef8c2fe5426823b368cadd
Merge: c37d05d0c6 b0e6ec627c
Author: Alexander Færøy
Date: Wed Oct 28 15:39:37 2020 +
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit bd582583f610d568bb61d1a108d1ff4f38ef08b5
Merge: 6338fc2afa 26cfac1880
Author: David Goulet
Date: Tue Oct 27 10:20:05 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit c90535c539c60b031a3235d7e26b802865ef14c4
Merge: 07f2a06c61 c1bcc1da03
Author: Nick Mathewson
Date: Mon Oct 26 16:39:31 2020 -0400
Merge branch 'maint-0.4.4'
changes/ticket40164 | 6 ++
doc/man/tor.1.txt | 3 ++-
commit d41025312aa46675e44d93358a84d6777c404e8d
Merge: 17e9d40c16 ef70f5f42a
Author: Nick Mathewson
Date: Wed Oct 7 09:29:17 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 95a51864634526c5bf8b576dc4a7aa8778f0d80e
Merge: d0eee3c575 96b69152ce
Author: Nick Mathewson
Date: Wed Oct 7 08:38:30 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit d0eee3c5757466053cd409e49f843a8fb3cb2c06
Merge: fe11a079d8 0e2e517019
Author: Nick Mathewson
Date: Wed Oct 7 08:35:18 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit fe11a079d8aa5879f50b46f35ec1a4f6989f5d38
Merge: a5c5c0d2f5 faac186075
Author: Nick Mathewson
Date: Wed Oct 7 08:29:32 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit a5c5c0d2f5274d967cd48c5b8773dad59ce98851
Merge: 2617987c88 ad62cf2ac9
Author: Nick Mathewson
Date: Wed Oct 7 08:26:04 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 2617987c88227438543e42718469b45ee87377d4
Merge: 6a54a6b351 a44bcc309d
Author: Nick Mathewson
Date: Wed Oct 7 08:16:20 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 6a54a6b351e3aaeaea31d7700312d05c7a8325c5
Merge: eeb00bb292 c65f4eaf06
Author: Nick Mathewson
Date: Wed Oct 7 08:10:08 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit eeb00bb292072413ed123a1f254b321746af8b69
Merge: 3950ea0e6b 8505dd5e37
Author: Nick Mathewson
Date: Wed Oct 7 08:08:02 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 3950ea0e6bd957411d78f0e45bb1dd35be420472
Merge: 15e588b446 30c6b42d34
Author: Nick Mathewson
Date: Wed Oct 7 08:05:40 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 15e588b4464a571c506d0ff5301f9e1f3629f031
Merge: 438aba6c0b 7097d1bab9
Author: Nick Mathewson
Date: Wed Oct 7 08:03:52 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 438aba6c0b70c5becc8ba2c17fad98156901f64b
Merge: 84e825598a a914ac5d7c
Author: George Kadianakis
Date: Wed Oct 7 13:42:57 2020 +0300
Merge branch 'maint-0.4.4' into master
changes/bug40129 | 4
src/feature/dircache/dircache_stub.c | 2 ++
commit 84e825598a8845b34ac0dff2a6d797725c174b19
Merge: 5f61e19d8a 149b7a2418
Author: George Kadianakis
Date: Wed Oct 7 13:29:16 2020 +0300
Merge branch 'maint-0.4.4' into master
changes/bug40113 | 3 +++
src/test/test_connection.c | 13 +++--
2 files changed, 10
commit 3f8201f229ea5142f67a83067c7f321558488fe4
Merge: 4dbbc000b5 b6429430c6
Author: David Goulet
Date: Tue Sep 22 13:47:08 2020 -0400
Merge branch 'maint-0.4.4'
changes/ticket40135 | 3 +++
src/feature/hs_common/shared_random_client.c | 4
2 files changed,
commit 679ba1a226ff92395875dc90683b0007366974d1
Merge: e411360f6d 1cce0588e1
Author: Nick Mathewson
Date: Mon Sep 21 12:59:03 2020 -0400
Merge branch 'maint-0.4.4'
.gitlab-ci.yml | 46 ++
scripts/ci/ci-driver.sh | 20
commit e411360f6dda7b1a44816cbf408579b1c321763a
Merge: 485990641b 09813fe31e
Author: Nick Mathewson
Date: Fri Sep 18 19:06:39 2020 -0400
Merge branch 'maint-0.4.4'
.gitlab-ci.yml | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
commit e8a4482335a1ed6b8238fc7114e3fdd3d7fa9028
Merge: 404c224c71 2e3603d96d
Author: David Goulet
Date: Fri Sep 18 09:45:25 2020 -0400
Merge branch 'maint-0.4.4'
changes/ticket40126 | 4
src/test/test_rendcache.c | 1 +
2 files changed, 5 insertions(+)
commit 404c224c711714f014288c79257c4bfd3880905c
Merge: a47d12c64d 54cd2578ef
Author: Nick Mathewson
Date: Thu Sep 17 13:56:40 2020 -0400
Merge branch 'maint-0.4.4'
changes/ticket40125 | 4
src/test/test_rendcache.c | 2 ++
2 files changed, 6 insertions(+)
commit b30ac328c5a07aaa4a806af3314b48d10082448a
Merge: 9e2435c25f bf5bf33661
Author: Nick Mathewson
Date: Tue Sep 15 08:52:45 2020 -0400
Merge branch 'maint-0.4.4'
"ours" to avoid version bump
___
tor-commits mailing list
commit 56583f96e9a5cae0c8ee7c6fe94c2a01d7010ed2
Merge: 33380f6b27 f6b8894726
Author: Nick Mathewson
Date: Mon Sep 14 13:17:45 2020 -0400
Merge branch 'maint-0.4.4'
"ours" to avoid version bump.
___
tor-commits mailing list
commit 12c758312651c09eb68e9f4e04a7fd3ad9c3a811
Merge: ae6430818e 85a1e6c601
Author: David Goulet
Date: Tue Sep 8 11:14:12 2020 -0400
Merge branch 'maint-0.4.4'
changes/bug40117 | 5 +
src/feature/rend/rendmid.c | 6 --
2 files changed, 9 insertions(+), 2 deletions(-)
commit 6dc0b043199d28866cdb466e18caebbf0b051c04
Merge: 4b9ed14d9b 53cd1c9710
Author: David Goulet
Date: Tue Aug 25 08:23:06 2020 -0400
Merge branch 'maint-0.4.4'
changes/bug40105| 3 +++
src/feature/client/entrynodes.c | 6 +++---
2 files changed, 6 insertions(+), 3
commit 935160ce8629096691268f9902a803c4b871bacc
Merge: 36203e8894 1397a86bbd
Author: George Kadianakis
Date: Tue Aug 25 14:51:23 2020 +0300
Merge branch 'maint-0.4.4'
changes/ticket40109| 6 ++
src/core/or/or_circuit_st.h| 4
src/feature/hs/hs_dos.c| 5
commit 36203e88949c6928d2bdb4bffe8b5e7e68657ee9
Merge: 4e3f55fba1 6e37086f85
Author: George Kadianakis
Date: Thu Aug 20 14:34:56 2020 +0300
Merge branch 'maint-0.4.4'
changes/ticket40089 | 4
src/feature/control/control_hs.c | 11 ++
src/feature/hs/hs_client.c
commit 4e3f55fba1690a63942c0415953cbc1eaf30b360
Merge: 1089ac6f22 b1b0079675
Author: George Kadianakis
Date: Wed Aug 19 13:56:34 2020 +0300
Merge branch 'maint-0.4.4'
changes/parallel_unit_test | 4
src/test/include.am| 22 +++---
src/test/testing_common.c
commit 80d2376f33506adafd4e82cb7cd824f66d8e213a
Merge: ebaa1a1d23 deea196370
Author: David Goulet
Date: Tue Aug 18 08:49:07 2020 -0400
Merge branch 'maint-0.4.4'
changes/ticket24308 | 6 ++
src/app/config/config.c | 29 +++--
src/app/config/config.h | 2
commit 8669ace2fb4159b8782d181894a5e53125444ed4
Merge: e82f36bccc ef18fb56c9
Author: Nick Mathewson
Date: Thu Aug 13 14:20:39 2020 -0400
Merge branch 'maint-0.4.4'
changes/bug40099 | 4
src/test/test_rendcache.c | 1 +
2 files changed, 5 insertions(+)
commit 0957a5adb2d87a3a57a84b40ca9ddacb3e5eb6bd
Merge: 7b4716a762 26b257757b
Author: Nick Mathewson
Date: Thu Aug 13 09:44:11 2020 -0400
Merge branch 'maint-0.4.4'
"ours" to avoid version bump.
___
tor-commits mailing list
commit effc9739bfb3c91171be47673c67ec2bd05c2758
Merge: 9ef991dbe3 9d77ed7be2
Author: Nick Mathewson
Date: Wed Aug 12 20:21:04 2020 -0400
Merge branch 'maint-0.4.4'
.gitlab-ci.yml | 34 +-
scripts/ci/ci-driver.sh | 34
commit 11f1fe3aca08c19ab07d9380c1bd47678c99abc4
Merge: 06c31b1b79 f98b1988ec
Author: Nick Mathewson
Date: Wed Aug 12 12:29:17 2020 -0400
Merge branch 'maint-0.4.4'
.gitlab-ci.yml | 36 ---
Makefile.am | 2 ++
scripts/ci/ci-driver.sh | 77
commit db10d001997a820aa89bdb81def86b42d230faf1
Merge: 347f87ae9d 670f5632a5
Author: Nick Mathewson
Date: Wed Aug 12 08:40:27 2020 -0400
Merge branch 'maint-0.4.4'
.appveyor.yml | 8
1 file changed, 8 deletions(-)
___
tor-commits
commit 347f87ae9dae72c193b9c22906efea960fe60986
Merge: c591a0d246 5a1918d7e7
Author: George Kadianakis
Date: Wed Aug 12 13:47:59 2020 +0300
Merge branch 'maint-0.4.4'
changes/bug40083 | 5 +
src/feature/relay/relay_periodic.c | 5 -
2 files changed, 9
commit c591a0d2466cdc644fd82519f6f1ec32da764287
Merge: 2f708079cd 8e9edb93be
Author: George Kadianakis
Date: Wed Aug 12 13:23:33 2020 +0300
Merge branch 'maint-0.4.4'
changes/ticket40081| 6 ++
src/core/or/channel.c | 46 +++---
commit ea0a704d52a39873a42ef2770b2b0614252740d5
Merge: e93ff481f9 1770d1c216
Author: Nick Mathewson
Date: Tue Aug 11 17:47:02 2020 -0400
Merge branch 'maint-0.4.4'
"ours" merge to avoid version bump.
___
tor-commits mailing list
commit e93ff481f93e3d35d7cfbb4572dad76d8726c279
Merge: 11961f0bc5 d76f8457f3
Author: Nick Mathewson
Date: Tue Aug 11 12:40:09 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit da9684d89a7b0de39c142c4273646cd972b45437
Merge: e4ef3c61f7 2b968446d9
Author: Nick Mathewson
Date: Tue Aug 11 12:37:08 2020 -0400
Merge branch 'maint-0.4.4'
.gitlab-ci.yml | 5 +++--
scripts/ci/ci-driver.sh | 27 ++-
2 files changed, 29
commit e4ef3c61f7fd718da94deace0b67950c6f788859
Merge: 0ee3b83a0b 673d02bdb0
Author: Nick Mathewson
Date: Tue Aug 11 11:03:25 2020 -0400
Merge branch 'maint-0.4.4'
changes/bug40095 | 4
scripts/ci/ci-driver.sh| 4 ++--
commit 0ee3b83a0b77637f51fedc321046fdeaaf5ec15d
Merge: b705cfa024 d83703317d
Author: Nick Mathewson
Date: Tue Aug 11 10:44:40 2020 -0400
Merge branch 'maint-0.4.4'
.gitlab-ci.yml | 5 +
scripts/ci/ci-driver.sh | 5 +
2 files changed, 10 insertions(+)
commit b8003fbe99da4657ba408dc69602700956b9c2fb
Merge: 069946852a ab9c35f043
Author: George Kadianakis
Date: Tue Aug 11 14:54:26 2020 +0300
Merge branch 'maint-0.4.4'
changes/ticket6198 | 3 +++
src/core/mainloop/connection.c | 8
src/lib/crypt_ops/crypto_util.c
commit 069946852a5f847e92062cd1b2a56c20935592b2
Merge: 3eb9331133 7d80bf80fe
Author: Nick Mathewson
Date: Mon Aug 10 19:33:07 2020 -0400
Merge branch 'maint-0.4.4'
.gitlab-ci.yml| 120 ++--
scripts/ci/ci-driver.sh | 424
commit 67fc69c8c1546d1f02f66848997192023f7d1141
Merge: afd88ee87f c1b440f760
Author: Nick Mathewson
Date: Thu Aug 6 13:24:12 2020 -0400
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit e069b0af4b5d5825a23f3bf6a601cc4738599be6
Merge: ce57404a42 18d2c7c5d7
Author: George Kadianakis
Date: Mon Aug 3 16:49:05 2020 +0300
Merge branch 'maint-0.4.4'
changes/ticket33747| 7 +++
src/core/mainloop/connection.c | 7 ++-
src/core/or/connection_st.h| 3
commit badc52b7b1273c3f682e2aa70c3cff3f37000dc8
Merge: 4c810a6abe 4c22050de1
Author: Alexander Færøy
Date: Fri Jul 31 02:03:35 2020 +
Merge branch 'maint-0.4.4'
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 9164d7c75e6191828db15ac713843932867158ef
Merge: 75f94ea1ec 0c8c295963
Author: Nick Mathewson
Date: Wed Jul 29 12:37:08 2020 -0400
Merge branch 'maint-0.4.4'
changes/bug40072 | 4
src/app/main/main.c | 8 ++--
src/lib/sandbox/sandbox.c | 10 +-
3
commit eba2870d18116bcce331421630fd9f8b47aa7f67
Merge: 6665713967 8e690ce736
Author: Alexander Færøy
Date: Wed Jul 29 13:58:14 2020 +
Merge branch 'maint-0.4.4'
changes/bug31036| 3 +++
src/lib/fdio/fdio.c | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
commit 6d3bb9a1a577bcfe173c604bd40dea34fd1d3a03
Merge: 98d84587a8 0a38e02fb3
Author: Nick Mathewson
Date: Mon Jul 27 19:15:25 2020 -0400
Merge branch 'maint-0.4.4'
"ours" to avoid version bump.
___
tor-commits mailing list
commit 64d7b282982760e4f6f70f3cd9a396878ac64b2e
Merge: c2e265e4e5 31eba7f009
Author: Nick Mathewson
Date: Mon Jul 27 12:56:19 2020 -0400
Merge branch 'maint-0.4.4'
src/app/config/fallback_dirs.inc | 15 ---
1 file changed, 15 deletions(-)
commit c2e265e4e578d4c662fa716b0cd472f24f5bf065
Merge: 010387e4bd 95914ceb57
Author: Nick Mathewson
Date: Mon Jul 27 08:33:26 2020 -0400
Merge branch 'maint-0.4.4'
"Ours" to avoid version bump.
___
tor-commits mailing list
commit 9d922b8eaae542429e1a12d82a43883b3be69acf
Merge: b3112a6d26 07934664c5
Author: Nick Mathewson
Date: Thu Jul 23 10:10:32 2020 -0400
Merge branch 'maint-0.4.4'
changes/ticket40061 | 5 +
src/app/config/fallback_dirs.inc | 503 ++-
2
commit 884ccd6996dcd713600e50ec11de0e9a6655607f
Merge: 492625badf 1ee164afc2
Author: David Goulet
Date: Wed Jul 22 16:14:19 2020 -0400
Merge branch 'maint-0.4.4'
changes/ticket33880 | 6 ++
src/core/or/channel.c | 32 +---
2 files changed, 35
commit 7d0e64016ea5b60f64b2f68029d7efa44f25c54d
Merge: 2ee33765ae 5cd85feaa7
Author: Nick Mathewson
Date: Tue Jul 21 09:29:13 2020 -0400
Merge branch 'maint-0.4.4'
changes/bug40020 | 9 ++
src/app/main/main.c | 15 ++---
src/lib/sandbox/sandbox.c | 77
commit 2ee33765aebf00a9e45aa693af8a9b0db93109f8
Merge: 7a2fe93529 95d4bff784
Author: Nick Mathewson
Date: Tue Jul 21 09:24:27 2020 -0400
Merge branch 'maint-0.4.4'
changes/bug27315 | 6 ++
src/lib/sandbox/sandbox.c | 42 --
2 files
commit 1d554e4bafcff076c0ebba34b8292dea44c6dd06
Merge: e594195aa2 07f3345e11
Author: Alexander Færøy
Date: Tue Jul 14 14:48:21 2020 +
Merge branch 'maint-0.4.4'
changes/ticket40035 | 5 +
src/lib/tls/tortls_nss.c | 10 ++
2 files changed, 15 insertions(+)
commit 29a474294c968218576ec6d912a94b8187a1e47b
Merge: 02cff32d79 515d4f1e93
Author: David Goulet
Date: Mon Jul 13 15:04:13 2020 -0400
Merge branch 'maint-0.4.4'
Makefile.am | 3 +--
changes/ticket40030 | 7 +++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --cc
commit ecb43ce21caccbdfe99b0e12cdce7f83d59b06e3
Merge: 0c91c6359 eb427f309
Author: Nick Mathewson
Date: Mon Jul 13 10:45:04 2020 -0400
Merge branch 'maint-0.4.4'
changes/ticket31812 | 4
contrib/clang/sanitize_blacklist.txt| 4 ++--
commit 2eb7673a8c9c370a8cc6eb86daea82baab4bc5d5
Merge: 487728341 20e278735
Author: Nick Mathewson
Date: Thu Jul 9 13:15:49 2020 -0400
Merge branch 'maint-0.4.4'
`-s ours` to avoid version bump.
___
tor-commits mailing list
commit 487728341977d0f82b09e99cff0ea1bb91cfc001
Merge: 5b6cd566b 3efd60474
Author: Nick Mathewson
Date: Thu Jul 9 10:32:20 2020 -0400
Merge branch 'maint-0.4.4'
`-s ours` to avoid version bump
___
tor-commits mailing list
1 - 100 of 133 matches
Mail list logo
