summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2012-11-07 11:43:04 -0800
committerAndrea Shepard <andrea@torproject.org>2012-11-07 11:43:04 -0800
commit9f3f5372b880b3372fd7b9fc98bd3d78f969390a (patch)
tree061b2f60cac277f8a64792e7845497be3accc0da /changes
parentcd054ceadaa4723f076c7050160424b356b985ca (diff)
parent3b270e86be0ab8edcda2907f41ca3abb57f8c59a (diff)
downloadtor-9f3f5372b880b3372fd7b9fc98bd3d78f969390a.tar.gz
tor-9f3f5372b880b3372fd7b9fc98bd3d78f969390a.zip
Merge branch 'bug7350' of ssh://git-rw.torproject.org/user/andrea/tor
Diffstat (limited to 'changes')
-rw-r--r--changes/bug73505
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug7350 b/changes/bug7350
new file mode 100644
index 0000000000..9c2f20dab6
--- /dev/null
+++ b/changes/bug7350
@@ -0,0 +1,5 @@
+ o Minor bugfixes:
+ - Avoid a possible assert that can occur when channel_send_destroy() is
+ called on a channel in CHANNEL_STATE_CLOSING, CHANNEL_STATE_CLOSED
+ or CHANNEL_STATE_ERROR when the Tor process is resumed after being
+ blocked for a long interval. Fixes bug 7350.