aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-04-16 23:13:27 -0400
committerNick Mathewson <nickm@torproject.org>2014-04-16 23:13:27 -0400
commit74ddd5f739696749409c933f82cf3a93152da6cc (patch)
tree8d85a2c549485cb47abba78eefe5f35869552d01 /changes
parent10174b00e7258cc8184e85c37a2a39b04a0df92e (diff)
parentf36e93206a20b37321b372802032d3dec481856d (diff)
downloadtor-74ddd5f739696749409c933f82cf3a93152da6cc.tar
tor-74ddd5f739696749409c933f82cf3a93152da6cc.tar.gz
Merge remote-tracking branch 'andrea/bug11306'
Diffstat (limited to 'changes')
-rw-r--r--changes/bug113064
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug11306 b/changes/bug11306
new file mode 100644
index 000000000..bf8ea4011
--- /dev/null
+++ b/changes/bug11306
@@ -0,0 +1,4 @@
+ o Bugfixes:
+ - When closing all connections on setting DisableNetwork to 1, use
+ connection_or_close_normally() rather than closing orconns out from
+ under the channel layer. Fixes bug #11306.