From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 31 Oct 2014 12:56:14 +0000 (-0400)
Subject: Re-run latest git trunnel to get fix from teor for #13577
X-Git-Tag: tor-0.2.6.2-alpha~122
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e20fc286c0153b5faa37d98c7d1f088233945e57;p=thirdparty%2Ftor.git

Re-run latest git trunnel to get fix from teor for #13577
---

diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index da4885ca01..a18d67584e 100644
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,4 +1,4 @@
-/* trunnel.c -- copied from Trunnel v1.2
+/* trunnel.c -- copied from Trunnel v1.4-pre
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -75,7 +75,8 @@ uint64_t
 trunnel_htonll(uint64_t a)
 {
 #ifdef IS_LITTLE_ENDIAN
-  return trunnel_htonl(a>>32) | (((uint64_t)trunnel_htonl(a))<<32);
+  return trunnel_htonl((uint32_t)(a>>32))
+    | (((uint64_t)trunnel_htonl((uint32_t)a))<<32);
 #else
   return a;
 #endif