summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-09-23 01:48:30 -0400
committerNick Mathewson <nickm@torproject.org>2013-09-23 01:48:30 -0400
commit5b1c257d9aea56b66b9069c8593fb9a4f00192a3 (patch)
tree0493e7682238a0f0ddebc73dae476cfae0d5c4bb
parentc4031ee847ab834445d809ace0efc09b9fd46c7c (diff)
parent116e6af7a7024b4731ce6af75e8c5c5167314048 (diff)
downloadtor-5b1c257d9aea56b66b9069c8593fb9a4f00192a3.tar.gz
tor-5b1c257d9aea56b66b9069c8593fb9a4f00192a3.zip
Merge remote-tracking branch 'origin/maint-0.2.4'
-rw-r--r--src/or/rendclient.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index b1d4bf31df..385c462dc7 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -250,7 +250,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
v3_shift += 2+REND_DESC_COOKIE_LEN;
}
if (rend_client_should_send_timestamp()) {
- time_t now = (uint32_t)time(NULL);
+ uint32_t now = (uint32_t)time(NULL);
now += 300;
now -= now % 600;
set_uint32(tmp+v3_shift+1, htonl(now));