Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug2355

@@ -0,0 +1,8 @@
+  o Major features:
+    - If "UseBridges 1" is set and no bridges are configured, Tor will
+      now refuse to build any circuits until some bridges are set.
+      If "UseBridges auto" is set, Tor will use bridges if they are
+      configured and we are not running as a server, but otherwise
+      will make circuits as usual. The new default is "auto". Patch
+      by anonym.
+

changes/bug2748

@@ -0,0 +1,10 @@
+  o Minor bugfixes
+    - Remove dead code from rend_cache_lookup_v2_desc_as_dir.  Fixes
+      part of bug 2748; bugfix on 0.2.0.10-alpha.
+    - Log malformed requests for rendezvous descriptors as protocol
+      warnings, not warnings.  Also, use a more informative log
+      message in case someone sees it at log level warning without
+      prior info-level messages.  Fixes the other part of bug 2748;
+      bugfix on 0.2.0.10-alpha.
+
+

changes/bug3309

@@ -0,0 +1,13 @@
+  o Minor bugfixes:
+    - Clear the table recording the time of the last request for each
+      hidden service descriptor from each HS directory on SIGNAL
+      NEWNYM.  Previously, we would clear our HS descriptor cache on
+      SIGNAL NEWNYM, but if we had previously retrieved a descriptor
+      (or tried to) from every directory responsible for it, we would
+      refuse to fetch it again for up to 15 minutes.  Bugfix on
+      0.2.2.25-alpha; fixes bug 3309.
+
+  o Minor features:
+    - Log (at info level) when purging pieces of hidden-service-client
+      state on SIGNAL NEWNYM.
+

changes/bug3318

@@ -0,0 +1,7 @@
+  o Minor bugfixes:
+    - Fix a log message that said "bits" while displaying a value in
+      bytes. Found by wanoskarnet. Fixes bug 3318; bugfix on
+      0.2.0.1-alpha.
+    - When checking for 1024-bit keys, check for 1024 bits, not 128
+      bytes. This allows Tor to correctly discard keys of length
+      1017 through 1023. Bugfix on 0.0.9pre5.

changes/bug3321

@@ -0,0 +1,7 @@
+  o Minor bugfixes:
+    - In bug 2511 we fixed a case where you could use an unconfigured
+      bridge if you had configured it as a bridge the last time you ran
+      Tor. Now fix another edge case: if you had configured it as a bridge
+      but then switched to a different bridge via the controller, you
+      would still be willing to use the old one. Bugfix on 0.2.0.1-alpha;
+      fixes bug 3321.