Use --require-version to prevent running trunnel pre-1.2

(Also, regenerate trunnel stuff with trunnel 1.2.  This just adds a
few comments to our output.)

3 files changed, 12 insertions, 0 deletions

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index 4dd710f4a7..c88ee3988e 100644
--- a/src/ext/trunnel/trunnel-impl.h
+++ b/src/ext/trunnel/trunnel-impl.h
@@ -1,3 +1,7 @@
+/* trunnel-impl.h -- copied from Trunnel v1.2
+ * https://gitweb.torproject.org/trunnel.git
+ * You probably shouldn't edit this file.
+ */
 /* trunnel-impl.h -- Implementation helpers for trunnel, included by
  * generated trunnel files
  *
diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index 4bc28e3f04..da4885ca01 100644
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,3 +1,7 @@
+/* trunnel.c -- copied from Trunnel v1.2
+ * https://gitweb.torproject.org/trunnel.git
+ * You probably shouldn't edit this file.
+ */
 /* trunnel.c -- Helper functions to implement trunnel.
  *
  * Copyright 2014, The Tor Project, Inc.
diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h
index 0a78e6cfca..f51cade03f 100644
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,3 +1,7 @@
+/* trunnel.h -- copied from Trunnel v1.2
+ * https://gitweb.torproject.org/trunnel.git
+ * You probably shouldn't edit this file.
+ */
 /* trunnel.h -- Public declarations for trunnel, to be included
  * in trunnel header files.