minor cleanups

svn:r10050

diff --git a/doc/TODO b/doc/TODO
index 1732ebe6c9970769893321a9bfd93b6ce51fb9de..3fb212ba484d1d5f56f13109488b3e791eeb7845 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -410,6 +410,9 @@ R - add d64 and fp64 along-side d and fp so people can paste status
 
 
 Future version:
+  - servers might check certs for known-good ssl websites, and if they
+    come back self-signed, declare themselves to be non-exits. similar
+    to how we test for broken/evil dns now.
   - we try to build 4 test circuits to break them over different
     servers. but sometimes our entry node is the same for multiple
     test circuits. this defeats the point.

diff --git a/doc/spec/proposals/000-index.txt b/doc/spec/proposals/000-index.txt
index ca0586a9865cb5241b109cddcac2bf5561af39d3..afdd2f4058a79408afa77c7f382dde7d441fa366 100644 (file)
--- a/doc/spec/proposals/000-index.txt
+++ b/doc/spec/proposals/000-index.txt
@@ -30,5 +30,6 @@ Proposals by number:
 109  No more than one server per IP address [ACCEPTED]
 110  Avoiding infinite length circuits [OPEN]
 111  Prioritizing local traffic over relayed traffic [OPEN]
-112  Bring Back Patlen Coin Weight [OPEN]
-113  Simplifying directory authority administration [OPEN]
\ No newline at end of file
+112  Bring Back Pathlen Coin Weight [OPEN]
+113  Simplifying directory authority administration [OPEN]
+

diff --git a/doc/spec/proposals/103-multilevel-keys.txt b/doc/spec/proposals/103-multilevel-keys.txt
index 474d3f225001a3f8f733af85251980320977ecb5..3f6668f264c3f67da4f7a080bd7b5d736976d721 100644 (file)
--- a/doc/spec/proposals/103-multilevel-keys.txt
+++ b/doc/spec/proposals/103-multilevel-keys.txt
@@ -132,7 +132,7 @@ Extensions to Proposal 101.
       The "fingerprint" field is generated based on the identity key, not
       the signing key.
 
-  Consensus network statues change as follows:
+  Consensus network statuses change as follows:
 
       Remove dir-signing-key.
 
@@ -152,4 +152,4 @@ Extensions to Proposal 101.
 
   Verification:
 
-      [XXXX write me]
\ No newline at end of file
+      [XXXX write me]

diff --git a/doc/spec/proposals/113-fast-authority-interface.txt b/doc/spec/proposals/113-fast-authority-interface.txt
index 49829086e7bf78af56f46c7023f7caea54ee21bf..13dd4f82ca5cfd1073387d48114136b75b99d24a 100644 (file)
--- a/doc/spec/proposals/113-fast-authority-interface.txt
+++ b/doc/spec/proposals/113-fast-authority-interface.txt
@@ -78,3 +78,4 @@ Possible solution #4: A separate mailing list for authority operators.
   Right now, the tor-ops list is very high volume.  There should be another
   list that's only for dealing with problems that need prompt action, like
   marking a router as !badexit.
+

diff --git a/src/or/or.h b/src/or/or.h
index ed89e5cc889a5fae7f082b3e87c0e2c6e14fb535..32b72883578f54890b34d8ef76e76f0ee5dae95f 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -801,10 +801,10 @@ typedef struct connection_t {
   struct connection_t *linked_conn;
   /* XXXX020 NM move these up to the other 1-bit flags. */
   unsigned int linked:1; /**< True if there is, or has been, a linked_conn. */
-  /** True iff we'd like to be notified about read events from the linked conn.
-   */
+  /** True iff we'd like to be notified about read events from the
+   * linked conn. */
   unsigned int reading_from_linked_conn:1;
-  /** True iff we're willing  to write to the linked conn. */
+  /** True iff we're willing to write to the linked conn. */
   unsigned int writing_to_linked_conn:1;
   /** True iff we're currently able to read on the linked conn, and our
    * read_event should be made active with libevent. */

diff --git a/src/or/relay.c b/src/or/relay.c
index a2058690d4967b0fb15a4f92eebbc7597af1ced6..514f6210c01f870a209a0eb17f75043bb124f4d1 100644 (file)
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1497,7 +1497,6 @@ free_cell_pool(void)
 {
   /* Maybe we haven't called init_cell_pool yet; need to check for it. */
   if (cell_pool) {
-    tor_assert(cell_pool);
     mp_pool_destroy(cell_pool);
     cell_pool = NULL;
   }