commit some odds and ends, so my tree is clean

svn:r2137

src/or/circuitbuild.c

@@ -389,6 +389,7 @@ int circuit_send_next_onion_skin(circuit_t *circ) {
       if(!has_completed_circuit) {
         has_completed_circuit=1;
         log_fn(LOG_NOTICE,"Tor has successfully opened a circuit. Looks like it's working.");
+// XXX008 put a count of known routers here
       }
       circuit_rep_hist_note_result(circ);
       circuit_has_opened(circ); /* do other actions as necessary */

src/or/or.h

@@ -869,6 +869,8 @@ typedef struct {
   int NumCpus; /**< How many CPUs should we try to use? */
   int RunTesting; /**< If true, create testing circuits to measure how well the
                    * other ORs are running. */
+  struct config_line_t *TrustedDirs; /**< List of fingerprints of keys that are
+                                          allowed to sign directories. */
   struct config_line_t *RendConfigLines; /**< List of configuration lines
                                           * for rendezvous services. */
   char *ContactInfo; /** Contact info to be published in the directory */

src/or/router.c

@@ -124,7 +124,7 @@ void rotate_onion_key(void)
   log_fn(LOG_WARN, "Couldn't rotate onion key.");
 }
 
-/** The last calculated bandwidth usage for our node. */
+/** The latest calculated bandwidth usage for our node. */
 static int advertised_bw = 0;
 /** Tuck <b>bw</b> away so we can produce it when somebody
  * calls router_get_advertised_bandwidth() below.