diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-12-01 00:11:27 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-12-01 00:11:27 -0500 |
| commit | b259c08318c94e6e75cc999f6d5dd864e7e08c1b (patch) | |
| tree | 1dcab6a22acfc509225b0ac817ddab487407d177 /changes | |
| parent | ad87d6172bc8b06a851da84f5a96ae87446ef90b (diff) | |
| parent | b071217d1f0a852d1f8d4dcc5cade704c7f37484 (diff) | |
| download | tor-b259c08318c94e6e75cc999f6d5dd864e7e08c1b.tar tor-b259c08318c94e6e75cc999f6d5dd864e7e08c1b.tar.gz | |
Merge branch 'maint-0.2.1' into maint-0.2.2
Conflicts:
doc/Makefile.am
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/mingw-openssl098m | 3 | ||||
| -rw-r--r-- | changes/remove-website | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/changes/mingw-openssl098m b/changes/mingw-openssl098m new file mode 100644 index 000000000..b4199760b --- /dev/null +++ b/changes/mingw-openssl098m @@ -0,0 +1,3 @@ + o Minor features + - Build correctly on mingw with more recent version of OpenSSL 0.9.8. + Patch from mingw-san. diff --git a/changes/remove-website b/changes/remove-website new file mode 100644 index 000000000..ecbfbf9bc --- /dev/null +++ b/changes/remove-website @@ -0,0 +1,5 @@ + o Removed files: + - Stop shipping the old doc/website/ directory in the tarball. We + changed the website format in late 2010, and what we shipped in + 0.2.1.26 really wasn't that useful anyway. + |