Re-run trunnel. Cosmetic changes only.

diff --git a/src/ext/trunnel/trunnel-impl.h b/src/ext/trunnel/trunnel-impl.h
index 85c847b3fd445a8c3772ddae538d4e2ed436c009..b233cf763172b93f2c235aef669eedb244ea3146 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.5.1
+/* trunnel-impl.h -- copied from Trunnel v1.5.2
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/ext/trunnel/trunnel.c b/src/ext/trunnel/trunnel.c
index 6a4241724127f99818dd85acea17ece22c8911d8..b749d8136f56337230726093a989beb699a7a236 100644 (file)
--- a/src/ext/trunnel/trunnel.c
+++ b/src/ext/trunnel/trunnel.c
@@ -1,4 +1,4 @@
-/* trunnel.c -- copied from Trunnel v1.5.1
+/* trunnel.c -- copied from Trunnel v1.5.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 dd78553c77d1f327052b7c932145728ecd35bff7..32c80bac2370a3baa5594b5932de3abc4e1b25ca 100644 (file)
--- a/src/ext/trunnel/trunnel.h
+++ b/src/ext/trunnel/trunnel.h
@@ -1,4 +1,4 @@
-/* trunnel.h -- copied from Trunnel v1.5.1
+/* trunnel.h -- copied from Trunnel v1.5.2
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/channelpadding_negotiation.c b/src/trunnel/channelpadding_negotiation.c
index 02fd823bf65cebc8903f1f64f1fe37aa4e6cb9ca..59e6b3838490b940847e116d74285a44b861445e 100644 (file)
--- a/src/trunnel/channelpadding_negotiation.c
+++ b/src/trunnel/channelpadding_negotiation.c
@@ -1,4 +1,4 @@
-/* channelpadding_negotiation.c -- generated by Trunnel v1.5.1.
+/* channelpadding_negotiation.c -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -13,7 +13,7 @@
   } while (0)
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
-/* If we're runnning a static analysis tool, we don't want it to complain
+/* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
 int channelpaddingnegotiation_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || channelpaddingnegotiation_deadcode_dummy__

diff --git a/src/trunnel/channelpadding_negotiation.h b/src/trunnel/channelpadding_negotiation.h
index 631c99670cc19e1938ba9de6e34b63849ba045bf..fcfc232feaeb48de6224b9e0afb9381184016be3 100644 (file)
--- a/src/trunnel/channelpadding_negotiation.h
+++ b/src/trunnel/channelpadding_negotiation.h
@@ -1,4 +1,4 @@
-/* channelpadding_negotiation.h -- generated by by Trunnel v1.5.1.
+/* channelpadding_negotiation.h -- generated by Trunnel v1.5.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 ee02fda64636173ef46571101bc5e80616368200..1276c7a5052ea553ed9a65de6e49399b87d32192 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.5.1.
+/* ed25519_cert.c -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -13,7 +13,7 @@
   } while (0)
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
-/* If we're runnning a static analysis tool, we don't want it to complain
+/* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
 int edcert_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || edcert_deadcode_dummy__

diff --git a/src/trunnel/ed25519_cert.h b/src/trunnel/ed25519_cert.h
index 782bd595850dd0424771a7ff4611991827d62bad..e086c6fcedc050bc3d392305f33d944562626413 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.5.1.
+/* ed25519_cert.h -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_common.c b/src/trunnel/hs/cell_common.c
index b7f19ffc6066f306c47ea0c364eead4ff82edae1..af223560c1083f51fda9add88acd1f9ade3e1be2 100644 (file)
--- a/src/trunnel/hs/cell_common.c
+++ b/src/trunnel/hs/cell_common.c
@@ -1,4 +1,4 @@
-/* cell_common.c -- generated by Trunnel v1.5.1.
+/* cell_common.c -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -13,7 +13,7 @@
   } while (0)
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
-/* If we're runnning a static analysis tool, we don't want it to complain
+/* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
 int cellcommon_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || cellcommon_deadcode_dummy__

diff --git a/src/trunnel/hs/cell_common.h b/src/trunnel/hs/cell_common.h
index 4d98a54cf4cc51806ccc41b01db967de57352cb8..e08eedfdb3b57e220ad101ff7f46be2be7e934ac 100644 (file)
--- a/src/trunnel/hs/cell_common.h
+++ b/src/trunnel/hs/cell_common.h
@@ -1,4 +1,4 @@
-/* cell_common.h -- generated by by Trunnel v1.5.1.
+/* cell_common.h -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_establish_intro.c b/src/trunnel/hs/cell_establish_intro.c
index 22e198c3690cfd2d18df8dd6eec4b8c95f73d699..ae3b7b1bc8fe5cf14768daa991d6dddd968f18cc 100644 (file)
--- a/src/trunnel/hs/cell_establish_intro.c
+++ b/src/trunnel/hs/cell_establish_intro.c
@@ -1,4 +1,4 @@
-/* cell_establish_intro.c -- generated by Trunnel v1.5.1.
+/* cell_establish_intro.c -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -13,7 +13,7 @@
   } while (0)
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
-/* If we're runnning a static analysis tool, we don't want it to complain
+/* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
 int cellestablishintro_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || cellestablishintro_deadcode_dummy__

diff --git a/src/trunnel/hs/cell_establish_intro.h b/src/trunnel/hs/cell_establish_intro.h
index 2f0d8936593e805247874512d2f84ede3598c939..ccaef5488c18f49bf62b374afa0b56058d73186e 100644 (file)
--- a/src/trunnel/hs/cell_establish_intro.h
+++ b/src/trunnel/hs/cell_establish_intro.h
@@ -1,4 +1,4 @@
-/* cell_establish_intro.h -- generated by by Trunnel v1.5.1.
+/* cell_establish_intro.h -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_introduce1.c b/src/trunnel/hs/cell_introduce1.c
index 7501f6f19678f53fd1efbb0c03359e8be2a2c104..358b355cda824ab544ba53214f272f3582091f17 100644 (file)
--- a/src/trunnel/hs/cell_introduce1.c
+++ b/src/trunnel/hs/cell_introduce1.c
@@ -1,4 +1,4 @@
-/* cell_introduce1.c -- generated by Trunnel v1.5.1.
+/* cell_introduce1.c -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -13,7 +13,7 @@
   } while (0)
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
-/* If we're runnning a static analysis tool, we don't want it to complain
+/* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
 int cellintroduce_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || cellintroduce_deadcode_dummy__

diff --git a/src/trunnel/hs/cell_introduce1.h b/src/trunnel/hs/cell_introduce1.h
index cca825a431f8841fd49fa722dd0defab1813e136..fa218adc6d9bc6956e25f95ed37b879be4ae9347 100644 (file)
--- a/src/trunnel/hs/cell_introduce1.h
+++ b/src/trunnel/hs/cell_introduce1.h
@@ -1,4 +1,4 @@
-/* cell_introduce1.h -- generated by by Trunnel v1.5.1.
+/* cell_introduce1.h -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */

diff --git a/src/trunnel/hs/cell_rendezvous.c b/src/trunnel/hs/cell_rendezvous.c
index e4d3244bd118f8cd72e40c600ccd49283ff943cd..53cb609138383d55c01db7fa8f1d311e1ab31957 100644 (file)
--- a/src/trunnel/hs/cell_rendezvous.c
+++ b/src/trunnel/hs/cell_rendezvous.c
@@ -1,4 +1,4 @@
-/* cell_rendezvous.c -- generated by Trunnel v1.5.1.
+/* cell_rendezvous.c -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -13,7 +13,7 @@
   } while (0)
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
-/* If we're runnning a static analysis tool, we don't want it to complain
+/* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
 int cellrendezvous_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || cellrendezvous_deadcode_dummy__

diff --git a/src/trunnel/hs/cell_rendezvous.h b/src/trunnel/hs/cell_rendezvous.h
index 5dcc6539b6fad707a8f05bd78c9da9db185a36f8..39e14da25b6b79f1dc0cbf0c3fadb8bf4758d4b2 100644 (file)
--- a/src/trunnel/hs/cell_rendezvous.h
+++ b/src/trunnel/hs/cell_rendezvous.h
@@ -1,4 +1,4 @@
-/* cell_rendezvous.h -- generated by by Trunnel v1.5.1.
+/* cell_rendezvous.h -- generated by Trunnel v1.5.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 887f710d9c35d5f5d9ed9c4a390d5f792d91899d..03ead31c6268d6903c739c5e1a8cd40daade7f89 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.5.1.
+/* link_handshake.c -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -13,7 +13,7 @@
   } while (0)
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
-/* If we're runnning a static analysis tool, we don't want it to complain
+/* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
 int linkhandshake_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || linkhandshake_deadcode_dummy__

diff --git a/src/trunnel/link_handshake.h b/src/trunnel/link_handshake.h
index 418662631abaca681a83339089e654b2ecf1ace9..6a23483adcb1311c6f6ecef3a10573f777526e5b 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.5.1.
+/* link_handshake.h -- generated by Trunnel v1.5.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 f4b910bdab54cb26332cdacc3b55d6028ff2f571..c356515d36ad7f8f4ca278e3f1ac26943d878fe1 100644 (file)
--- a/src/trunnel/pwbox.c
+++ b/src/trunnel/pwbox.c
@@ -1,4 +1,4 @@
-/* pwbox.c -- generated by Trunnel v1.5.1.
+/* pwbox.c -- generated by Trunnel v1.5.2.
  * https://gitweb.torproject.org/trunnel.git
  * You probably shouldn't edit this file.
  */
@@ -13,7 +13,7 @@
   } while (0)
 
 #if defined(__COVERITY__) || defined(__clang_analyzer__)
-/* If we're runnning a static analysis tool, we don't want it to complain
+/* If we're running a static analysis tool, we don't want it to complain
  * that some of our remaining-bytes checks are dead-code. */
 int pwbox_deadcode_dummy__ = 0;
 #define OR_DEADCODE_DUMMY || pwbox_deadcode_dummy__

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