summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-12-06 15:43:50 -0500
committerNick Mathewson <nickm@torproject.org>2017-12-06 15:43:50 -0500
commit5f518c69aa634ee3487c2d8b40d2b4b0c3317f52 (patch)
tree9dba63fe2ade29c8506ecdfdd09a73b3e33a348a /src/or/or.h
parentc470a6d278c6340c2e2d10cac0796e6041b88dee (diff)
parent9c37e8c8d14a86d9cbbc6b203f4883c934391a3b (diff)
downloadtor-5f518c69aa634ee3487c2d8b40d2b4b0c3317f52.tar.gz
tor-5f518c69aa634ee3487c2d8b40d2b4b0c3317f52.zip
Merge remote-tracking branch 'public/monotime_coarse_stamps'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/or.h b/src/or/or.h
index e10decf734..b078022326 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1166,8 +1166,8 @@ typedef struct packed_cell_t {
/** Next cell queued on this circuit. */
TOR_SIMPLEQ_ENTRY(packed_cell_t) next;
char body[CELL_MAX_NETWORK_SIZE]; /**< Cell as packed for network. */
- uint32_t inserted_time; /**< Time (in milliseconds since epoch, with high
- * bits truncated) when this cell was inserted. */
+ uint32_t inserted_timestamp; /**< Time (in timestamp units) when this cell
+ * was inserted */
} packed_cell_t;
/** A queue of cells on a circuit, waiting to be added to the