diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-20 13:53:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-20 13:53:11 -0400 |
| commit | 444193ff5df901073823e38fc291e913164e61e0 (patch) | |
| tree | 54c423d846cbc10bf105527656713f2a7f0e8540 /changes | |
| parent | ca7d5dc29920a8ae406e6a79cb3f987871790edf (diff) | |
| parent | 2849a95691c002108666eb414ff497bf93349e7d (diff) | |
| download | tor-444193ff5df901073823e38fc291e913164e61e0.tar.gz tor-444193ff5df901073823e38fc291e913164e61e0.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/networkstatus.c
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/caches_if_exit | 5 | ||||
| -rw-r--r-- | changes/set_ns_crash | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/changes/caches_if_exit b/changes/caches_if_exit new file mode 100644 index 0000000000..0e662270e2 --- /dev/null +++ b/changes/caches_if_exit @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a logic error where servers that _didn't_ act as exits would + try to keep their server lists more aggressively up to date than + exits, when it was supposed to be the other way around. Bugfix + on 0.2.2.17-alpha. diff --git a/changes/set_ns_crash b/changes/set_ns_crash new file mode 100644 index 0000000000..34466d7ad0 --- /dev/null +++ b/changes/set_ns_crash @@ -0,0 +1,4 @@ + o Major bugfixes: + - Avoid a crash bug triggered by looking at a dangling pointer while + setting the network status consensus. Found by Robert Ransom. + Bugfix on 0.2.2.17-alpha. Fixes bug 2097. |