From 3323615dd2bffa54970624bb6eb2465f4064d812 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 23 Jul 2015 12:05:06 -0400
Subject: [PATCH] Re-run trunnel to capture change for msvc.

---
 src/ext/trunnel/trunnel-impl.h | 4 ++--
 src/ext/trunnel/trunnel.c      | 2 +-
 src/ext/trunnel/trunnel.h      | 2 +-
 src/trunnel/ed25519_cert.c     | 2 +-
 src/trunnel/ed25519_cert.h     | 2 +-
 src/trunnel/link_handshake.c   | 2 +-
 src/trunnel/link_handshake.h   | 2 +-
 src/trunnel/pwbox.c            | 2 +-
 src/trunnel/pwbox.h            | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index d98dc34fa2..ab790f86b0 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.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 ce8db4d248..dc1c9fc2da 100644
--- 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 78da904f4f..776e2cff4e 100644
--- 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 6931eae722..294d20be92 100644
--- 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 7839af4bee..fb006868ea 100644
--- 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 f53161a3e5..5ba1c17c4a 100644
--- 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 6da6599e5a..b4f5f19830 100644
--- 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 28a4f74a7b..9c84b904fe 100644
--- 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 a6964b53b8..4dfb364908 100644
--- 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.
  */