commit some odds and ends, so my tree is clean

svn:r2137

diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 40c57e01b00d65982383ff388624e713188d5ade..9eefc6768990823a277d547d45f56f43d443820b 100644 (file)
--- a/src/or/circuitbuild.c
+++ b/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 */

diff --git a/src/or/or.h b/src/or/or.h
index 34290e45421ad6e01f96c8834e307b0220446a22..167b6d86a3c48ff4c55b566cba90f39299573240 100644 (file)
--- a/src/or/or.h
+++ b/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 */

diff --git a/src/or/router.c b/src/or/router.c
index 937370ca1471e689a5f6bbc9ad395e19e6a303c8..fb53c8a002a51d840e62d202d0d9af1abf02f1ac 100644 (file)
--- a/src/or/router.c
+++ b/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.