diff --git a/changes/bug17683 b/changes/bug17683
new file mode 100644
index 0000000000..e9d47513ab
--- /dev/null
+++ b/changes/bug17683
@@ -0,0 +1,3 @@
+  o Minor bugfixes (TLS context):
+    - Assert when the TLS contexts fail to initialize. Fixes bug 17683;
+      bugfix on 0.0.6.
diff --git a/src/or/main.c b/src/or/main.c
index 3f166c819d..527e2b1ffe 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1609,7 +1609,7 @@ rotate_x509_certificate_callback(time_t now, const or_options_t *options)
   log_info(LD_GENERAL,"Rotating tls context.");
   if (router_initialize_tls_context() < 0) {
     log_warn(LD_BUG, "Error reinitializing TLS context");
-    /* XXX is it a bug here, that we just keep going? -RD */
+    tor_assert(0);
   }
 
   /* We also make sure to rotate the TLS connections themselves if they've