aboutsummaryrefslogtreecommitdiff
path: root/src/ext/trunnel/trunnel.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-09-11 16:52:24 -0400
committerNick Mathewson <nickm@torproject.org>2016-09-11 16:52:24 -0400
commit64521a9d355da9f21d81c8a82056e544372685b2 (patch)
treea3ce5b736e41db284f4ae2b5a925ac5195c77acf /src/ext/trunnel/trunnel.h
parent77e2be06f6ff9c7328144fe5df3e3bac64106449 (diff)
parent25513ae174d80a62ca0a8dcca52683089be95ea3 (diff)
downloadtor-64521a9d355da9f21d81c8a82056e544372685b2.tar.gz
tor-64521a9d355da9f21d81c8a82056e544372685b2.zip
Merge remote-tracking branch 'public/solaris_warnings_028'
Diffstat (limited to 'src/ext/trunnel/trunnel.h')
-rw-r--r--src/ext/trunnel/trunnel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ext/trunnel/trunnel.h b/src/ext/trunnel/trunnel.h
index 62e87ee50c..41068b8fb3 100644
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,4 +1,4 @@
-/* trunnel.h -- copied from Trunnel v1.4.4
+/* trunnel.h -- copied from Trunnel v1.4.6
* https://gitweb.torproject.org/trunnel.git
* You probably shouldn't edit this file.
*/