summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2023-06-14 09:45:27 -0400
committerDavid Goulet <dgoulet@torproject.org>2023-06-14 09:45:27 -0400
commit44368a727a85f9f24dc45c11f31958005d158ed6 (patch)
tree22af83259640a0d11dd66c3210d71f5c5fbd8ae7 /changes
parentd5306e107fcd8b3aba64444f3788b48e210cada0 (diff)
parent7ffda7512d33b6e0c1417e8eff623b280d1120da (diff)
downloadtor-44368a727a85f9f24dc45c11f31958005d158ed6.tar.gz
tor-44368a727a85f9f24dc45c11f31958005d158ed6.zip
Merge branch 'tor-gitlab/mr/721'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug4080110
-rw-r--r--changes/bug408104
2 files changed, 14 insertions, 0 deletions
diff --git a/changes/bug40801 b/changes/bug40801
new file mode 100644
index 0000000000..681c10c7d4
--- /dev/null
+++ b/changes/bug40801
@@ -0,0 +1,10 @@
+ o Minor bugfixes (conflux):
+ - Fix stream attachment order when creating conflux circuits, so that
+ stream attachment happens after finishing the full link handshake,
+ rather than upon set finalization. Fixes bug 40801; bugfix on
+ 0.4.8.1-alpha.
+ - Remove a "BUG" warning from conflux_pick_first_leg that can be
+ triggered by broken or malicious clients. Fixes bug 40801; bugfix
+ on 0.4.8.1-alpha.
+ - Fix a case where we were resuming reading on edge connections that
+ were already marked for close. Fixes bug 40801; bugfix on 0.4.8.1-alpha.
diff --git a/changes/bug40810 b/changes/bug40810
new file mode 100644
index 0000000000..76859abe0c
--- /dev/null
+++ b/changes/bug40810
@@ -0,0 +1,4 @@
+ o Minor bugfixes (conflux):
+ - Handle legs being closed or destroyed before computing an RTT
+ (resulting in warns about too many legs). Fixes bug 40810; bugfix on
+ 0.4.8.1-alpha.