(Also, regenerate trunnel stuff with trunnel 1.2. This just adds a few comments to our output.)
@@ -5,7 +5,7 @@ if test "x$TRUNNEL_PATH" != "x"; then
export PYTHONPATH
fi
-python -m trunnel ./src/trunnel/*.trunnel
+python -m trunnel --require-version=1.2 ./src/trunnel/*.trunnel
-python -m trunnel --write-c-files --target-dir=./src/ext/trunnel/
+python -m trunnel --require-version=1.2 --write-c-files --target-dir=./src/ext/trunnel/
@@ -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
*
+/* trunnel.c -- copied from Trunnel v1.2
/* trunnel.c -- Helper functions to implement trunnel.
* Copyright 2014, The Tor Project, Inc.
+/* trunnel.h -- copied from Trunnel v1.2
/* trunnel.h -- Public declarations for trunnel, to be included
* in trunnel header files.
@@ -1,5 +1,6 @@
-/* pwbox.c -- generated by Trunnel v1.1-dev.
+/* pwbox.c -- generated by Trunnel v1.2.
* https://gitweb.torproject.org/trunnel.git
*/
#include <stdlib.h>
#include "trunnel-impl.h"
-/* pwbox.h -- generated by by Trunnel v1.1-dev.
+/* pwbox.h -- generated by by Trunnel v1.2.
#ifndef TRUNNEL_PWBOX_H
#define TRUNNEL_PWBOX_H