diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-28 10:52:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-28 10:52:43 -0400 |
| commit | 25513ae174d80a62ca0a8dcca52683089be95ea3 (patch) | |
| tree | ab542787612ca80fd2d0fc54c1a04bc12d421a2c /src/ext | |
| parent | 94bff894f9e127888f15ec2333f86d0388e4da7d (diff) | |
| download | tor-25513ae174d80a62ca0a8dcca52683089be95ea3.tar.gz tor-25513ae174d80a62ca0a8dcca52683089be95ea3.zip | |
Re-run trunnel.
Diffstat (limited to 'src/ext')
| -rw-r--r-- | src/ext/trunnel/trunnel-impl.h | 8 | ||||
| -rw-r--r-- | src/ext/trunnel/trunnel.c | 4 | ||||
| -rw-r--r-- | src/ext/trunnel/trunnel.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h index dfe5f89e1a..3ffde6e09b 100644 --- a/src/ext/trunnel/trunnel-impl.h +++ b/src/ext/trunnel/trunnel-impl.h @@ -1,4 +1,4 @@ -/* trunnel-impl.h -- copied from Trunnel v1.4.4 +/* trunnel-impl.h -- copied from Trunnel v1.4.6 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -11,12 +11,12 @@ #ifndef TRUNNEL_IMPL_H_INCLUDED_ #define TRUNNEL_IMPL_H_INCLUDED_ -#include "trunnel.h" -#include <assert.h> -#include <string.h> #ifdef TRUNNEL_LOCAL_H #include "trunnel-local.h" #endif +#include "trunnel.h" +#include <assert.h> +#include <string.h> #if defined(_MSC_VER) && (_MSC_VER < 1600) #define uint8_t unsigned char diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c index 0ed75aa9a4..3994422643 100644 --- a/src/ext/trunnel/trunnel.c +++ b/src/ext/trunnel/trunnel.c @@ -1,4 +1,4 @@ -/* trunnel.c -- copied from Trunnel v1.4.4 +/* trunnel.c -- copied from Trunnel v1.4.6 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ @@ -10,9 +10,9 @@ * See trunnel-impl.h for documentation of these functions. */ +#include "trunnel-impl.h" #include <stdlib.h> #include <string.h> -#include "trunnel-impl.h" #if defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && \ __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h index 62e87ee50c..41068b8fb3 100644 --- a/src/ext/trunnel/trunnel.h +++ b/src/ext/trunnel/trunnel.h @@ -1,4 +1,4 @@ -/* trunnel.h -- copied from Trunnel v1.4.4 +/* trunnel.h -- copied from Trunnel v1.4.6 * https://gitweb.torproject.org/trunnel.git * You probably shouldn't edit this file. */ |