diff --git a/changes/bug24581 b/changes/bug24581
new file mode 100644
index 0000000000..d8ddce3cc9
--- /dev/null
+++ b/changes/bug24581
@@ -0,0 +1,7 @@
+  o Major features (embedding):
+    - Tor now has support for restarting in the same process.
+      Controllers that run Tor using the "tor_api.h" interface can now
+      restart Tor after Tor has exited. This support is incomplete, however:
+      we have fixed the crash bugs that prevented it from working at all
+      before, but many bugs probably remain. Implements ticket 24581.
+
diff --git a/src/or/tor_api.h b/src/or/tor_api.h
index b12ed718c1..e7d70c2a61 100644
--- a/src/or/tor_api.h
+++ b/src/or/tor_api.h
@@ -71,8 +71,9 @@ void tor_main_configuration_free(tor_main_configuration_t *cfg);
  * fix it.
  *
  * BUG 23847: You can only call tor_main() once in a single process; if it
- * returns and you call it again, you may crash. This is not intended
- * long-term behavior; we are trying to fix it.
+ * returns and you call it again, you may crash, or you may encounter other
+ * unexpected behavior.  This is not intended long-term behavior; we are
+ * trying to fix it.
  *
  * LIMITATION: You cannot run more than one instance of Tor in the same
  * process at the same time. Concurrent calls will cause undefined behavior.