# 
# patch "ChangeLog"
#  from [68f7828ad36b7a5cee1d71dcbf6271cdecfe05b8]
#    to [7dcbc08486ee7d40e11f95d1a9b4e1a7c9084a30]
# 
# patch "netsync.cc"
#  from [e6da39e8b875004c1b0290a4fb274394d6bd1c6b]
#    to [a216c4dc84981cff4cdf26cc45303c46a16054fd]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,5 +1,9 @@
 2005-06-25  Nathaniel Smith  <address@hidden>
 
+	* netsync.cc: Tweak comment.
+
+2005-06-25  Nathaniel Smith  <address@hidden>
+
 	* AUTHORS: Add Ethan Blanton <address@hidden>.
 
 2005-06-22  Nathaniel Smith  <address@hidden>
--- netsync.cc
+++ netsync.cc
@@ -132,13 +132,12 @@
 //
 // ---- end pre-v5 packet format ----
 //
-// decoding involves simply buffering until a sufficient number of
-// bytes are received, then advancing the buffer pointer. any time an
-// integrity check (adler32 for pre-v5, HMAC for post-v5) fails, the
-// protocol is assumed to have lost synchronization, and the
-// connection is dropped. the parties are free to drop the tcp stream
-// at any point, if too much data is received or too much idle time
-// passes; no commitments or transactions are made.
+// decoding involves simply buffering until a sufficient number of bytes are
+// received, then advancing the buffer pointer. any time an integrity check
+// (the HMAC) fails, the protocol is assumed to have lost synchronization, and
+// the connection is dropped. the parties are free to drop the tcp stream at
+// any point, if too much data is received or too much idle time passes; no
+// commitments or transactions are made.
 //
 // one special command, "bye", is used to shut down a connection
 // gracefully.  once each side has received all the data they want, they