summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@persephoneslair.org>2015-06-10 14:59:13 +0000
committerAndrea Shepard <andrea@persephoneslair.org>2015-06-10 14:59:13 +0000
commit2f17b91ae2ca622294bf63dec2a6986756685702 (patch)
treef8456ddc819150ed24e5916d71d75027fd8ed02a
parentb616aea0740e05934fa23d15e127659ca06c2b15 (diff)
parent376171104c9187a7d5899df2cb58f64222c61145 (diff)
downloadtor-2f17b91ae2ca622294bf63dec2a6986756685702.tar.gz
tor-2f17b91ae2ca622294bf63dec2a6986756685702.zip
Merge branch 'release-0.2.6' of ssh://git-rw.torproject.org/tor into release-0.2.6
-rw-r--r--ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ad9e76b74d..e980c9a0d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
Changes in version 0.2.6.9 - 2015-06-1?
Tor 0.2.6.9 fixes a regression in the circuit isolation code, increases the
requirements for receiving an HSDir flag, and addresses some other small
- bugs in the systemd and sandboc code. Clients using circuit isolation
+ bugs in the systemd and sandbox code. Clients using circuit isolation
should upgrade; all directory authorities should upgrade.
o Major bugfixes (client-side privacy):