diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-04-02 15:33:38 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-04-02 15:33:38 -0400 |
| commit | 51d084f8055265fe9a97236f7f3777ec160ba27b (patch) | |
| tree | d7b183f0bab31d20c056e04c24aaa341e0dfd39b | |
| parent | 927425150b3266aefcd9155a502165e05e4e6e5c (diff) | |
| download | tor-51d084f8055265fe9a97236f7f3777ec160ba27b.tar.gz tor-51d084f8055265fe9a97236f7f3777ec160ba27b.zip | |
fold in the recent changelog entries
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | changes/build_manpage_from_tarball_without_asciidoc | 8 | ||||
| -rw-r--r-- | changes/dont_segfault_while_making_consensus_without_params | 5 |
3 files changed, 11 insertions, 15 deletions
@@ -1,4 +1,4 @@ -Changes in version 0.2.2.11-alpha - 2010-03-?? +Changes in version 0.2.2.11-alpha - 2010-04-?? o Minor features: - Experiment with a more aggressive approach to preventing clients from making one-hop exit streams. Exit relays who want to try it @@ -8,7 +8,16 @@ Changes in version 0.2.2.11-alpha - 2010-03-?? o Minor bugfixes: - When we cleaned up the contrib/tor-exit-notice.html file, we left - out some key text. Fixes bug 1295. + out the first line. Fixes bug 1295. + - When building the manpage from a tarball, we required asciidoc, but + the asciidoc -> roff/html conversion was already done for the + tarball. Make 'make' complain only when we need asciidoc (either + because we're compiling directly from git, or because we altered + the asciidoc manpage in the tarball). Bugfix on 0.2.2.9-alpha. + - When none of the directory authorities vote on any params, Tor + segfaulted when trying to make the consensus from the votes. We + didn't trigger the bug in practice, because authorities do include + params in their votes. Bugfix on 0.2.2.10-alpha, fixes bug 1322. Changes in version 0.2.2.10-alpha - 2010-03-07 diff --git a/changes/build_manpage_from_tarball_without_asciidoc b/changes/build_manpage_from_tarball_without_asciidoc deleted file mode 100644 index 7e7bb56eb5..0000000000 --- a/changes/build_manpage_from_tarball_without_asciidoc +++ /dev/null @@ -1,8 +0,0 @@ - o Minor bugfixes: - - When building the manpage from a tarball, we required asciidoc, even - though the asciidoc -> roff/html conversion was already done while - building the tarball. We now make it so that make complains when - we need asciidoc (either because someone is compiling directly from git, - or because they altered the asciidoc manpage in their tarball). Bugfix - on 0.2.2.9-alpha. - diff --git a/changes/dont_segfault_while_making_consensus_without_params b/changes/dont_segfault_while_making_consensus_without_params deleted file mode 100644 index e0bcd4086d..0000000000 --- a/changes/dont_segfault_while_making_consensus_without_params +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes: - - When none of the authorities vote on any params, Tor segfaults when - trying to make the consensus from the votes. This is currently - not critical, because authorities do include params in their votes. - Bugfix on 0.2.2.10-alpha, fixes bug 1322. |