aboutsummaryrefslogtreecommitdiff
path: root/changes
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-09-11 13:20:15 -0400
committerNick Mathewson <nickm@torproject.org>2012-09-11 13:20:15 -0400
commit5833861f62d2667eeda1ed0f6595763aa00250b0 (patch)
tree654dcbc4cd6faf1a30d9e0ce5fbc9025d89e8f8c /changes
parent8731a4e148e23d8edbb7f32bdfeee30c326f33cc (diff)
parent84f47ffc462dface8db1def322414daa43400d1c (diff)
downloadtor-5833861f62d2667eeda1ed0f6595763aa00250b0.tar
tor-5833861f62d2667eeda1ed0f6595763aa00250b0.tar.gz
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Conflicts: src/test/test_util.c
Diffstat (limited to 'changes')
-rw-r--r--changes/bug68115
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug6811 b/changes/bug6811
new file mode 100644
index 000000000..841ec1c54
--- /dev/null
+++ b/changes/bug6811
@@ -0,0 +1,5 @@
+ o Major security fixes:
+ - Fix an assertion failure in tor_timegm that could be triggered
+ by a badly formatted directory object. Bug found by fuzzing with
+ Radamsa. Fixes bug 6811; bugfix on 0.2.0.20-rc.
+