diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-31 08:56:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-31 08:56:14 -0400 |
| commit | e20fc286c0153b5faa37d98c7d1f088233945e57 (patch) | |
| tree | f2d2efb9191b4fd8dfb546303363d95c407304f6 /src/ext | |
| parent | 6f87aa3371ff3542c58c0083e9f44c470103d94d (diff) | |
| download | tor-e20fc286c0153b5faa37d98c7d1f088233945e57.tar.gz tor-e20fc286c0153b5faa37d98c7d1f088233945e57.zip | |
Re-run latest git trunnel to get fix from teor for #13577
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/trunnel/trunnel.c | 5 |
1 files changed, 3 insertions, 2 deletions
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 |