From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 17 Apr 2014 03:14:56 +0000 (-0400)
Subject: Attribute 13304 and 13306 to 0.2.4.4-alpha.
X-Git-Tag: tor-0.2.5.4-alpha~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=250b84b8a8b3bc9d50859459054aecfe8473e7cc;p=thirdparty%2Ftor.git

Attribute 13304 and 13306 to 0.2.4.4-alpha.
---

diff --git a/changes/bug11304 b/changes/bug11304
index 2ea165f872..4930dd6073 100644
--- a/changes/bug11304
+++ b/changes/bug11304
@@ -2,4 +2,4 @@
     - If write_to_buf() in connection_write_to_buf_impl_() ever fails,
       check if it's an or_connection_t and correctly call
       connection_or_close_for_error() rather than connection_mark_for_close()
-      directly.  Fixes bug #11304.
+      directly.  Fixes bug #11304; bugfix on 0.2.4.4-alpha.
diff --git a/changes/bug11306 b/changes/bug11306
index bf8ea40114..5937938e45 100644
--- a/changes/bug11306
+++ b/changes/bug11306
@@ -1,4 +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.
+      under the channel layer.  Fixes bug #11306; bugfix on 0.2.4.4-alpha.