commit e20fc286c0153b5faa37d98c7d1f088233945e57 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 31 08:56:14 2014 -0400

Re-run latest git trunnel to get fix from teor for #13577 --- src/ext/trunnel/trunnel.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index da4885c..a18d675 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