From 90daa28df403472d4a6aa7067ce6ab3264cdbe55 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 20 Oct 2017 11:39:11 -0400
Subject: [PATCH] Changes file for ticket 23848

---
 changes/bug23848 | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 changes/bug23848

diff --git a/changes/bug23848 b/changes/bug23848
new file mode 100644
index 0000000000..e2aec687ca
--- /dev/null
+++ b/changes/bug23848
@@ -0,0 +1,8 @@
+  o Minor features (embedding):
+    - On most errors that would cause Tor to exit, it now tries to return
+      from the tor_main() function, rather than calling the system exit()
+      function.  Most users won't notice a difference here, but it should
+      make a significant difference on platforms that try to run Tor inside
+      a separate thread: they should now be able to survive Tor's exit
+      conditions rather than having Tor shut down the entire process.
+      Closes ticket 23848.