diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-08-17 12:07:19 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-08-17 12:07:19 -0400 |
| commit | 5ffe105598135a92777d78cc82399fa281c52c5f (patch) | |
| tree | 72f07c2d9649154a962529a94f2b651e499fc35b /changes | |
| parent | 2ede14c2ca65df89b5918fdf38b223aa675a98bd (diff) | |
| parent | fc66a2ad1bf1e653cae47eb54fc6324d29d5916e (diff) | |
| download | tor-5ffe105598135a92777d78cc82399fa281c52c5f.tar.gz tor-5ffe105598135a92777d78cc82399fa281c52c5f.zip | |
Merge branch 'maint-0.2.1'
Resolved conflict in
src/or/networkstatus.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug1141 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug1141 b/changes/bug1141 new file mode 100644 index 0000000000..9975e418d6 --- /dev/null +++ b/changes/bug1141 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix an assertion failure that could occur in caches or bridge users + when using a very short voting interval on a testing network. + Diagnosed by Robert Hogan. Fixes bug 1141; bugfix on 0.2.0.8-alpha. + |