From d87143f3199fe6be6e0a4907e82b25727622c857 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 13 Nov 2014 10:50:37 -0500
Subject: [PATCH] changes file for 10067

---
 changes/feature10067 | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 changes/feature10067

diff --git a/changes/feature10067 b/changes/feature10067
new file mode 100644
index 0000000000..3a387d0497
--- /dev/null
+++ b/changes/feature10067
@@ -0,0 +1,12 @@
+  o Major features (changed defaults):
+    - Prevent relay operators from unintentionally running exits: When
+      a relay is configured as an exit node, we now warn the user
+      unless the 'ExitRelay' option is set to 1. We warn even more
+      loudly if the relay is configured with the default exit policy,
+      since this tends to indicate accidental misconfiguration.
+      Setting 'ExitRelay' to 0 stops Tor from running as an exit relay.
+      Closes ticket 10067.
+
+  o Removed features:
+    - To avoid confusion with the 'ExitRelay' option, 'ExitNode' is no
+      longer silently accepted as an alias for 'ExitNodes'.