commit 48dd87933dd1c592937ef62d20aeac8998edc0fb
Merge: f68aeda549 e2c1ac214c
Author: Nick Mathewson
Date: Fri May 7 10:41:33 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/bug40380 | 3 +++
src/core/or/circuituse.c | 8
2 files changed, 7 insertions(+), 4
commit f68aeda5496a217f389c92a28f83828e1170cbf0
Merge: 87d96f7162 621f8a304a
Author: Nick Mathewson
Date: Fri May 7 09:53:57 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/geoip-2021-05-07 |3 +
src/config/geoip | 3227 --
commit 87d96f7162ca91c234ac4249a6b03197292b683f
Merge: bba3393d20 32eea3b006
Author: Nick Mathewson
Date: Wed Apr 21 10:34:14 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit bba3393d20976b5c668b15fb6202531772a6d8ff
Merge: 59f6248e09 131e2d99a4
Author: David Goulet
Date: Wed Apr 14 08:39:16 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
src/app/config/fallback_dirs.inc | 2 --
1 file changed, 2 deletions(-)
___
commit 59f6248e09d5560b6ae531d63af7f6c21ed12118
Merge: b323e6b8c2 ee7c50b8a7
Author: Nick Mathewson
Date: Tue Apr 13 16:59:15 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/ticket40265 |3 +
src/app/config/fallback_dirs.inc | 1040 -
commit b323e6b8c29c782c837f3fe385ffdba777977e6a
Merge: 9ca2394d6b 32f5ad7665
Author: Nick Mathewson
Date: Tue Apr 13 10:36:00 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/geoip-2021-04-13 | 3 +
src/config/geoip | 10953 +--
commit 5fac24053d1615260a4ee437a9686c82262e47a8
Merge: f2cfd1ffad 3271c0bde7
Author: Nick Mathewson
Date: Tue Mar 16 09:17:40 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
___
tor-commits mailing
commit 5ec579610ace4d3e4f0a6432b26e1e968beccf36
Merge: 2eb900f7e2 f078aab71e
Author: Nick Mathewson
Date: Mon Mar 15 09:01:59 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/bug40316 | 5 +
src/feature/dirauth/dirvote.c | 2 +-
2 files changed, 6 insertions
commit 2eb900f7e2ca64e6ce16fc86410cafd935e7cd1e
Merge: b9f6539008 efca9ce41c
Author: Nick Mathewson
Date: Mon Mar 15 08:54:00 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/ticket40286_minimal| 7 ---
src/feature/dirparse/unparseable.c | 7 +--
2 files chan
commit b9f65390089817a74bf20d93e93a15b41a970f79
Merge: fb2c889a38 f46f4562cf
Author: Nick Mathewson
Date: Mon Mar 15 08:52:28 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/ticket40286_minimal| 5 +
src/feature/dirparse/unparseable.c | 6 ++
2 files changed
commit 8ada4263a95b2a5bc6ef6022664aadca14039d97
Merge: 9f59b6f458 1a0b5fd569
Author: Nick Mathewson
Date: Mon Mar 15 07:40:06 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
___
tor-commits mailing
commit 9f59b6f458f2322df0bbfa48789c79f6657b4857
Merge: 41796158e6 02230575c4
Author: Nick Mathewson
Date: Fri Mar 12 11:36:34 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.4
LICENSE | 43 ++-
changes/geoip-2021-03-12 | 2 +-
commit 41796158e633524fa3222c66dbd619e32bba5c95
Merge: eb1759633a aa6c7741e8
Author: Nick Mathewson
Date: Fri Mar 12 11:30:21 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/geoip-2021-03-12 | 9 +
src/config/geoip | 144354 ++---
commit eb1759633af4eda00926a8987831f8fb7c811c17
Merge: ad4f87ed3f 296a557bfc
Author: David Goulet
Date: Mon Mar 1 08:33:41 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
htt
commit 8a17999da3626a5f9e8922277151624cd0526fba
Merge: 0d14ac1e0e 21317c9229
Author: Nick Mathewson
Date: Wed Feb 3 13:39:08 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
"ours" to avoid version bump.
___
tor-commits mailing
commit cc5d5a5d1ebf8d42d77713eab11d200770d869e8
Merge: e50648582b a3cef41fc3
Author: David Goulet
Date: Wed Feb 3 08:56:38 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
src/core/or/connection_edge.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
___
commit 890a9e89bab8378a511470787253a4aee14fafd0
Merge: cc5d5a5d1e f322ea3fa8
Author: David Goulet
Date: Wed Feb 3 09:11:14 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
src/core/or/address_set.c | 75 ---
src/core/or/address_set.h | 15
commit e50648582b6e0bc7bb37edc08e7a4d67b50f2c53
Merge: 0f8195406e c2cee6c780
Author: David Goulet
Date: Wed Feb 3 08:54:40 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
src/core/or/connection_edge.c | 2 +-
src/feature/nodelist/nodelist.c | 63 -
commit 0f8195406e0a2a97a3167d4bb40484f4bd091289
Merge: 705fd37875 98590621bb
Author: David Goulet
Date: Wed Feb 3 08:51:36 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
src/core/or/connection_edge.c | 12
src/feature/nodelist/nodelist.c | 8 ++--
2 files chang
commit 79cb47cfc2ed83911f78fa24ba4205bf69958105
Merge: f058db1f3d 9556276f07
Author: David Goulet
Date: Thu Jan 28 12:46:31 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/bug33781 | 7 +++
src/lib/fs/files.c | 8 +---
src/test/test_util.c | 49 +
commit f058db1f3d6fee5bc6506ece88cfd100eb86729d
Merge: f3da5f88d7 290007e3c4
Author: David Goulet
Date: Thu Jan 28 12:42:31 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/bug40190 | 4
src/core/proto/proto_socks.c | 7 ++-
2 files changed, 10 insertion
commit f3da5f88d73f20ba1d28dde973c41e4ec45a02b6
Merge: dd5fbc1bd9 02bd135cb1
Author: David Goulet
Date: Thu Jan 28 12:36:42 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/bug40210 | 5 +
src/ext/keccak-tiny/keccak-tiny.h | 2 +-
2 files changed, 6 inse
commit dd5fbc1bd9d54d191240ac4e15b5324fb83a903d
Merge: 5c89197c9f 1bdccc03a9
Author: David Goulet
Date: Thu Jan 28 12:14:10 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
___
tor-commits mailing list
tor-commits@lists.torproject.org
ht
commit 6186288eb639e7600c9d7ab482135d44ed78fe21
Merge: a17be1b5b6 045db909c2
Author: David Goulet
Date: Thu Jan 28 12:08:20 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/bug40117 | 5 +
src/feature/rend/rendmid.c | 6 --
2 files changed, 9 insertions(+),
commit a17be1b5b619cd5e12a9973df9b9a0cffc40b0ff
Merge: c3ed4b2e56 c6fb26695b
Author: David Goulet
Date: Thu Jan 28 12:04:42 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket40165| 5 +
changes/ticket40170| 3 +++
configure.
commit 7ed0fbd88572b9f5519e7907f366c54b8ffb0f25
Merge: 641dce2d6b 3ebf75993f
Author: Nick Mathewson
Date: Thu Jan 28 11:17:43 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
"ours" to avoid version bump.
___
tor-commits mailing
commit 641dce2d6bfe382411d5897003b18167fdddfc2b
Merge: c09f8da8a9 65087903d9
Author: David Goulet
Date: Thu Jan 21 16:18:43 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
.gitignore | 1 +
1 file changed, 1 insertion(+)
___
tor-commi
commit c09f8da8a98d035082b207ebdaf1e6fe3110c8b7
Merge: 9b390a556e 8500700aa4
Author: David Goulet
Date: Thu Jan 21 16:06:54 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
.gitignore | 3 +++
Makefile.am| 14 ++
changes/ticket402
commit 9b390a556e5030d67c235806b2c027513fb1679f
Merge: b7f886beb4 faf7b550e7
Author: Nick Mathewson
Date: Tue Jan 19 12:53:52 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit a22bfe04bcb106b14e2416e39dc9f43dc82eeba0
Merge: 17eb635532 2d5b21598e
Author: Nick Mathewson
Date: Tue Jan 19 12:45:07 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/40241_v2| 4
src/core/or/channeltls.c| 4 +---
src/core/or/circuitlis
commit 17eb6355320c414d83cbc3c1930ec54ae7cd1ea4
Merge: 4b39f46a61 7a82fbfdab
Author: David Goulet
Date: Wed Jan 13 10:38:05 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
.gitignore | 3 +++
1 file changed, 3 insertions(+)
___
tor-co
commit 4b39f46a611ff48ceb7ea212dbcdb2e5b6d26d3b
Merge: 2e7cbd7a9c 6c0f15500b
Author: Nick Mathewson
Date: Mon Jan 11 14:37:28 2021 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/40241 | 4
src/core/or/channeltls.c| 3 ++-
src/core/or/circuitlist.c
commit 7c0778ef7e05e859c62346a795952f127972b35e
Merge: fd22fa183b fcae26adf7
Author: Nick Mathewson
Date: Mon Nov 16 22:42:22 2020 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/bug40179_part1 | 4
src/test/hs_ntor_ref.py | 6 --
2 files changed, 8 insertions(+), 2 de
commit 1fa90a2077af46ba27c34cb45b962e5e48931284
Merge: 3d3dc08ed8 862c44e4ec
Author: Nick Mathewson
Date: Thu Nov 12 08:11:20 2020 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
"ours" to avoid version bump.
___
tor-commits mailing
commit 3d3dc08ed8782e88f1e87a9550b9f18751c5732a
Merge: 6338c35e9d 665083be9f
Author: Nick Mathewson
Date: Mon Nov 9 17:13:25 2020 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
"-s ours" to avoid version bump.
___
tor-commits maili
commit 0b2c64effd7b4c1238e3b4da34f09d670dafd52d
Merge: 4876409c2a 52e439c13e
Author: Nick Mathewson
Date: Mon Nov 9 16:13:42 2020 -0500
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/bug40080 | 6 ++
src/core/or/channel.c | 2 +-
src/core/or/channel.h | 3 +
commit 4876409c2aa7deecd5f57474ee6de6ea9e90a855
Merge: 8e7778ec8a dd63b97288
Author: Alexander Færøy
Date: Wed Oct 28 15:39:37 2020 +
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket40133 | 5 ++
src/core/or/protover.c | 4 +-
src/rust/protov
commit 8e7778ec8acbfe081df1e28d43d870ed21442029
Merge: 40f0db75bd 741edf1b45
Author: Nick Mathewson
Date: Wed Oct 7 09:29:17 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
___
tor-commits mailing list
tor-commits@lists.torproject.org
h
commit 40f0db75bd3617bc5c4fb76aa62adcf21cea9697
Merge: 884cad3edf b404f085ad
Author: Nick Mathewson
Date: Wed Oct 7 08:38:30 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket40003| 3 +++
src/feature/rend/rendservice.c | 19 +++
2 files cha
commit 3e9fa5a029af55a0175b106199a5371fd87c8e4a
Merge: 701a1936fa 5f5587ee50
Author: Nick Mathewson
Date: Wed Oct 7 08:29:31 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket33880 | 6 ++
src/core/or/channel.c | 32 +---
2 files chang
commit 701a1936fae48c6887cadd90dbe50ae84a00a29f
Merge: a49373844c ad7ffa5240
Author: Nick Mathewson
Date: Wed Oct 7 08:26:04 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket33747| 7 +++
src/core/mainloop/connection.c | 7 ++-
src/core/or/connectio
commit a49373844cd3c7047759244a6a5c103304d88a7b
Merge: 9587512578 98e14720b5
Author: Nick Mathewson
Date: Wed Oct 7 08:16:19 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
___
tor-commits mailing list
tor-commits@lists.torproject.org
h
commit 9587512578e1c45d62e5e97dd9222fe891c835cd
Merge: 902982 968b6c30c1
Author: Nick Mathewson
Date: Wed Oct 7 08:10:08 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket40035 | 5 +
src/lib/tls/tortls_nss.c | 10 ++
2 files changed, 15 insertions
commit 90298206d359d3f799ecf8a504bdff493272
Merge: 8a561fc5bf e0e0ef713e
Author: Nick Mathewson
Date: Wed Oct 7 08:08:01 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket40073| 3 +++
src/core/mainloop/connection.c | 9 -
2 files changed, 11 ins
commit 8a561fc5bfc48b3d849d62b266d323f98d509a50
Merge: b5a88e8d47 84a5bd48e2
Author: Nick Mathewson
Date: Wed Oct 7 08:05:40 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket40081| 6 ++
src/core/or/channel.c | 44 ++---
commit b5a88e8d478e553eb7c6bc022d47a084d6845e64
Merge: beffad8529 ed6a328297
Author: Nick Mathewson
Date: Wed Oct 7 08:01:37 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/parallel_unit_test | 4
src/test/include.am| 23 ---
src/test/testi
commit 79d777396858d008bb99d0f411953a5152b921b0
Merge: 020e8e41c6 faf89ec6c2
Author: Nick Mathewson
Date: Mon Sep 28 10:35:12 2020 -0400
Merge branch 'maint-0.3.5' into bug40133_035
.gitlab-ci.yml | 73 +++-
changes/ticket40125
commit beffad8529c9b603bcf6b6e720747f6210c5c25c
Merge: 0d78fbb718 faf89ec6c2
Author: David Goulet
Date: Tue Sep 22 13:47:08 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket40135 | 3 +++
src/feature/hs_common/shared_random_client.c | 4
2
commit 0d78fbb718ae44aaf739ec644e7d5f3ae65771ea
Merge: b643ced022 8458c8211e
Author: Nick Mathewson
Date: Mon Sep 21 12:59:03 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
.gitlab-ci.yml | 46 ++
scripts/ci/ci-driver.sh | 20 ++
commit b643ced0224268dfe3d9c3617b3a77f8aec6205e
Merge: 2ddbfc64af 0b77c706a1
Author: Nick Mathewson
Date: Fri Sep 18 19:06:16 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
.gitlab-ci.yml | 27 ++-
scripts/ci/ci-driver.sh | 5 +
2 files change
commit 2ddbfc64afe94b74a2b9856f2e85e3bd38323db2
Merge: 078194ecaf 7945e075a4
Author: David Goulet
Date: Fri Sep 18 09:45:25 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket40126 | 4
src/test/test_rendcache.c | 1 +
2 files changed, 5 insertions(+)
commit 078194ecafebfff2f6aa37868539ccee15ebe73c
Merge: 7915b651d9 47f1d19f8e
Author: Nick Mathewson
Date: Thu Sep 17 13:56:40 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.3
changes/ticket40125 | 4
src/test/test_rendcache.c | 2 ++
2 files changed, 6 insertions(+)
_
commit 45d983049382e09d14d5047f9eef941d089e9fb7
Merge: 07f0210a05 72484a4953
Author: Nick Mathewson
Date: Thu Aug 13 14:20:39 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/bug40099 | 4
src/test/test_rendcache.c | 2 +-
2 files changed, 5 insertions(+), 1 de
commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5
Merge: 02bb719a94 aeafb7f44f
Author: Nick Mathewson
Date: Wed Aug 12 20:21:04 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
.gitlab-ci.yml | 34 +-
scripts/ci/ci-driver.sh | 34 ++
commit 02bb719a9494a010b3cad4cf81942ec7619f5806
Merge: 6ef40144ae f5b9471547
Author: Nick Mathewson
Date: Wed Aug 12 12:29:17 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
.gitlab-ci.yml | 36 ---
Makefile.am | 2 ++
scripts/ci/ci-driver.
commit 6ef40144aeacdf13126d61c2686cc470b6c5
Merge: c6c0af403c 8182f1351a
Author: Nick Mathewson
Date: Wed Aug 12 08:39:41 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
.appveyor.yml | 8
1 file changed, 8 deletions(-)
__
commit c6c0af403c9b8dccba96677b60d86670a651893d
Merge: da8577bb75 adb7268236
Author: Nick Mathewson
Date: Tue Aug 11 12:37:08 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
.gitlab-ci.yml | 5 +++--
scripts/ci/ci-driver.sh | 27 ++-
2 files change
commit da8577bb7579af1355688d459b2774f995c43b53
Merge: e4a6d9d5a9 aa2c93b90b
Author: Nick Mathewson
Date: Tue Aug 11 11:03:24 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
scripts/ci/ci-driver.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
___
commit e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b
Merge: 68f8250cbb 8a0f530adf
Author: Nick Mathewson
Date: Tue Aug 11 10:44:40 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
.gitlab-ci.yml | 5 +
scripts/ci/ci-driver.sh | 5 +
2 files changed, 10 insertions(+)
_
commit 68f8250cbb6f1844e7f16f5f1bc8063b8bbfdf14
Merge: 352991c843 e873c7e893
Author: Nick Mathewson
Date: Mon Aug 10 19:32:49 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
.gitlab-ci.yml| 120 ++--
scripts/ci/ci-driver.sh | 424 ++
commit 352991c843e2c0404fd44178cbf3df32cc365bc1
Merge: 4e684c8695 bac8967e24
Author: Nick Mathewson
Date: Thu Aug 6 13:24:11 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
.gitlab-ci.yml | 32 ++--
1 file changed, 2 insertions(+), 30 deletions(-)
___
commit 4e684c8695e4654d841644fe9c13e70eabd191b9
Merge: cdb0e6c252 c4742b89b2
Author: Alexander Færøy
Date: Fri Jul 31 02:03:34 2020 +
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/bug40076| 5
src/lib/buf/buffers.c | 2 ++
src/test/test_buffers.c | 64
commit cdb0e6c2522aac372c9a816300dacfd62856dd48
Merge: c0bc30b6f0 dcc60294ad
Author: Nick Mathewson
Date: Wed Jul 29 12:37:07 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/bug31036| 3 +++
src/lib/fdio/fdio.c | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-
commit c0bc30b6f0f643e06abfb70f18126155663ec4cc
Merge: 3bcbd69a77 564a9a54a1
Author: Nick Mathewson
Date: Mon Jul 27 12:56:18 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
src/app/config/fallback_dirs.inc | 15 ---
1 file changed, 15 deletions(-)
__
commit 3bcbd69a776f0602fd8524a1a24fbe60666dd77f
Merge: 49b4d1765c f916ddd312
Author: Nick Mathewson
Date: Thu Jul 23 10:09:14 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/ticket40061 | 5 +
src/app/config/fallback_dirs.inc | 503 ++-
commit 6e01d5e68506056b1c9ec6b19a60911b15512bd8
Merge: 5aaecf6d0 c9751e261
Author: Nick Mathewson
Date: Thu Jul 9 13:14:22 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
`-s ours` to avoid version bump.
___
tor-commits mailing
commit 78285594f51fc0009d3911fb894e12b793536a5d
Merge: 283ce30c5 0bb227d17
Author: Nick Mathewson
Date: Thu Jul 9 10:30:03 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
`-s ours` to avoid version bump.
___
tor-commits mailing
commit 283ce30c536568129f0a2b531d4c195c93c7ff52
Merge: b81e24cda 7142f3e43
Author: Nick Mathewson
Date: Thu Jul 9 09:28:53 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/bug33119 | 4 +++
src/lib/tls/tortls_nss.c | 47 +++
src/t
commit b81e24cda687e9633c18b741ed92ce6bafb77643
Merge: 19d579e8c 3e08dd9df
Author: Alexander Færøy
Date: Wed Jul 8 00:36:47 2020 +
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/bug40028 | 3 +++
src/lib/tls/x509.c | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
_
commit 19d579e8cbb7bd95ed4fd50697c689ab7b725963
Merge: 07d8d398c d9cc2b292
Author: Alexander Færøy
Date: Tue Jul 7 14:48:35 2020 +
Merge branch 'maint-0.3.5' into maint-0.4.2
.appveyor.yml | 2 +-
changes/ticket40026 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
commit 07d8d398ca8961d2d9155a2df9c7ced6b382e73b
Merge: dbb70d85b 39830b640
Author: David Goulet
Date: Thu Jul 2 07:20:57 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/bug16016 | 4
src/feature/nodelist/routerlist.c | 6 +-
2 files changed, 9 inse
commit 38208185be063cfe575f97b99b3270210fbd0a8c
Merge: dbb70d85b 9beae0271
Author: George Kadianakis
Date: Wed Jul 1 12:55:02 2020 +0300
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/ticket33346 | 3 +++
src/lib/sandbox/sandbox.c | 3 +++
2 files changed, 6 insertions(+)
_
commit dbb70d85bf65d33e0a1035146d71a2a610e91056
Merge: 881f50a9a 8697205be
Author: Alexander Færøy
Date: Tue Jun 30 14:23:41 2020 +
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/bug34303| 5 +
src/core/or/circuitlist.c | 2 +-
src/feature/client/entry
commit c9c4a3d0f60580b7deeadc59a845e272ab8aa949
Merge: 483082b57 8444fbe90
Author: Alexander Færøy
Date: Tue Jun 30 14:03:04 2020 +
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/ticket33361 | 3 +++
src/app/config/config.c | 13 +
src/test/test_options.c | 19
commit 483082b57bfb2535477530fe84d8c92c70be2fa1
Merge: b0bfee8c7 c3ad2a1d2
Author: Alexander Færøy
Date: Tue Jun 30 13:48:49 2020 +
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/bug33032 | 6 ++
src/lib/encoding/pem.c | 8 +++-
src/test/test_pem.c| 30 +
commit b0bfee8c783b495ece772189d478dad2628bc159
Merge: d235e523d bebdd2888
Author: Alexander Færøy
Date: Tue Jun 30 13:37:20 2020 +
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/bug32884 | 5 +
src/lib/thread/compat_pthreads.c | 2 +-
2 files changed, 6 ins
commit fd8ce812b0a7263b75096207a735c02945320c86
Merge: 0f218a05a 0c0214bcc
Author: Nick Mathewson
Date: Mon Jun 29 12:55:35 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
changes/ticket28992| 3 +++
src/feature/hs/hs_client.c | 11 ---
2 files changed, 11 insertio
commit 0f218a05a6d8271639a81ec2667f86ef1aa38e66
Merge: 193082895 6a43aadec
Author: David Goulet
Date: Fri Jun 12 12:55:41 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
.travis.yml | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
__
commit 1930828957c9cac165c9068f5898d092f268
Merge: e75583e71 c1add51bc
Author: Nick Mathewson
Date: Fri Jun 5 12:37:29 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.2
.appveyor.yml | 2 ++
1 file changed, 2 insertions(+)
___
tor-co
commit 768ffb8f43575baac0970659b01e0a484d6bd6de
Merge: 72312cdbb a59d54756
Author: Nick Mathewson
Date: Fri May 15 10:25:27 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
___
commit 72312cdbb166e2c0c9d4b6dba049f43c2d35ecdc
Merge: d41f1cd3e e63bfca5f
Author: Nick Mathewson
Date: Thu May 14 10:20:08 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
.travis.yml | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
commit dd0ee016e9e386410c374d0dd421f5683ec8476e
Merge: 28f453c47 cc397449f
Author: Nick Mathewson
Date: Wed May 6 16:51:33 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
This is an "ours" merge to avoid taking the 0.3.5 fix for 34078.
___
commit 633366efcd24e2221528c378d87f66fe35736f99
Merge: 79ff2b6aa dd795fbee
Author: Nick Mathewson
Date: Wed May 6 16:58:12 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/bug34078 | 5 +
1 file changed, 5 insertions(+)
___
commit 28f453c4764962394bf0cd3a314b2b60af7ee1b4
Merge: 104130609 78a72f819
Author: Nick Mathewson
Date: Wed May 6 16:47:03 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
htt
commit 987f2fa50ac26af61917c7a6e13dc62f3ddb23ee
Merge: 26fd31fef d380acaec
Author: teor
Date: Thu Apr 9 11:03:20 2020 +1000
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/ticket33491 | 6 ++
src/core/or/channel.c | 2 +-
src/core/or/dos.c | 4 ++--
src/core/or/dos.h
commit cb69a5a1184e1b02523308c6d51b0f8f715f064e
Merge: efdbf4243 3150c3035
Author: Nick Mathewson
Date: Wed Mar 18 12:16:59 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
"ours" to avoid version bump.
___
tor-commits mailing l
commit 4ad3f17c26166b898cd768a6e1835fad2ef67005
Merge: 57b1d0848 0526801ed
Author: Nick Mathewson
Date: Wed Mar 18 08:20:16 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
src/lib/crypt_ops/crypto_rsa_openssl.c | 7 +++
1 file changed, 7 insertions(+)
___
commit 57b1d0848e9b42670d6f33e37a2095740726e2b1
Merge: 3c8a4b8fb fe3d8ec38
Author: Nick Mathewson
Date: Tue Mar 17 15:22:36 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
___
tor-commits mailing list
tor-commits@lists.torproject.org
ht
commit 5f4e14b8c8cd4c8907f669144a5a4bb8b8b7a585
Merge: c22696e36 089e57d22
Author: Nick Mathewson
Date: Tue Mar 17 11:45:16 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/trove_2020_003 | 4
src/feature/hs/hs_client.c | 6 +++---
src/feature/hs/hs_
commit c22696e3606f9873ddbf02b11dc91214853b8317
Merge: 7a9e2a261 1c688ba92
Author: teor
Date: Mon Mar 16 20:54:20 2020 +1000
Merge branch 'maint-0.3.5' into maint-0.4.1
.travis.yml | 2 +-
changes/ticket32792 | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
___
commit 7a9e2a261b44b93e244c04593dee8f7757ba32bc
Merge: 7f0ad3343 d17108a18
Author: Nick Mathewson
Date: Fri Mar 13 16:56:44 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
"ours" to avoid version bump.
___
tor-commits mailing l
commit b2e543bfe74bb5855a86429c61c0efc91d660719
Merge: c96cf1494 b9d71f384
Author: Nick Mathewson
Date: Fri Mar 13 16:46:16 2020 -0400
Merge branch 'maint-0.3.5' into maint-0.4.1
changes/bug33093_logging | 5 +
src/lib/tls/buffers_tls.c | 4 ++--
2 files changed, 7 insertions(+), 2 d
commit 5298113da98f13cfaad4a9ab7b5ac8baa6c37279
Merge: 0ff3e8f4a b9c7c61ea
Author: teor
Date: Wed Feb 12 12:21:57 2020 +1000
Merge branch 'maint-0.3.5' into maint-0.4.1
.travis.yml| 2 --
changes/bug32753 | 3 +++
changes/ticket33075| 4
src/app/c
commit f3fa22bf1b52dfce65a37e6a84bac8635916e8c2
Merge: 65825018c 2b6df3da2
Author: Nick Mathewson
Date: Mon Feb 10 14:17:09 2020 -0500
Merge branch 'maint-0.3.5' into maint-0.4.0
changes/ticket33212 | 4
src/rust/protover/protover.rs | 2 +-
2 files changed, 5 insertions(+)
commit 65825018c7aed931324dd427bb1e84544a9b2f47
Merge: 026f068bb 41d52e9cd
Author: teor
Date: Thu Jan 30 07:54:58 2020 +1000
Merge branch 'maint-0.3.5' into maint-0.4.0
changes/bug29819 | 8
src/lib/sandbox/sandbox.c | 40 ++--
2 file
commit 026f068bb3aed9de0f1cc6792f6c9528b7b27db2
Merge: d96b35d66 19954cffd
Author: teor
Date: Thu Jan 16 10:00:32 2020 +1000
Merge branch 'maint-0.3.5' into maint-0.4.0
changes/ticket32407 | 4
src/core/mainloop/mainloop.c | 4
src/lib/evloop/compat_libevent.c
commit 748117298341de8a279f4437b6d557f0d50edb63
Merge: b9504f788 1cd20ff84
Author: teor
Date: Mon Dec 16 08:16:04 2019 +1000
Merge branch 'maint-0.3.5' into maint-0.4.0
.travis.yml | 9 +
changes/ticket32177 | 3 ---
changes/ticket32629 | 4
3 files changed, 9 inserti
commit 651d29c0f7b7b5dadd4f56a9b1a937ddc34641f8
Merge: c7ca3fc18 0c4f0ec97
Author: Nick Mathewson
Date: Mon Dec 9 16:01:22 2019 -0500
Merge branch 'maint-0.3.5' into maint-0.4.0
"ours" to avoid version bump.
___
tor-commits mailing li
commit c7ca3fc1869f4999845526d7fd883e17630143e9
Merge: e66533bef 74cae547e
Author: Nick Mathewson
Date: Fri Dec 6 16:02:07 2019 -0500
Merge branch 'maint-0.3.5' into maint-0.4.0
changes/geoip-2019-12-03 | 4 +
src/config/geoip | 13933 ++
commit 371d7dbc1a1c8e4cacd80641066d01ba54be197e
Merge: 92fb09906 c53567c36
Author: Nick Mathewson
Date: Thu Dec 5 13:30:32 2019 -0500
Merge branch 'maint-0.3.5' into maint-0.4.0
"ours" to avoid version bump.
___
tor-commits mailing li
1 - 100 of 267 matches
Mail list logo