[tor-commits] [tor/master] fixup! Make router_pick_directory_server respect PDS_NO_EXISTING_*

[nickm at torproject.org]

commit cae0e7b06bcb75494f75cb29fc0f9a356c284bf4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 23 12:30:47 2014 -0400

    fixup! Make router_pick_directory_server respect PDS_NO_EXISTING_*
    
    Clean up comments on PDS_NO_EXISTING_*
---
 src/or/or.h |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/or/or.h b/src/or/or.h
index 546adaa..b778435 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4925,14 +4925,13 @@ typedef struct dir_server_t {
  * or extrainfo documents.
  *
  * Passed to router_pick_directory_server (et al)
- *
- * [XXXX NOTE: This option is only implemented for pick_trusteddirserver,
- *  not pick_directory_server.  If we make it work on pick_directory_server
- *  too, we could conservatively make it only prevent multiple fetches to
- *  the same authority, or we could aggressively make it prevent multiple
- *  fetches to _any_ single directory server.]
  */
 #define PDS_NO_EXISTING_SERVERDESC_FETCH (1<<3)
+/** Flag to indicate that we should not use any directory authority to which
+ * we have an existing directory connection for downloading microdescs.
+ *
+ * Passed to router_pick_directory_server (et al)
+ */
 #define PDS_NO_EXISTING_MICRODESC_FETCH (1<<4)
 
 /** This node is to be chosen as a directory guard, so don't choose any