aboutsummaryrefslogtreecommitdiff
path: root/src/ext/trunnel
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-10-26 11:06:45 -0400
committerNick Mathewson <nickm@torproject.org>2016-10-26 11:06:45 -0400
commit206a9726b112d674b712949fadc653def57f427b (patch)
tree54bb8b39548cf7f782b14562787b59879fea53a6 /src/ext/trunnel
parenta5f07a6c2a2b937f58548680f9b87b1e75b3c8f8 (diff)
downloadtor-206a9726b112d674b712949fadc653def57f427b.tar.gz
tor-206a9726b112d674b712949fadc653def57f427b.zip
Regenerate trunnel code with trunnel 1.5
Diffstat (limited to 'src/ext/trunnel')
-rw-r--r--src/ext/trunnel/trunnel-impl.h3
-rw-r--r--src/ext/trunnel/trunnel.c2
-rw-r--r--src/ext/trunnel/trunnel.h2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index 3ffde6e09b..0cbd4f5637 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.6
+/* trunnel-impl.h -- copied from Trunnel v1.5
* https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file.
*/
@@ -17,6 +17,7 @@
#include "trunnel.h"
#include <assert.h>
#include <string.h>
+#include <stdlib.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 3994422643..f80a587a97 100644
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,4 +1,4 @@
-/* trunnel.c -- copied from Trunnel v1.4.6
+/* trunnel.c -- copied from Trunnel v1.5
* https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file.
*/
diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h
index 41068b8fb3..afd404db0f 100644
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,4 +1,4 @@
-/* trunnel.h -- copied from Trunnel v1.4.6
+/* trunnel.h -- copied from Trunnel v1.5
* https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file.
*/