Merge branch 'maint-0.2.1' into master

Conflicts:

	ChangeLog
	configure.in
	contrib/tor-mingw.nsi.in
	src/win32/orconfig.h

6 files changed, 42 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 62572600ad..74806e22ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,22 @@ Changes in version 0.2.2.7-alpha - 2010-01-??
       hidden service usage.
 
 
+Changes in version 0.2.1.22 - 2010-01-19
+  Tor 0.2.1.22 fixes a critical privacy problem in bridge directory
+  authorities -- it would tell you its whole history of bridge descriptors
+  if you make the right directory request. This stable update also
+  rotates two of the seven v3 directory authority keys and locations.
+
+  o Directory authority changes:
+    - Rotate keys (both v3 identity and relay identity) for moria1
+      and gabelmoo.
+
+  o Major bugfixes:
+    - Stop bridge directory authorities from answering dbg-stability.txt
+      directory queries, which would let people fetch a list of all
+      bridge identities they track. Bugfix on 0.2.1.6-alpha.
+
+
 Changes in version 0.2.2.6-alpha - 2009-11-19
   o Major features:
     - Directory authorities can now create, vote on, and serve multiple
diff --git a/ReleaseNotes b/ReleaseNotes
index 7e11940015..3790142d3d 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -3,8 +3,24 @@ 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.22 - 2010-01-19
+  Tor 0.2.1.22 fixes a critical privacy problem in bridge directory
+  authorities -- it would tell you its whole history of bridge descriptors
+  if you make the right directory request. This stable update also
+  rotates two of the seven v3 directory authority keys and locations.
+
+  o Directory authority changes:
+    - Rotate keys (both v3 identity and relay identity) for moria1
+      and gabelmoo.
+
+  o Major bugfixes:
+    - Stop bridge directory authorities from answering dbg-stability.txt
+      directory queries, which would let people fetch a list of all
+      bridge identities they track. Bugfix on 0.2.1.6-alpha.
+
+
 Changes in version 0.2.1.21 - 2009-12-21
-  Tor 0.2.0.21 fixes an incompatibility with the most recent OpenSSL
+  Tor 0.2.1.21 fixes an incompatibility with the most recent OpenSSL
   library. If you use Tor on Linux / Unix and you're getting SSL
   renegotiation errors, upgrading should help. We also recommend an
   upgrade if you're an exit relay.
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 2a1d8e0041..94fbf600a4 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -8,7 +8,6 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-
 !define VERSION "0.2.2.6-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
diff --git a/src/or/config.c b/src/or/config.c
index 6e2e29c4f4..b8356e2fc0 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -735,8 +735,9 @@ add_default_trusted_dir_authorities(authority_type_t type)
 {
   int i;
   const char *dirservers[] = {
-    "moria1 v1 orport=9001 v3ident=E2A2AF570166665D738736D0DD58169CC61D8A8B "
-      "128.31.0.39:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441",
+    "moria1 orport=9101 no-v2 "
+      "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
+      "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
     "moria2 v1 orport=9002 128.31.0.34:9032 "
       "719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF",
     "tor26 v1 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
@@ -747,9 +748,9 @@ add_default_trusted_dir_authorities(authority_type_t type)
       "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
     "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 "
       "216.224.124.114:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B",
-    "gabelmoo orport=443 no-v2 "
-      "v3ident=81349FC1F2DBA2C2C11B45CB9706637D480AB913 "
-      "80.190.246.100:80 6833 3D07 61BC F397 A587 A0C0 B963 E4A9 E99E C4D3",
+    "gabelmoo orport=8080 no-v2 "
+      "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
+      "80.190.246.100:8180 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
     "dannenberg orport=443 no-v2 "
       "v3ident=585769C78764D58426B8B52B6651A5A71137189A "
       "213.73.91.31:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
diff --git a/src/or/directory.c b/src/or/directory.c
index 124c64684e..30c08b84b2 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -3011,7 +3011,8 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
   if (!strcmp(url,"/tor/dbg-stability.txt")) {
     const char *stability;
     size_t len;
-    if (! authdir_mode_tests_reachability(options) ||
+    if (options->BridgeAuthoritativeDir ||
+        ! authdir_mode_tests_reachability(options) ||
         ! (stability = rep_hist_get_router_stability_doc(time(NULL)))) {
       write_http_status_line(conn, 404, "Not found.");
       goto done;
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index d7546a7a8b..1b9df56031 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4083,7 +4083,7 @@ update_router_descriptor_cache_downloads_v2(time_t now)
       pds_flags |= PDS_NO_EXISTING_SERVERDESC_FETCH; /* XXXX ignored*/
 
     if (!ds) {
-      log_warn(LD_BUG, "Networkstatus with no corresponding authority!");
+      log_info(LD_DIR, "Networkstatus with no corresponding authority!");
       continue;
     }
     if (! smartlist_len(dl))