summaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-29 09:05:18 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-29 09:05:18 -0400
commit5e8cc766e6a4d297c66ff1afd6a5f8024607ef9c (patch)
treecc09db47950258d825725d4f5ee0a43d4dce08c3 /changes
parentdc019b06548e49ce4ea2a1501715985b648f2606 (diff)
parentf15e5aedbc6298f4fad4ef6cff755591a44a7109 (diff)
downloadtor-5e8cc766e6a4d297c66ff1afd6a5f8024607ef9c.tar.gz
tor-5e8cc766e6a4d297c66ff1afd6a5f8024607ef9c.zip
Merge branch 'ticket961_squashed'
Diffstat (limited to 'changes')
-rw-r--r--changes/ticket9615
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/ticket961 b/changes/ticket961
new file mode 100644
index 0000000000..018f26554d
--- /dev/null
+++ b/changes/ticket961
@@ -0,0 +1,5 @@
+ o Minor features:
+ - A new AccountingRule option lets you set whether you'd like the
+ AccountingMax value to be applied separately to inbound and
+ outbound traffic, or applied to the sum of inbound and outbound
+ traffic. Resolves ticket 961. Patch by "chobe".