Merge commit 'origin/maint-0.2.1'

[Didn't take Karsten's full bug 1024 workaround, since 0.2.2 doesn't
use v0 rend descs.]

5 files changed, 38 insertions, 26 deletions

diff --git a/ChangeLog b/ChangeLog
index a754d1646..b06d0993c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,8 +39,22 @@ Changes in version 0.2.2.1-alpha - 2009-??-??
       controllers.
 
 
-Changes in version 0.2.1.17-?? - 2009-??-??
+Changes in version 0.2.1.17-rc - 2009-07-02
+  o Major features:
+    - Clients now use the bandwidth values in the consensus, rather than
+      the bandwidth values in each relay descriptor. This approach opens
+      the door to more accurate bandwidth estimates once the directory
+      authorities start doing active measurements. Implements more of
+      proposal 141.
+
   o Major bugfixes:
+    - When Tor clients restart after 1-5 days, they discard all their
+      cached descriptors as too old, but they still use the cached
+      consensus document. This approach is good for robustness, but
+      bad for performance: since they don't know any bandwidths, they
+      end up choosing at random rather than weighting their choice by
+      speed. Fixed by the above feature of putting bandwidths in the
+      consensus. Bugfix on 0.2.0.x.
     - Directory authorities were neglecting to mark relays down in their
       internal histories if the relays fall off the routerlist without
       ever being found unreachable. So there were relays in the histories
@@ -52,26 +66,22 @@ Changes in version 0.2.1.17-?? - 2009-??-??
 
   o Minor bugfixes:
     - Serve the DirPortFrontPage page even when we have been approaching
-      our quotas recently.  Fixes bug 1013; bugfix on 0.2.1.8-alpha.
-    - Do not cap bandwidths reported by directory authorities; they are
-      already adjusted to reflect reality.
-
-  o Major features:
-    - Clients now use the bandwidth values in the consensus, rather than
-      the bandwidth values in each relay descriptor. This approach opens
-      the door to more accurate bandwidth estimates once the directory
-      authorities start doing active measurements. Implements more of
-      proposal 141.
+      our quotas recently. Fixes bug 1013; bugfix on 0.2.1.8-alpha.
+    - The control port would close the connection before flushing long
+      replies, such as the network consensus, if a QUIT command was issued
+      before the reply had completed. Now, the control port flushes all
+      pending replies before closing the connection. Also fixed a spurious
+      warning when a QUIT command is issued after a malformed or rejected
+      AUTHENTICATE command, but before the connection was closed. Patch
+      by Marcus Griep. Bugfix on 0.2.0.x; fixes bugs 1015 and 1016.
+    - When we can't find an intro key for a v2 hidden service descriptor,
+      fall back to the v0 hidden service descriptor and log a bug message.
+      Workaround for bug 1024.
 
-  o Minor bugfixes (on 0.2.0.x):
-    - Control port would close the connection before flushing long
-      replies, such as the network consensus, if a QUIT command was
-      issued before the reply had completed. Now, the control port
-      flushes all pending replies before closing the connection.
-      Also fixed a condition where a QUIT command issued after a
-      malformed or rejected AUTHENTICATE command, but before the
-      connection was closed would result in a warning in the logger
-      for a doubly-closed connection. Fixes bugs 1015 and 1016.
+  o Minor features:
+    - If we're a relay and we change our IP address, be more verbose
+      about the reason that made us change. Should help track down
+      further bugs for relays on dynamic IP addresses.
 
 
 Changes in version 0.2.1.16-rc - 2009-06-20
diff --git a/LICENSE b/LICENSE
index 197c92a97..bb1ebd4e4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -14,7 +14,7 @@ Tor is distributed under this license:
 
 Copyright (c) 2001-2004, Roger Dingledine
 Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
-Copyright (c) 2007-2008, The Tor Project, Inc.
+Copyright (c) 2007-2009, The Tor Project, Inc.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/Makefile.am b/Makefile.am
index d4ebbb1fd..55a01e421 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # Copyright (c) 2001-2004, Roger Dingledine
 # Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
-# Copyright (c) 2007-2008, The Tor Project, Inc.
+# Copyright (c) 2007-2009, The Tor Project, Inc.
 # See LICENSE for licensing information
 
 AUTOMAKE_OPTIONS = foreign
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index 00b77d837..f65c20f2a 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -91,7 +91,9 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
     }
   });
   if (!intro_key) {
-    log_warn(LD_BUG, "Internal error: could not find intro key.");
+    log_warn(LD_BUG, "Internal error: could not find intro key; we "
+             "only have a v2 rend desc with %d intro points.",
+             smartlist_len(entry->parsed->intro_nodes));
     goto err;
   }
   if (crypto_pk_get_digest(intro_key, payload)<0) {
diff --git a/src/or/router.c b/src/or/router.c
index e5f3b52ec..cb73e378c 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1511,8 +1511,8 @@ log_addr_has_changed(int severity, uint32_t prev, uint32_t cur,
            addrbuf_prev, addrbuf_cur, source);
   else
     log_notice(LD_GENERAL,
-             "Guessed our IP address as %s.",
-             addrbuf_cur);
+             "Guessed our IP address as %s (source: %s).",
+             addrbuf_cur, source);
 }
 
 /** Check whether our own address as defined by the Address configuration
@@ -1535,7 +1535,7 @@ check_descriptor_ipaddress_changed(time_t now)
   }
 
   if (prev != cur) {
-    log_addr_has_changed(LOG_INFO, prev, cur, "resolve");
+    log_addr_has_changed(LOG_NOTICE, prev, cur, "resolve");
     ip_address_changed(0);
   }
 }