summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2023-08-15 15:29:46 +0000
committerDavid Goulet <dgoulet@torproject.org>2023-08-15 15:29:46 +0000
commitc9dceca281a0c6107dc73073c091c263adbdcb84 (patch)
treea3a09d9e1c1f4d39bd3ca62e68ac763eb94efbfd /changes
parent67bfb87dcbbdd7808446dc452f028b857701f2fc (diff)
parent51459b543f2a014d7e75ded9795b0cf29d07e16a (diff)
downloadtor-c9dceca281a0c6107dc73073c091c263adbdcb84.tar.gz
tor-c9dceca281a0c6107dc73073c091c263adbdcb84.zip
Merge branch 'bug40834' into 'main'
Revert "Nullify on_circuit if last conflux leg" See merge request tpo/core/tor!744
Diffstat (limited to 'changes')
-rw-r--r--changes/bug408345
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug40834 b/changes/bug40834
new file mode 100644
index 0000000000..5c37e0c6a4
--- /dev/null
+++ b/changes/bug40834
@@ -0,0 +1,5 @@
+ o Major bugfixes (conflux):
+ - Fix a relay-side crash caused by side effects of the fix for bug
+ 40827. Reverts part of that fix that caused the crash and adds
+ additional log messages to help find the root cause. Fixes bug
+ 40834; bugfix on 0.4.8.3-rc.