commit f529ebf93865f6521babf7cc93fdf5e2281acdbc
Author: gus
Date: Mon Jun 14 16:53:14 2021 -0300
Closes #198 Remove post Fundraising Coordinator job position from the
website
---
content/about/jobs/fundraising-coordinator/contents.lr | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
commit d642da020e750f6cff65755dcd66fed6eed2b443
Merge: 982829650c 265cca935a
Author: Nick Mathewson
Date: Mon Jun 14 13:10:18 2021 -0400
Merge remote-tracking branch 'tor-gitlab/mr/338'
changes/ticket40337| 16
doc/man/tor.1.txt | 5 +
commit 9d7fca2306dc09097a24e225de59fb1ade7c9e34
Author: Nick Mathewson
Date: Tue May 11 15:49:00 2021 -0400
Make MinTimeToReportBandwidth a testing-only option (and rename it)
---
changes/ticket40337| 5 +++--
doc/man/tor.1.txt | 12 +---
commit 2ae24d003d1d12e8e202748c4398d7438e4a65d9
Author: Nick Mathewson
Date: Wed Mar 17 08:45:37 2021 -0400
Add a MinTimeToReportBandwidth option; make it 0 for testing networks.
This option changes the time for which a bandwidth measurement period
must have been in progress
commit 265cca935aefd1a3bdbe6abc964858e10fb4a029
Author: Nick Mathewson
Date: Tue May 11 15:54:14 2021 -0400
Ignore MAX_BANDWIDTH_CHANGE_FREQ on testing networks.
Part of the ever-growing 40337 fix.
---
changes/ticket40337| 3 +++
src/feature/relay/router.c | 5 -
2
commit 982829650c59d6807e8c720028c9d766d69cb57c
Merge: ec2094a76e d2256fe9ce
Author: Nick Mathewson
Date: Mon Jun 14 13:05:03 2021 -0400
Merge remote-tracking branch 'tor-gitlab/mr/397'
Makefile.am | 2 +-
changes/bug40407 | 5 +
commit d2256fe9cea6407258a53f68c64723aef19bd41c
Author: Nick Mathewson
Date: Tue Jun 8 12:47:57 2021 -0400
Modernize our libfuzzer usage to close #40407
Additionally, remove lingering references to hsv2 fuzzers from the
fuzzing_include_am.py script.
---
Makefile.am
commit 42d62072d27e0415274c9987e1291001ff601e7f
Author: Georg Koppen
Date: Sun Jun 13 10:15:04 2021 +
prop331: Fix typos
---
proposals/331-res-tokens-for-anti-dos.md | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git
commit ec2094a76e74d2fcca96593058b6a422419b628e
Author: Nick Mathewson
Date: Mon Jun 14 11:55:48 2021 -0400
Copy forward ChangeLog and ReleaseNotes from 0.3.5.15, 0.4.4.9, and 0.4.5.9
---
ChangeLog| 188 +++
ReleaseNotes | 188
commit e04831a0d27b1acb15f1dfbbe9aaa9d596d1dba3
Author: Nick Mathewson
Date: Mon Jun 14 11:53:12 2021 -0400
Copy the 0.4.6.5 changelog and releasenotes to main.
---
ChangeLog| 59
ReleaseNotes | 310 +++
2 files
commit 27c3254988af633cf507f7e96119c45d18f14426
Author: Nick Mathewson
Date: Mon Jun 14 11:50:00 2021 -0400
Remove 0.4.4 from list-tor-branches.
---
scripts/git/git-list-tor-branches.sh | 3 ---
1 file changed, 3 deletions(-)
diff --git a/scripts/git/git-list-tor-branches.sh
commit e18bf39e66eef181be5fa054d6a1bf806242fde6
Merge: 62a500dd1d 91aec8dbc1
Author: Nick Mathewson
Date: Mon Jun 14 11:49:01 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 91aec8dbc158a60ee3a521d20eae1d0d71adbbaa
Author: Nick Mathewson
Date: Mon Jun 14 11:48:30 2021 -0400
Bump to 0.4.6.5-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4
commit e04e545173028aa6c16a55388e2057dbb6f5aa1f
Merge: 8e590992c4 9085508310
Author: Nick Mathewson
Date: Mon Jun 14 11:47:54 2021 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
"Ours" to avoid version bump.
___
tor-commits
commit 253b83b72223f67024ea10b4008610dd18396811
Merge: 0ae9fd62fd 87492154e0
Author: Nick Mathewson
Date: Mon Jun 14 11:46:20 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
___
tor-commits
commit 9085508310ab06c2b7ed0650e77dbe86023095f3
Author: Nick Mathewson
Date: Mon Jun 14 11:47:41 2021 -0400
Bump to 0.4.5.9-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4
commit 5ab97fa60371afa8faa9d6dbd8decbe7fbc42b6b
Merge: 200e9a55e0 253b83b722
Author: Nick Mathewson
Date: Mon Jun 14 11:47:29 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4
Author: Nick Mathewson
Date: Mon Jun 14 11:45:30 2021 -0400
Bump to 0.3.5.15-dev
---
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 3
commit ecc1e8eacb9945ec569291e81eacae66c95bb17e
Merge: d0ed04d50e 9085508310
Author: Nick Mathewson
Date: Mon Jun 14 11:49:01 2021 -0400
Merge branch 'maint-0.4.5' into release-0.4.5
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 9085508310ab06c2b7ed0650e77dbe86023095f3
Author: Nick Mathewson
Date: Mon Jun 14 11:47:41 2021 -0400
Bump to 0.4.5.9-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4
commit 253b83b72223f67024ea10b4008610dd18396811
Merge: 0ae9fd62fd 87492154e0
Author: Nick Mathewson
Date: Mon Jun 14 11:46:20 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
___
tor-commits
commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4
Author: Nick Mathewson
Date: Mon Jun 14 11:45:30 2021 -0400
Bump to 0.3.5.15-dev
---
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 3
commit 88b54f2a5b281558d19793267be54b4d6e5813e7
Merge: dbe8cd3642 253b83b722
Author: Nick Mathewson
Date: Mon Jun 14 11:49:01 2021 -0400
Merge branch 'maint-0.4.4' into release-0.4.4
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 5ab97fa60371afa8faa9d6dbd8decbe7fbc42b6b
Merge: 200e9a55e0 253b83b722
Author: Nick Mathewson
Date: Mon Jun 14 11:47:29 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4
Author: Nick Mathewson
Date: Mon Jun 14 11:45:30 2021 -0400
Bump to 0.3.5.15-dev
---
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 3
commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4
Author: Nick Mathewson
Date: Mon Jun 14 11:45:30 2021 -0400
Bump to 0.3.5.15-dev
---
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 3
commit f86387039897ee1e8cccfc8060e74bdefa70c1fc
Merge: b925cef1e3 87492154e0
Author: Nick Mathewson
Date: Mon Jun 14 11:49:01 2021 -0400
Merge branch 'maint-0.3.5' into release-0.3.5
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
commit 253b83b72223f67024ea10b4008610dd18396811
Merge: 0ae9fd62fd 87492154e0
Author: Nick Mathewson
Date: Mon Jun 14 11:46:20 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
___
tor-commits
commit 5ab97fa60371afa8faa9d6dbd8decbe7fbc42b6b
Merge: 200e9a55e0 253b83b722
Author: Nick Mathewson
Date: Mon Jun 14 11:47:29 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 91aec8dbc158a60ee3a521d20eae1d0d71adbbaa
Author: Nick Mathewson
Date: Mon Jun 14 11:48:30 2021 -0400
Bump to 0.4.6.5-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4
commit 9085508310ab06c2b7ed0650e77dbe86023095f3
Author: Nick Mathewson
Date: Mon Jun 14 11:47:41 2021 -0400
Bump to 0.4.5.9-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4
commit 253b83b72223f67024ea10b4008610dd18396811
Merge: 0ae9fd62fd 87492154e0
Author: Nick Mathewson
Date: Mon Jun 14 11:46:20 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
___
tor-commits
commit e04e545173028aa6c16a55388e2057dbb6f5aa1f
Merge: 8e590992c4 9085508310
Author: Nick Mathewson
Date: Mon Jun 14 11:47:54 2021 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
"Ours" to avoid version bump.
___
tor-commits
commit 253b83b72223f67024ea10b4008610dd18396811
Merge: 0ae9fd62fd 87492154e0
Author: Nick Mathewson
Date: Mon Jun 14 11:46:20 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
___
tor-commits
commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4
Author: Nick Mathewson
Date: Mon Jun 14 11:45:30 2021 -0400
Bump to 0.3.5.15-dev
---
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 3
commit 9085508310ab06c2b7ed0650e77dbe86023095f3
Author: Nick Mathewson
Date: Mon Jun 14 11:47:41 2021 -0400
Bump to 0.4.5.9-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4
commit 5ab97fa60371afa8faa9d6dbd8decbe7fbc42b6b
Merge: 200e9a55e0 253b83b722
Author: Nick Mathewson
Date: Mon Jun 14 11:47:29 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4
Author: Nick Mathewson
Date: Mon Jun 14 11:45:30 2021 -0400
Bump to 0.3.5.15-dev
---
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 3
commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4
Author: Nick Mathewson
Date: Mon Jun 14 11:45:30 2021 -0400
Bump to 0.3.5.15-dev
---
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 3
commit 91aec8dbc158a60ee3a521d20eae1d0d71adbbaa
Author: Nick Mathewson
Date: Mon Jun 14 11:48:30 2021 -0400
Bump to 0.4.6.5-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4
commit 806bc2442d5102bb9b6f5eb92521e20f09c436b9
Merge: ec677c0c2e 91aec8dbc1
Author: Nick Mathewson
Date: Mon Jun 14 11:48:46 2021 -0400
Merge branch 'maint-0.4.6'
"ours" to avoid version bump.
___
tor-commits mailing list
commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4
Author: Nick Mathewson
Date: Mon Jun 14 11:45:30 2021 -0400
Bump to 0.3.5.15-dev
---
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 3
commit 253b83b72223f67024ea10b4008610dd18396811
Merge: 0ae9fd62fd 87492154e0
Author: Nick Mathewson
Date: Mon Jun 14 11:46:20 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
___
tor-commits mailing
commit e04e545173028aa6c16a55388e2057dbb6f5aa1f
Merge: 8e590992c4 9085508310
Author: Nick Mathewson
Date: Mon Jun 14 11:47:54 2021 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
"Ours" to avoid version bump.
___
tor-commits
commit 5ab97fa60371afa8faa9d6dbd8decbe7fbc42b6b
Merge: 200e9a55e0 253b83b722
Author: Nick Mathewson
Date: Mon Jun 14 11:47:29 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
___
tor-commits mailing list
tor-commits@lists.torproject.org
commit 253b83b72223f67024ea10b4008610dd18396811
Merge: 0ae9fd62fd 87492154e0
Author: Nick Mathewson
Date: Mon Jun 14 11:46:20 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
"ours" to avoid version bump.
___
tor-commits
commit 9085508310ab06c2b7ed0650e77dbe86023095f3
Author: Nick Mathewson
Date: Mon Jun 14 11:47:41 2021 -0400
Bump to 0.4.5.9-dev
---
configure.ac| 4 ++--
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 4
commit 87492154e0a68ae369ea9fc40dcaa037e8f871a4
Author: Nick Mathewson
Date: Mon Jun 14 11:45:30 2021 -0400
Bump to 0.3.5.15-dev
---
configure.ac| 2 +-
contrib/win32build/tor-mingw.nsi.in | 2 +-
src/win32/orconfig.h| 2 +-
3 files changed, 3
commit 4ba571fac7cf1f48a6703290286924223517c9c2
Author: Nick Mathewson
Date: Mon Jun 14 11:07:11 2021 -0400
0.4.6.5 is latest stable.
---
databags/versions.ini | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/databags/versions.ini b/databags/versions.ini
index
commit 62a500dd1d3ad012e12b7bf49fad912c9733107a
Author: Nick Mathewson
Date: Thu Jun 10 13:17:19 2021 -0400
Pick a date, draft a blurb
---
ChangeLog| 7 +--
ReleaseNotes | 13 +++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
commit 58ad0302ea9acea48308f35dce4afa986919a151
Merge: 5481412cd7 8e590992c4
Author: Nick Mathewson
Date: Thu Jun 10 12:30:29 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40392 | 4
src/feature/hs/hs_descriptor.c | 3 ++-
2 files changed, 6
commit 15b0980bd7b840c8d2de134e56a09dadf7b4683e
Author: Nick Mathewson
Date: Thu Jun 10 13:13:29 2021 -0400
Fold entries into changelog and releasenotes
---
ChangeLog| 37 +
ReleaseNotes | 37
commit 5481412cd7e1ffadc20a31ddf93dc110e7df
Merge: a2b0d7ead4 7be37a26ac
Author: Nick Mathewson
Date: Thu Jun 10 09:55:55 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
src/core/or/relay.c | 24 +++-
1 file changed, 3 insertions(+), 21 deletions(-)
commit 0ae9fd62fdc5ffd41bf5bbf2f4a3c1e2a151fa2d
Merge: 014345ed6a f57b5c48e0
Author: Nick Mathewson
Date: Thu Jun 10 12:30:11 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/bug40392 | 4
src/feature/hs/hs_descriptor.c | 3 ++-
2 files changed, 6
commit 7be37a26ac769e3059223553970b09b7b41688f7
Merge: 3260d323a6 ae2254e490
Author: Nick Mathewson
Date: Thu Jun 10 09:55:55 2021 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
src/core/or/relay.c | 24 +++-
1 file changed, 3 insertions(+), 21 deletions(-)
commit 200e9a55e0737294085080052fbbaba4340d6717
Merge: ae2254e490 0ae9fd62fd
Author: Nick Mathewson
Date: Thu Jun 10 12:30:29 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/bug40392 | 4
src/feature/hs/hs_descriptor.c | 3 ++-
2 files changed, 6
commit 8e590992c4aae8e45b4b9aa4065c8b7741c2a3d6
Merge: 7be37a26ac 200e9a55e0
Author: Nick Mathewson
Date: Thu Jun 10 12:30:29 2021 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
changes/bug40392 | 4
src/feature/hs/hs_descriptor.c | 3 ++-
2 files changed, 6
commit ae2254e490ebfed746bed7e5ec359737cbb14085
Merge: ec696a95e5 014345ed6a
Author: Nick Mathewson
Date: Thu Jun 10 09:55:55 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
src/core/or/relay.c | 24 +++-
1 file changed, 3 insertions(+), 21 deletions(-)
commit f57b5c48e0aa01acd84a194fe4657a0d1cee04cf
Author: George Kadianakis
Date: Tue May 18 17:06:57 2021 +0300
Fix TROVE-2021-006: Out-of-bounds read on v3 desc parsing
---
changes/bug40392 | 4
src/feature/hs/hs_descriptor.c | 3 ++-
2 files changed, 6 insertions(+), 1
commit 0f2d45328dfcb16acb4a517711413a6f0386487a
Merge: 31eaa81f59 adb248b6d6
Author: Nick Mathewson
Date: Thu Jun 10 08:52:39 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
Conflicts resolved:
src/core/or/relay.c
changes/ticket40389 | 3 +++
commit f6ebe8b92081f6618c5c033c29b40df8db34b953
Merge: c58c2d4e37 69bd4a8a2d
Author: Nick Mathewson
Date: Thu Jun 10 08:42:15 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/bug40391 | 9 +
src/core/or/circuitmux.c | 7 ---
2 files changed, 13
commit ec696a95e58870862625a44f2c9152be2526414c
Merge: 1da8621c0a 0f2d45328d
Author: Nick Mathewson
Date: Thu Jun 10 08:53:07 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/ticket40389 | 3 +++
src/core/or/relay.c | 39 +++
2 files
commit 014345ed6abca3305fcbdea3b75a23adc3976926
Author: Nick Mathewson
Date: Thu Jun 10 09:55:35 2021 -0400
Resolve remaining merge conflicts in relay.c
(My bad!)
---
src/core/or/relay.c | 24 +++-
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git
commit adb248b6d6e0779719e6b873ee12a1e22fa390f4
Author: David Goulet
Date: Thu Jun 3 09:33:21 2021 -0400
TROVE-2021-003: Check layer_hint before half-closed end and resolve cells
This issue was reported by Jann Horn part of Google's Project Zero.
Jann's one-sentence
commit a2b0d7ead432907944d78648ab95a7e2682c69db
Merge: f6ebe8b920 3260d323a6
Author: Nick Mathewson
Date: Thu Jun 10 08:53:07 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40389 | 3 +++
src/core/or/relay.c | 39 +++
2 files
commit 3260d323a663da3a1a2b65085dce1b469be101bb
Merge: 69bd4a8a2d ec696a95e5
Author: Nick Mathewson
Date: Thu Jun 10 08:53:07 2021 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
changes/ticket40389 | 3 +++
src/core/or/relay.c | 39 +++
2 files
commit 69bd4a8a2db6645b69a902d5ef6eb8c832f122fc
Merge: 1d11675adb 1da8621c0a
Author: Nick Mathewson
Date: Thu Jun 10 08:42:15 2021 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
changes/bug40391 | 9 +
src/core/or/circuitmux.c | 7 ---
2 files changed, 13
commit 1da8621c0aef1f3fa694802b2bbea888a8d82d99
Merge: e2d01aac9e 31eaa81f59
Author: Nick Mathewson
Date: Thu Jun 10 08:42:15 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/bug40391 | 9 +
src/core/or/circuitmux.c | 7 ---
2 files changed, 13
commit c58c2d4e372a166c3b3437774ed728de12dacf04
Merge: 9e5e584cb6 1d11675adb
Author: Nick Mathewson
Date: Thu Jun 10 08:37:34 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/ticket40390 | 8
src/lib/crypt_ops/crypto_rand.c | 4 ++--
2 files changed,
commit d71bf986b4faf7cb3b654192bc67d5b674cfcf02
Merge: 7fdfc2ea54 4c06c619fa
Author: Nick Mathewson
Date: Thu Jun 10 08:41:59 2021 -0400
Merge branch 'bug40391_035' into maint-0.3.5
changes/bug40391 | 9 +
src/core/or/circuitmux.c | 8
2 files changed, 13
commit 31eaa81f59749ed7e9d4f1bad24225d23eb6f654
Merge: 7c19a4d924 d71bf986b4
Author: Nick Mathewson
Date: Thu Jun 10 08:42:15 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/bug40391 | 9 +
src/core/or/circuitmux.c | 7 ---
2 files changed, 13
commit 1d11675adbc40c52b0d5047c0bb6f033bde6b19a
Merge: cb38219664 e2d01aac9e
Author: Nick Mathewson
Date: Thu Jun 10 08:37:34 2021 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
changes/ticket40390 | 8
src/lib/crypt_ops/crypto_rand.c | 4 ++--
2 files changed, 10
commit 7c19a4d924120f42c224ea357b388b73d05c2d89
Merge: 57a41348ee 7fdfc2ea54
Author: Nick Mathewson
Date: Thu Jun 10 08:37:26 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/ticket40390 | 8
src/lib/crypt_ops/crypto_rand.c | 4 ++--
2 files changed, 10
commit 7fdfc2ea5470c572a113321e19cdb5144b10cdd8
Merge: 520d5c108f c0aa9e0a1b
Author: Nick Mathewson
Date: Thu Jun 10 08:34:25 2021 -0400
Merge branch 'bug40390_035_squashed' into maint-0.3.5
changes/ticket40390 | 8
src/lib/crypt_ops/crypto_rand.c | 2 +-
2 files
commit c0aa9e0a1b1633d3b221199d516294e14a5db9c6
Author: Nick Mathewson
Date: Mon May 17 08:50:01 2021 -0400
Assert on _all_ failures from RAND_bytes().
Previously, we would detect errors from a missing RNG
implementation, but not failures from the RNG code itself.
commit e2d01aac9e2f45f2c8f0de057f3104d6cfcdaa80
Merge: d60f8fe98a 7c19a4d924
Author: Nick Mathewson
Date: Thu Jun 10 08:37:34 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/ticket40390 | 8
src/lib/crypt_ops/crypto_rand.c | 4 ++--
2 files changed, 10
commit 200e9a55e0737294085080052fbbaba4340d6717
Merge: ae2254e490 0ae9fd62fd
Author: Nick Mathewson
Date: Thu Jun 10 12:30:29 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/bug40392 | 4
src/feature/hs/hs_descriptor.c | 3 ++-
2 files changed, 6
commit 57a41348eee001809cd77326ca35406888b5a64b
Merge: 1956f63d6b 520d5c108f
Author: Nick Mathewson
Date: Thu Jun 10 08:21:47 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/geoip-2021-06-10 |3 +
src/config/geoip | 4764
commit 4c06c619faceb5d158a725d97fda45cadb2cf9c9
Author: Nick Mathewson
Date: Tue May 18 08:40:09 2021 -0400
Use a more secure hash function for the circuitmux hashtable.
Fixes bug 40931; bugfix on 0.2.4.4-alpha. Also tracked as
TROVE-2021-005.
This issue was reported
commit 5f710eb0871beec55d9d549dac8834d3e756a31c
Author: Nick Mathewson
Date: Thu Jun 10 13:13:54 2021 -0400
Backport changelog entries
---
ChangeLog| 37 +
changes/bug40391 | 9 -
changes/bug40392 | 4
commit adb248b6d6e0779719e6b873ee12a1e22fa390f4
Author: David Goulet
Date: Thu Jun 3 09:33:21 2021 -0400
TROVE-2021-003: Check layer_hint before half-closed end and resolve cells
This issue was reported by Jann Horn part of Google's Project Zero.
Jann's one-sentence
commit cb3821966430abc51d81cb01bd32fc956f0c8125
Merge: b3fe9d5162 d60f8fe98a
Author: Nick Mathewson
Date: Thu Jun 10 08:21:48 2021 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
changes/geoip-2021-06-10 |3 +
src/config/geoip | 4764
commit 9e5e584cb62021e347f2dc106f239906d2aa3ad2
Merge: 009b5778b2 cb38219664
Author: Nick Mathewson
Date: Thu Jun 10 08:21:48 2021 -0400
Merge branch 'maint-0.4.6' into release-0.4.6
changes/geoip-2021-06-10 |3 +
src/config/geoip | 4764
commit d60f8fe98a59ce13809e65de67e53b3dcf6199f0
Merge: c80b98520b 57a41348ee
Author: Nick Mathewson
Date: Thu Jun 10 08:21:48 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/geoip-2021-06-10 |3 +
src/config/geoip | 4764
commit e4ca6427e1e1155e3086dcc446680590cd6e23c3
Merge: 436c18510f ec696a95e5
Author: Nick Mathewson
Date: Thu Jun 10 08:53:07 2021 -0400
Merge branch 'maint-0.4.5' into release-0.4.5
changes/ticket40389 | 3 +++
src/core/or/relay.c | 39 +++
2 files
commit d0ed04d50e80fe1c1ef1bf89edebc51581a6039f
Author: Nick Mathewson
Date: Mon Jun 14 10:51:06 2021 -0400
Copy ChangeLog into ReleaseNotes.
---
ReleaseNotes | 63
1 file changed, 63 insertions(+)
diff --git a/ReleaseNotes
commit 1451861cd2c68bb47faad34c5185c29d4075612f
Merge: 5e04311873 200e9a55e0
Author: Nick Mathewson
Date: Thu Jun 10 12:30:29 2021 -0400
Merge branch 'maint-0.4.5' into release-0.4.5
changes/bug40392 | 4
src/feature/hs/hs_descriptor.c | 3 ++-
2 files changed, 6
commit 014345ed6abca3305fcbdea3b75a23adc3976926
Author: Nick Mathewson
Date: Thu Jun 10 09:55:35 2021 -0400
Resolve remaining merge conflicts in relay.c
(My bad!)
---
src/core/or/relay.c | 24 +++-
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git
commit 0ae9fd62fdc5ffd41bf5bbf2f4a3c1e2a151fa2d
Merge: 014345ed6a f57b5c48e0
Author: Nick Mathewson
Date: Thu Jun 10 12:30:11 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
changes/bug40392 | 4
src/feature/hs/hs_descriptor.c | 3 ++-
2 files changed, 6
commit fc2582f203fcec44a7402986d5216bad2b826d14
Author: Nick Mathewson
Date: Thu Jun 10 13:19:55 2021 -0400
Pick a date, draft a blurb
---
ChangeLog | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8bee9f12df..9836e644b2 100644
---
commit ae2254e490ebfed746bed7e5ec359737cbb14085
Merge: ec696a95e5 014345ed6a
Author: Nick Mathewson
Date: Thu Jun 10 09:55:55 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
src/core/or/relay.c | 24 +++-
1 file changed, 3 insertions(+), 21 deletions(-)
commit 5e043118736aba96a5186fd6c3523b4fefec5cc5
Merge: e4ca6427e1 ae2254e490
Author: Nick Mathewson
Date: Thu Jun 10 09:55:55 2021 -0400
Merge branch 'maint-0.4.5' into release-0.4.5
src/core/or/relay.c | 24 +++-
1 file changed, 3 insertions(+), 21 deletions(-)
commit ec696a95e58870862625a44f2c9152be2526414c
Merge: 1da8621c0a 0f2d45328d
Author: Nick Mathewson
Date: Thu Jun 10 08:53:07 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/ticket40389 | 3 +++
src/core/or/relay.c | 39 +++
2 files
commit 0f2d45328dfcb16acb4a517711413a6f0386487a
Merge: 31eaa81f59 adb248b6d6
Author: Nick Mathewson
Date: Thu Jun 10 08:52:39 2021 -0400
Merge branch 'maint-0.3.5' into maint-0.4.4
Conflicts resolved:
src/core/or/relay.c
changes/ticket40389 | 3 +++
commit f57b5c48e0aa01acd84a194fe4657a0d1cee04cf
Author: George Kadianakis
Date: Tue May 18 17:06:57 2021 +0300
Fix TROVE-2021-006: Out-of-bounds read on v3 desc parsing
---
changes/bug40392 | 4
src/feature/hs/hs_descriptor.c | 3 ++-
2 files changed, 6 insertions(+), 1
commit 436c18510f5c77e1ec340e9540243af9eb5e16c9
Merge: be54257cf9 1da8621c0a
Author: Nick Mathewson
Date: Thu Jun 10 08:42:15 2021 -0400
Merge branch 'maint-0.4.5' into release-0.4.5
changes/bug40391 | 9 +
src/core/or/circuitmux.c | 7 ---
2 files changed, 13
commit 1da8621c0aef1f3fa694802b2bbea888a8d82d99
Merge: e2d01aac9e 31eaa81f59
Author: Nick Mathewson
Date: Thu Jun 10 08:42:15 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/bug40391 | 9 +
src/core/or/circuitmux.c | 7 ---
2 files changed, 13
commit 7fdfc2ea5470c572a113321e19cdb5144b10cdd8
Merge: 520d5c108f c0aa9e0a1b
Author: Nick Mathewson
Date: Thu Jun 10 08:34:25 2021 -0400
Merge branch 'bug40390_035_squashed' into maint-0.3.5
changes/ticket40390 | 8
src/lib/crypt_ops/crypto_rand.c | 2 +-
2 files
commit d71bf986b4faf7cb3b654192bc67d5b674cfcf02
Merge: 7fdfc2ea54 4c06c619fa
Author: Nick Mathewson
Date: Thu Jun 10 08:41:59 2021 -0400
Merge branch 'bug40391_035' into maint-0.3.5
changes/bug40391 | 9 +
src/core/or/circuitmux.c | 8
2 files changed, 13
commit d60f8fe98a59ce13809e65de67e53b3dcf6199f0
Merge: c80b98520b 57a41348ee
Author: Nick Mathewson
Date: Thu Jun 10 08:21:48 2021 -0400
Merge branch 'maint-0.4.4' into maint-0.4.5
changes/geoip-2021-06-10 |3 +
src/config/geoip | 4764
1 - 100 of 244 matches
Mail list logo