diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-01-05 06:30:31 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-01-05 06:30:31 +0000 |
| commit | ee0d2d486d0a43ce03f96e841c42b426e304d461 (patch) | |
| tree | b36499f33b4ded3e21357b98d38e864cddb01523 | |
| parent | 658c09c06fdcf32764c9e30aa1e824e6750edca2 (diff) | |
| download | tor-ee0d2d486d0a43ce03f96e841c42b426e304d461.tar tor-ee0d2d486d0a43ce03f96e841c42b426e304d461.tar.gz | |
fix a bug, defer a bug, bump to 0.1.2.5-alpha
svn:r9270
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | contrib/tor-mingw.nsi.in | 2 | ||||
| -rw-r--r-- | src/or/directory.c | 3 | ||||
| -rw-r--r-- | src/or/dirserv.c | 1 | ||||
| -rw-r--r-- | src/or/dns.c | 5 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 8bb63a484..3e5e540d0 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.1.2.4-alpha-dev) +AM_INIT_AUTOMAKE(tor, 0.1.2.5-alpha) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 598a052ab..065ecf5e8 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -5,7 +5,7 @@ ; !include "MUI.nsh" -!define VERSION "0.1.2.4-alpha-dev" +!define VERSION "0.1.2.5-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "http://tor.eff.org/" diff --git a/src/or/directory.c b/src/or/directory.c index 470089ae2..7e80af636 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1639,8 +1639,7 @@ directory_handle_command_get(dir_connection_t *conn, char *headers, smartlist_free(dir_fps); return 0; } - dlen = dirserv_estimate_data_size(conn->fingerprint_stack, - 0, deflated); + dlen = dirserv_estimate_data_size(dir_fps, 0, deflated); if (global_write_bucket_low(dlen, 2)) { log_info(LD_DIRSERV, "Client asked for server descriptors, but we've been " diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 5e8d3ea50..f2dc38f49 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1900,6 +1900,7 @@ dirserv_estimate_data_size(smartlist_t *fps, int is_serverdescs, int compressed) { size_t result; + tor_assert(fps); if (is_serverdescs) { int n = smartlist_len(fps); routerinfo_t *me = router_get_my_routerinfo(); diff --git a/src/or/dns.c b/src/or/dns.c index 212068d4b..1e05eceba 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -923,8 +923,9 @@ dns_found_answer(const char *address, int is_reverse, uint32_t addr, if (resolve->state != CACHE_STATE_PENDING) { /* XXXX Maybe update addr? or check addr for consistency? Or let * VALID replace FAILED? */ - log_notice(LD_EXIT, "Resolved %s which was already resolved; ignoring", - escaped_safe_str(address)); + log_info(LD_EXIT, "Resolved %s which was already resolved; ignoring", + escaped_safe_str(address)); + /* XXXX012 this triggers in ordinary life. nick says it's a bug. */ tor_assert(resolve->pending_connections == NULL); return; } diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index c178e84a9..af5aa9cba 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -227,5 +227,5 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.1.2.4-alpha-dev" +#define VERSION "0.1.2.5-alpha" |