From 2d6ee53fb91a34e84d082393fd7cd8f6159b5ced Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Tue, 23 Nov 2010 00:03:50 -0500 Subject: [PATCH 1/4] stop shipping doc/img and doc/website in the tarball --- changes/remove-website | 5 +++++ doc/Makefile.am | 21 +-------------------- 2 files changed, 6 insertions(+), 20 deletions(-) create mode 100644 changes/remove-website diff --git a/changes/remove-website b/changes/remove-website new file mode 100644 index 0000000000..ecbfbf9bc2 --- /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. + diff --git a/doc/Makefile.am b/doc/Makefile.am index 60afcb7d52..79123d81d5 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ -EXTRA_DIST = website img HACKING \ +EXTRA_DIST = HACKING \ tor-resolve.1 tor-gencert.1 \ tor-osx-dmg-creation.txt tor-rpm-creation.txt \ tor-win32-mingw-creation.txt @@ -10,22 +10,3 @@ SUBDIRS = design-paper spec DIST_SUBDIRS = design-paper spec -website: ../../website/docs/ - rm -rf website - mkdir website - if test -d $(srcdir)/../../website ; then \ - cd $(srcdir)/../../website && $(MAKE); \ - fi - if test -d $(srcdir)/../../website ; then \ - cp $(srcdir)/../../website/docs/tor-*.html.* \ - $(srcdir)/../../website/stylesheet.css website; \ - fi -img: ../../website/img/ - rm -rf img - mkdir img -# if test -d $(srcdir)/../../website/img; then \ -# cp $(srcdir)/../../website/img/*.png \ -# $(srcdir)/../../website/img/*.jpg img; \ -# fi - -.PHONY: website img From ff014eb5ea738b8dd9f5c8dc802593f3add73536 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 23 Nov 2010 12:46:41 -0500 Subject: [PATCH 2/4] Use S_CASE for ehostunreach, not E_CASE. Partial backport of 69deb22f. Fixes 0.2.1 compilation on windows --- src/or/reasons.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/reasons.c b/src/or/reasons.c index 82e5f99212..97fe0f83a7 100644 --- a/src/or/reasons.c +++ b/src/or/reasons.c @@ -166,7 +166,7 @@ errno_to_stream_end_reason(int e) S_CASE(ENOTCONN): S_CASE(ENETUNREACH): return END_STREAM_REASON_INTERNAL; - E_CASE(EHOSTUNREACH): + S_CASE(EHOSTUNREACH): /* XXXX022 * The correct behavior is END_STREAM_REASON_NOROUTE, but older * clients don't recognize it. So we're going to continue sending From 78df6404eb8d28843c7943341a4d4602c6f8d2bb Mon Sep 17 00:00:00 2001 From: mingw-san Date: Mon, 26 Jul 2010 15:05:11 -0400 Subject: [PATCH 3/4] Fix compilation with mingw and OpenSSL 0.9.8m+ --- changes/mingw-openssl098m | 3 +++ src/common/tortls.c | 11 +++++++++++ 2 files changed, 14 insertions(+) create mode 100644 changes/mingw-openssl098m diff --git a/changes/mingw-openssl098m b/changes/mingw-openssl098m new file mode 100644 index 0000000000..b4199760b7 --- /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/src/common/tortls.c b/src/common/tortls.c index 2915f79195..4d11d6d7fe 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -17,6 +17,17 @@ #include "orconfig.h" #include +#ifdef MS_WINDOWS /*wrkard for dtls1.h >= 0.9.8m of "#include "*/ + #define WIN32_WINNT 0x400 + #define _WIN32_WINNT 0x400 + #define WIN32_LEAN_AND_MEAN + #if defined(_MSC_VER) && (_MSC_VER < 1300) + #include + #else + #include + #include + #endif +#endif #include #include #include From b071217d1f0a852d1f8d4dcc5cade704c7f37484 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Wed, 1 Dec 2010 00:07:03 -0500 Subject: [PATCH 4/4] add 0.2.1.27 blurb and changelog to release notes --- ReleaseNotes | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/ReleaseNotes b/ReleaseNotes index efa04775d1..30d35dde0e 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -3,6 +3,81 @@ This document summarizes new features and bugfixes in each stable release of Tor. If you want to see more detailed descriptions of the changes in each development snapshot, see the ChangeLog file. +Changes in version 0.2.1.27 - 2010-11-23 + Yet another OpenSSL security patch broke its compatibility with Tor: + Tor 0.2.1.27 makes relays work with openssl 0.9.8p and 1.0.0.b. We + also took this opportunity to fix several crash bugs, integrate a new + directory authority, and update the bundled GeoIP database. + + o Major bugfixes: + - Resolve an incompatibility with OpenSSL 0.9.8p and OpenSSL 1.0.0b: + No longer set the tlsext_host_name extension on server SSL objects; + but continue to set it on client SSL objects. Our goal in setting + it was to imitate a browser, not a vhosting server. Fixes bug 2204; + bugfix on 0.2.1.1-alpha. + - Do not log messages to the controller while shrinking buffer + freelists. Doing so would sometimes make the controller connection + try to allocate a buffer chunk, which would mess up the internals + of the freelist and cause an assertion failure. Fixes bug 1125; + fixed by Robert Ransom. Bugfix on 0.2.0.16-alpha. + - Learn our external IP address when we're a relay or bridge, even if + we set PublishServerDescriptor to 0. Bugfix on 0.2.0.3-alpha, + where we introduced bridge relays that don't need to publish to + be useful. Fixes bug 2050. + - Do even more to reject (and not just ignore) annotations on + router descriptors received anywhere but from the cache. Previously + we would ignore such annotations at first, but cache them to disk + anyway. Bugfix on 0.2.0.8-alpha. Found by piebeer. + - When you're using bridges and your network goes away and your + bridges get marked as down, recover when you attempt a new socks + connection (if the network is back), rather than waiting up to an + hour to try fetching new descriptors for your bridges. Bugfix on + 0.2.0.3-alpha; fixes bug 1981. + + o Major features: + - Move to the November 2010 Maxmind GeoLite country db (rather + than the June 2009 ip-to-country GeoIP db) for our statistics that + count how many users relays are seeing from each country. Now we'll + have more accurate data, especially for many African countries. + + o New directory authorities: + - Set up maatuska (run by Linus Nordberg) as the eighth v3 directory + authority. + + o Minor bugfixes: + - Fix an assertion failure that could occur in directory 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. + - Enforce multiplicity rules when parsing annotations. Bugfix on + 0.2.0.8-alpha. Found by piebeer. + - Allow handshaking OR connections to take a full KeepalivePeriod + seconds to handshake. Previously, we would close them after + IDLE_OR_CONN_TIMEOUT (180) seconds, the same timeout as if they + were open. Bugfix on 0.2.1.26; fixes bug 1840. Thanks to mingw-san + for analysis help. + - When building with --enable-gcc-warnings on OpenBSD, disable + warnings in system headers. This makes --enable-gcc-warnings + pass on OpenBSD 4.8. + + o Minor features: + - Exit nodes didn't recognize EHOSTUNREACH as a plausible error code, + and so sent back END_STREAM_REASON_MISC. Clients now recognize a new + stream ending reason for this case: END_STREAM_REASON_NOROUTE. + Servers can start sending this code when enough clients recognize + it. Bugfix on 0.1.0.1-rc; fixes part of bug 1793. + - Build correctly on mingw with more recent versions of OpenSSL 0.9.8. + Patch from mingw-san. + + o Removed files: + - Remove the old debian/ directory from the main Tor distribution. + The official Tor-for-debian git repository lives at the URL + https://git.torproject.org/debian/tor.git + - 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. + + Changes in version 0.2.1.26 - 2010-05-02 Tor 0.2.1.26 addresses the recent connection and memory overload problems we've been seeing on relays, especially relays with their