From 2126feaabc3e07dc8f7ad712256de496fbcfb976 Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Fri, 25 Jul 2014 12:22:05 -0400
Subject: [PATCH] get rid of already-merged prop221 changes file

---
 changes/prop221 | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 changes/prop221

diff --git a/changes/prop221 b/changes/prop221
deleted file mode 100644
index b2bf44bc37..0000000000
--- a/changes/prop221
+++ /dev/null
@@ -1,6 +0,0 @@
-  o Minor features:
-    - Stop sending the CREATE_FAST cells by default; instead, use a
-      parameter in the consensus to decide whether to use
-      CREATE_FAST. This can improve security on connections where
-      Tor's circuit handshake is stronger than the available TLS
-      connection security levels. Implements proposal 221.