Re-run trunnel to capture change for msvc.

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index d98dc34fa246942f939ffe8f49105c4283f71522..ab790f86b04a688ab985abc4d8d6783a44c752bc 100644 (file)
--- 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.1
+/* trunnel-impl.h -- copied from Trunnel v1.4.2
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -18,7 +18,7 @@
 #include "trunnel-local.h"
 #endif
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && (_MSC_VER < 1600)
 #define uint8_t unsigned char
 #define uint16_t unsigned short
 #define uint32_t unsigned int

diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index ce8db4d248ce72775e90d4fdddf23eeee50b27d3..dc1c9fc2dabd280d794f8b42b175fc277ae6b1c3 100644 (file)
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,4 +1,4 @@
-/* trunnel.c -- copied from Trunnel v1.4.1
+/* trunnel.c -- copied from Trunnel v1.4.2
  * 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 78da904f4f5b397857dcd102d06c515cb62136a6..776e2cff4e7a94146b97a3a0f2fb2137cb1deebe 100644 (file)
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,4 +1,4 @@
-/* trunnel.h -- copied from Trunnel v1.4.1
+/* trunnel.h -- copied from Trunnel v1.4.2
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/ed25519_cert.c b/src/trunnel/ed25519_cert.c
index 6931eae722bdc015b49c4b0acadb677e13305cb7..294d20be92770a7d0497b91941b7d4f4ea03d9c3 100644 (file)
--- a/src/trunnel/ed25519_cert.c
+++ b/src/trunnel/ed25519_cert.c
@@ -1,4 +1,4 @@
-/* ed25519_cert.c -- generated by Trunnel v1.4.1.
+/* ed25519_cert.c -- generated by Trunnel v1.4.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h
index 7839af4beee0eaf1f33227f056160cc5932641be..fb006868eabf018bb3cdd972969957a157f23920 100644 (file)
--- a/src/trunnel/ed25519_cert.h
+++ b/src/trunnel/ed25519_cert.h
@@ -1,4 +1,4 @@
-/* ed25519_cert.h -- generated by by Trunnel v1.4.1.
+/* ed25519_cert.h -- generated by by Trunnel v1.4.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/link_handshake.c b/src/trunnel/link_handshake.c
index f53161a3e5d6229229d419a60f80edb9848d7de9..5ba1c17c4a0c3724a7c6fd8d3b6b6048770900c8 100644 (file)
--- a/src/trunnel/link_handshake.c
+++ b/src/trunnel/link_handshake.c
@@ -1,4 +1,4 @@
-/* link_handshake.c -- generated by Trunnel v1.4.1.
+/* link_handshake.c -- generated by Trunnel v1.4.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/link_handshake.h b/src/trunnel/link_handshake.h
index 6da6599e5a0cc7f6ed92c8a0252410e7b26440ae..b4f5f19830150aa6bf1f292045eab79e1393e10b 100644 (file)
--- a/src/trunnel/link_handshake.h
+++ b/src/trunnel/link_handshake.h
@@ -1,4 +1,4 @@
-/* link_handshake.h -- generated by by Trunnel v1.4.1.
+/* link_handshake.h -- generated by by Trunnel v1.4.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/pwbox.c b/src/trunnel/pwbox.c
index 28a4f74a7b31cae8f0d0c9a5a885c3e12ee405d0..9c84b904fe753802b6281a3c4a17523ed5da860a 100644 (file)
--- a/src/trunnel/pwbox.c
+++ b/src/trunnel/pwbox.c
@@ -1,4 +1,4 @@
-/* pwbox.c -- generated by Trunnel v1.4.1.
+/* pwbox.c -- generated by Trunnel v1.4.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/pwbox.h b/src/trunnel/pwbox.h
index a6964b53b83cf6ccd87c143635755eb4a09e0d17..4dfb3649083e7d337f9289eee9164576152dc508 100644 (file)
--- a/src/trunnel/pwbox.h
+++ b/src/trunnel/pwbox.h
@@ -1,4 +1,4 @@
-/* pwbox.h -- generated by by Trunnel v1.4.1.
+/* pwbox.h -- generated by by Trunnel v1.4.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */