[or-cvs] commit some odds and ends, so my tree is clean

[arma@seul.org (Roger Dingledine)]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	circuitbuild.c or.h router.c 
Log Message:
commit some odds and ends, so my tree is clean


Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuitbuild.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- circuitbuild.c	22 Jul 2004 03:47:20 -0000	1.17
+++ circuitbuild.c	4 Aug 2004 05:10:49 -0000	1.18
@@ -389,6 +389,7 @@
       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 */

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.395
retrieving revision 1.396
diff -u -d -r1.395 -r1.396
--- or.h	3 Aug 2004 23:57:05 -0000	1.395
+++ or.h	4 Aug 2004 05:10:49 -0000	1.396
@@ -869,6 +869,8 @@
   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 */

Index: router.c
===================================================================
RCS file: /home/or/cvsroot/src/or/router.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- router.c	22 Jul 2004 08:08:25 -0000	1.77
+++ router.c	4 Aug 2004 05:10:49 -0000	1.78
@@ -124,7 +124,7 @@
   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.