tor

commit a384937f848dc2e7b45c4b4be49467eac2a2db19
parent 87db5a6b758db2e0a69c34acfc2481a91018d9aa
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  6 Feb 2018 11:41:52 -0500

Merge branch 'arma_bug22212_031'

Diffstat:
M
changes/bug22212-forreal
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/changes/bug22212-forreal b/changes/bug22212-forreal
@@ -1,4 +1,4 @@
-  o Major bugfixes:
+  o Major bugfixes (netflow padding):
     - Stop adding unneeded channel padding right after we finish flushing
       to a connection that has been trying to flush for many seconds.
       Instead, treat all partial or complete flushes as activity on the