From 7d9567af2e45fcc64c8f3f36737c6729e5c83ccd Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 25 May 2009 13:14:58 -0400 Subject: [PATCH 1/5] clean up the 0.2.1.15-rc changelog --- ChangeLog | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 917ec9a9b0..520c35f4be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,36 +1,36 @@ -Changes in version 0.2.1.15??? - ????-??-?? - o Major bugfixes: +Changes in version 0.2.1.15-rc - 2009-05-25 + o Major bugfixes (on 0.2.0.x): - Fix a timing-dependent, allocator-dependent, DNS-related crash bug that would occur on some exit nodes when DNS failures and timeouts - occurred in certain patterns. Fix for bug 957. + occurred in certain patterns. Fix for bug 957. - o Minor bugfixes: + o Minor bugfixes (on 0.2.0.x): - Actually return -1 in the error case for read_bandwidth_usage(). Harmless bug, since we currently don't care about the return value anywhere. Bugfix on 0.2.0.9-alpha. - Provide a more useful log message if bug 977 (related to buffer freelists) ever reappears, and do not crash right away. + - Fix an assertion failure on 64-bit platforms when we allocated + memory right up to the end of a memarea, then realigned the memory + one step beyond the end. Fixes a possible cause of bug 930. - Protect the count of open sockets with a mutex, so we can't corrupt it when two threads are closing or opening sockets at once. - Fix for bug 939. Bugfix on 0.2.0.1-alpha. - - Don't allow a bridge to publish its router descriptor to a non-bridge - directory authority. Fixes part of bug 932. + Fix for bug 939. Bugfix on 0.2.0.1-alpha. + - Don't allow a bridge to publish its router descriptor to a + non-bridge directory authority. Fixes part of bug 932. - When we change to or from being a bridge, reset our counts of - client usage by country. Fixes bug 932. + client usage by country. Fixes bug 932. - Fix a bug that made stream bandwidth get misreported to the controller. - - Fix an assertion failure on 64-bit platforms when we allocated - memory right up to the end of a memarea, then realigned the - memory one step beyond the end. Fixes a possible cause of bug - 930. - Stop using malloc_usable_size() to use more area than we had - actually allocated: it was safe, but made valgrind really - unhappy. Bugfix on 0.2.0.x. - - Fix use of freed memory when deciding to mark a non-addable - descriptor as never-downloadable. Bugfix on 0.2.1.9-alpha. + actually allocated: it was safe, but made valgrind really unhappy. - Fix a memory leak when v3 directory authorities load their keys and cert from disk. Bugfix on 0.2.0.1-alpha. + o Minor bugfixes (on 0.2.1.x): + - Fix use of freed memory when deciding to mark a non-addable + descriptor as never-downloadable. Bugfix on 0.2.1.9-alpha. + Changes in version 0.2.1.14-rc - 2009-04-12 o Major features: From a2c841d555f6f70ffb05feab9ad1417bda723797 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 25 May 2009 13:16:45 -0400 Subject: [PATCH 2/5] add the 0.2.1.14-rc blurb --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 520c35f4be..dafdf274ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -33,6 +33,11 @@ Changes in version 0.2.1.15-rc - 2009-05-25 Changes in version 0.2.1.14-rc - 2009-04-12 + Tor 0.2.1.14-rc marks the first release candidate for the 0.2.1.x + series. It begins fixing some major performance problems, and also + finally addresses the bug that was causing relays on dynamic IP + addresses to fall out of the directory. + o Major features: - Clients replace entry guards that were chosen more than a few months ago. This change should significantly improve client performance, From 2f39eca28b113a18621d3ea3976ab12ceb60c41b Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 25 May 2009 13:23:08 -0400 Subject: [PATCH 3/5] bump to 0.2.1.15-rc --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index fb299e856e..cdcb447176 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.14-rc-dev) +AM_INIT_AUTOMAKE(tor, 0.2.1.15-rc) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 5d4cbedceb..723b89311f 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.14-rc-dev" +!define VERSION "0.2.1.15-rc" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 924dc19ac6..73c5aaed3a 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.14-rc-dev" +#define VERSION "0.2.1.15-rc" From f334297d388f7a1167c34b3f50bc0513f5c7cfac Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 25 May 2009 16:32:47 -0400 Subject: [PATCH 4/5] Bump version to 0.2.1.15-rc-dev. --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index cdcb447176..ceca53f078 100644 --- a/configure.in +++ b/configure.in @@ -5,7 +5,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.1.15-rc) +AM_INIT_AUTOMAKE(tor, 0.2.1.15-rc-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 723b89311f..5d67768f6f 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -9,7 +9,7 @@ !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.1.15-rc" +!define VERSION "0.2.1.15-rc-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 73c5aaed3a..65f21f6d37 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -226,6 +226,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.1.15-rc" +#define VERSION "0.2.1.15-rc-dev" From 99c315a473bdeb25680d07f7aaca089a6c1f8ecb Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 25 May 2009 16:38:50 -0400 Subject: [PATCH 5/5] Use tor_socket_strerror in eventdns.c. Fixes bug 987. --- ChangeLog | 6 ++++++ src/or/eventdns.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index dafdf274ab..2de570dbbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Changes in version 0.2.1.16-?? - 2009-??-?? + o Minor bugfixes (on 0.2.0.x): + - Log correct error messages for DNS-related network errors on + Windows. + + Changes in version 0.2.1.15-rc - 2009-05-25 o Major bugfixes (on 0.2.0.x): - Fix a timing-dependent, allocator-dependent, DNS-related crash bug diff --git a/src/or/eventdns.c b/src/or/eventdns.c index cd1330314b..4464148141 100644 --- a/src/or/eventdns.c +++ b/src/or/eventdns.c @@ -1299,7 +1299,7 @@ nameserver_read(struct nameserver *ns) { if (r < 0) { int err = last_error(ns->socket); if (error_is_eagain(err)) return; - nameserver_failed(ns, strerror(err)); + nameserver_failed(ns, tor_socket_strerror(err)); return; } /* XXX Match port too? */ @@ -1331,7 +1331,7 @@ server_port_read(struct evdns_server_port *s) { int err = last_error(s->socket); if (error_is_eagain(err)) return; log(EVDNS_LOG_WARN, "Error %s (%d) while reading request.", - strerror(err), err); + tor_socket_strerror(err), err); return; } request_parse(packet, r, s, (struct sockaddr*) &addr, addrlen); @@ -1350,7 +1350,7 @@ server_port_flush(struct evdns_server_port *port) int err = last_error(port->socket); if (error_is_eagain(err)) return; - log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", strerror(err), err); + log(EVDNS_LOG_WARN, "Error %s (%d) while writing response to port; dropping", tor_socket_strerror(err), err); } if (server_request_free(req)) { /* we released the last reference to req->port. */ @@ -2063,7 +2063,7 @@ evdns_request_transmit_to(struct evdns_request *req, struct nameserver *server) if (r < 0) { int err = last_error(server->socket); if (error_is_eagain(err)) return 1; - nameserver_failed(req->ns, strerror(err)); + nameserver_failed(req->ns, tor_socket_strerror(err)); return 2; } else if (r != (ssize_t)req->request_len) { return 1; /* short write */