summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-02-06 11:41:52 -0500
committerNick Mathewson <nickm@torproject.org>2018-02-06 11:41:52 -0500
commita384937f848dc2e7b45c4b4be49467eac2a2db19 (patch)
tree958d94fe12efd0f5c00bc8d5f4ae0d58887f423a
parent87db5a6b758db2e0a69c34acfc2481a91018d9aa (diff)
parent5a1e0bfcdc8f4c357a832a9f1c39b69afd188b4b (diff)
downloadtor-a384937f848dc2e7b45c4b4be49467eac2a2db19.tar.gz
tor-a384937f848dc2e7b45c4b4be49467eac2a2db19.zip
Merge branch 'arma_bug22212_031'
-rw-r--r--changes/bug22212-forreal2
1 files changed, 1 insertions, 1 deletions
diff --git a/changes/bug22212-forreal b/changes/bug22212-forreal
index 3b7e3ca0eb..159d0990ee 100644
--- 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