summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2012-11-10 03:24:41 -0800
committerAndrea Shepard <andrea@torproject.org>2012-11-10 03:24:41 -0800
commit0523c8de7d7f775e9a89134340f88ae00bde158b (patch)
tree8a145feaf75ea9f44e03f43dbffbb5e32ebc9b17 /changes
parent713736a6a738aa371176241e11e2f7e06f63523b (diff)
parentfc1a9a13cf427ec7a319086c820408847fbc189b (diff)
downloadtor-0523c8de7d7f775e9a89134340f88ae00bde158b.tar.gz
tor-0523c8de7d7f775e9a89134340f88ae00bde158b.zip
Merge branch 'check_for_orconn_on_close_squashed' of ssh://git-rw.torproject.org/user/andrea/tor
Diffstat (limited to 'changes')
-rw-r--r--changes/check_for_orconn_on_close4
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/check_for_orconn_on_close b/changes/check_for_orconn_on_close
new file mode 100644
index 0000000000..4d76d5eb5c
--- /dev/null
+++ b/changes/check_for_orconn_on_close
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Check for closing an or_connection_t without going through correct
+ channel functions; emit a warning and then call
+ connection_or_close_for_error() so we don't assert as in 7212 and 7267.