[or-cvs] r9270: fix a bug, defer a bug, bump to 0.1.2.5-alpha (in tor/trunk: . contrib src/or src/win32)

[arma at seul.org]

Author: arma
Date: 2007-01-05 01:30:31 -0500 (Fri, 05 Jan 2007)
New Revision: 9270

Modified:
   tor/trunk/configure.in
   tor/trunk/contrib/tor-mingw.nsi.in
   tor/trunk/src/or/directory.c
   tor/trunk/src/or/dirserv.c
   tor/trunk/src/or/dns.c
   tor/trunk/src/win32/orconfig.h
Log:
fix a bug, defer a bug, bump to 0.1.2.5-alpha


Modified: tor/trunk/configure.in
===================================================================
--- tor/trunk/configure.in	2007-01-05 06:03:10 UTC (rev 9269)
+++ tor/trunk/configure.in	2007-01-05 06:30:31 UTC (rev 9270)
@@ -4,7 +4,7 @@
 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

Modified: tor/trunk/contrib/tor-mingw.nsi.in
===================================================================
--- tor/trunk/contrib/tor-mingw.nsi.in	2007-01-05 06:03:10 UTC (rev 9269)
+++ tor/trunk/contrib/tor-mingw.nsi.in	2007-01-05 06:30:31 UTC (rev 9270)
@@ -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/"
 

Modified: tor/trunk/src/or/directory.c
===================================================================
--- tor/trunk/src/or/directory.c	2007-01-05 06:03:10 UTC (rev 9269)
+++ tor/trunk/src/or/directory.c	2007-01-05 06:30:31 UTC (rev 9270)
@@ -1639,8 +1639,7 @@
       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 "

Modified: tor/trunk/src/or/dirserv.c
===================================================================
--- tor/trunk/src/or/dirserv.c	2007-01-05 06:03:10 UTC (rev 9269)
+++ tor/trunk/src/or/dirserv.c	2007-01-05 06:30:31 UTC (rev 9270)
@@ -1900,6 +1900,7 @@
                            int compressed)
 {
   size_t result;
+  tor_assert(fps);
   if (is_serverdescs) {
     int n = smartlist_len(fps);
     routerinfo_t *me = router_get_my_routerinfo();

Modified: tor/trunk/src/or/dns.c
===================================================================
--- tor/trunk/src/or/dns.c	2007-01-05 06:03:10 UTC (rev 9269)
+++ tor/trunk/src/or/dns.c	2007-01-05 06:30:31 UTC (rev 9270)
@@ -923,8 +923,9 @@
   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;
   }

Modified: tor/trunk/src/win32/orconfig.h
===================================================================
--- tor/trunk/src/win32/orconfig.h	2007-01-05 06:03:10 UTC (rev 9269)
+++ tor/trunk/src/win32/orconfig.h	2007-01-05 06:30:31 UTC (rev 9270)
@@ -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"