aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-06-22 12:36:06 -0400
committerNick Mathewson <nickm@torproject.org>2009-06-22 12:36:06 -0400
commit3f4f6f907539f7fa7ef4a292a70431ed6ab9628a (patch)
tree75cc0a503f2e4ef1a43982c3b4390bf93cf62adc /ChangeLog
parent32e86c3bf1989b64282a5748bc31d97e9e2be870 (diff)
parent262455527a82d1a9d482e3df32651700b2ba8c6e (diff)
downloadtor-3f4f6f907539f7fa7ef4a292a70431ed6ab9628a.tar.gz
tor-3f4f6f907539f7fa7ef4a292a70431ed6ab9628a.zip
Merge commit 'origin/maint-0.2.1'
Conflicts: ChangeLog
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 61b010a2b8..1ca7af59f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,12 @@ Changes in version 0.2.2.1-alpha - 2009-??-??
controllers.
+Changes in version 0.2.1.17-?? - 2009-??-??
+ o Minor bugfixes:
+ - Serve the DirPortFrontPage page even when we have been approaching
+ our quotas recently. Fixes bug 1013; bugfix on 0.2.1.8-alpha.
+
+
Changes in version 0.2.1.16-rc - 2009-06-20
o Security fixes:
- Fix an edge case where a malicious exit relay could convince a