aboutsummaryrefslogtreecommitdiff
path: root/src/or/addressmap.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-01-13 09:42:23 -0500
committerNick Mathewson <nickm@torproject.org>2015-01-13 09:42:23 -0500
commit2e1ed0815d3f426e7e30b09f3c781425c76e72d5 (patch)
tree23328ce8847801ffb869913dc158ce33984d8add /src/or/addressmap.c
parentbba995e6660dbb49876886278f71d7d5a85f5f88 (diff)
downloadtor-2e1ed0815d3f426e7e30b09f3c781425c76e72d5.tar.gz
tor-2e1ed0815d3f426e7e30b09f3c781425c76e72d5.zip
Actually set *expires_out in addressmap_rewrite.
Fixes 14193; bugfix on 35d08e30d, which went into 0.2.3.17-beta.
Diffstat (limited to 'src/or/addressmap.c')
-rw-r--r--src/or/addressmap.c2
1 files changed, 1 insertions, 1 deletions
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);
}