diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-09-10 18:28:41 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-09-10 18:28:41 -0400 |
| commit | 77d17a360767d8a14ce42a1dd91a8c65973bb768 (patch) | |
| tree | 660cf21507b18a029ce0a047d3150be03e6a5c5b | |
| parent | d85b563dbb0c57bc5731e664952ed3f8b9a8f6e8 (diff) | |
| download | tor-77d17a360767d8a14ce42a1dd91a8c65973bb768.tar tor-77d17a360767d8a14ce42a1dd91a8c65973bb768.tar.gz | |
fold in another
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | changes/bug6801 | 5 |
2 files changed, 3 insertions, 5 deletions
@@ -31,6 +31,9 @@ Changes in version 0.2.4.2-alpha - 2012-09-10 - Rename the (internal-use-only) UsingTestingNetworkDefaults option to start with a triple-underscore so the controller won't touch it. Patch by Meejah. Fixes bug 3155. Bugfix on 0.2.2.23-alpha. + - Avoid segfault when starting up having run with an extremely old + version of Tor and parsing its state file. Fixes bug 6801; bugfix + on 0.2.2.23-alpha. - Rename the (testing-use-only) _UseFilteringSSLBufferevents option so it doesn't start with _. Fixes bug 3155. Bugfix on 0.2.3.1-alpha. - Don't follow the NULL pointer if microdescriptor generation fails. diff --git a/changes/bug6801 b/changes/bug6801 deleted file mode 100644 index ef21acc98..000000000 --- a/changes/bug6801 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - Avoid segfault when starting up having run with an extremely old - version of Tor and parsing its state file. Fixes bug 6801; bugfix on - 0.2.2.23-alpha. - |