diff --git a/changes/bug14193 b/changes/bug14193
new file mode 100644
index 0000000000..a7006685f5
--- /dev/null
+++ b/changes/bug14193
@@ -0,0 +1,4 @@
+  o Minor bugfixes (client DNS):
+    - Report the correct cached DNS expiration times. Previously, we
+      would report everything as "never expires."  Fixes bug 14193;
+      bugfix on 0.2.3.17-beta.
diff --git a/src/or/addressmap.c b/src/or/addressmap.c
index 8ad24323b5..908d94faa1 100644
--- a/src/or/addressmap.c
+++ b/src/or/addressmap.c
@@ -431,7 +431,7 @@ addressmap_rewrite(char *address, size_t maxlen,
   if (exit_source_out)
     *exit_source_out = exit_source;
   if (expires_out)
-    *expires_out = TIME_MAX;
+    *expires_out = expires;
   return (rewrites > 0);
 }