From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 1 Mar 2017 14:10:54 +0000 (-0500)
Subject: Master: remove 2 more changes files that are merged in 0.3.0.4-rc
X-Git-Tag: tor-0.3.1.1-alpha~246
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10ccb2bb4be39504dcd309108a37a824e3f37c48;p=thirdparty%2Ftor.git

Master: remove 2 more changes files that are merged in 0.3.0.4-rc
---

diff --git a/changes/bug21415 b/changes/bug21415
deleted file mode 100644
index f0aa72f81f..0000000000
--- a/changes/bug21415
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfix (entry guards):
-    - Silence a BUG() warning when attempting to use a guard whose descriptor
-      we don't know and make this scenario more unlikely to happen. Fixes bug
-      21415; bugfix on 0.3.0.1-alpha.
diff --git a/changes/bug21581 b/changes/bug21581
deleted file mode 100644
index 1077719856..0000000000
--- a/changes/bug21581
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (testing):
-    - Restore support for test-network.sh on BSD and other systems without
-      bash. (But use bash if it's available.) This is a workaround until we
-      remove bash-specific code in 19699.
-      Fixes bug 21581; bugfix on 21562, not in any released version of tor.