Merge branch 'fallback_dirsource_v3'

changes/fallback_dirsource

@@ -0,0 +1,13 @@
+  o Major features:
+    - Add a new FallbackDir option to use when we can't use a directory
+      from the consensus (either because we lack a consensus, or because
+      they're all down).  Currently, all authorities are fallbacks by
+      default, and there are no other default fallbacks, but that will
+      change.  This option will allow us to give clients a longer list
+      of servers to try to get a consensus from when first connecting 
+      to the Tor network, and thereby reduce load on the directory
+      authorities.
+
+  o Removed features:
+    - Drop the old FallbackNetworkstatus option: we never got it working
+      well enough to use it.

changes/rename_dirserver

@@ -0,0 +1,3 @@
+  o Renamed options:
+    - The DirServer option is now DirAuthority, for consistency with current
+      naming patterns.  You can still use the old DirServer form.