summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-03-26 12:28:58 +0200
committerNick Mathewson <nickm@torproject.org>2017-03-26 12:28:58 +0200
commit47f587c4ca801c7e8aa469c9d4110c8c1f638de5 (patch)
tree7a7e5d4617850920a92c818ba8b4d4d9684ea82e /src
parent567a56ae2e59aef26b31829f300c5700c7923f7b (diff)
parent4f6025498dde54761967d00801616f33cf69f71c (diff)
downloadtor-47f587c4ca801c7e8aa469c9d4110c8c1f638de5.tar.gz
tor-47f587c4ca801c7e8aa469c9d4110c8c1f638de5.zip
Merge branch 'ticket21799' into maint-0.3.0
Diffstat (limited to 'src')
-rw-r--r--src/test/test_entrynodes.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index 249fd1f973..602aee9af3 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -584,6 +584,9 @@ test_entry_guard_parse_from_state_full(void *arg)
smartlist_t *text = smartlist_new();
char *joined = NULL;
+ // So nodes aren't expired
+ update_approx_time(1481621834);
+
MOCK(entry_guard_is_listed, mock_entry_guard_is_listed);
dummy_state = state;