summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-02-04 11:54:38 -0500
committerNick Mathewson <nickm@torproject.org>2013-02-04 11:54:38 -0500
commit898f2d7c278442d2c4fbdf0126eaa406d503d088 (patch)
treef6d95b0ea38afb7e09ff1e7c8139ee7183be1725 /src/or
parentb64dc35b5c27feb4a2df41934d644bc4957921bb (diff)
parent7cde094fd538c5c68f37071c94f39b55020d786e (diff)
downloadtor-898f2d7c278442d2c4fbdf0126eaa406d503d088.tar.gz
tor-898f2d7c278442d2c4fbdf0126eaa406d503d088.zip
Merge branch 'bug8153'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/onion.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/onion.c b/src/or/onion.c
index b9f5aa6c7d..d4a65022fc 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -82,6 +82,8 @@ have_room_for_onionskin(uint16_t type)
if (type == ONION_HANDSHAKE_TYPE_TAP &&
tap_usec / 1000 > (uint64_t)options->MaxOnionQueueDelay * 2 / 3)
return 0;
+#else
+ (void) type;
#endif
return 1;