patch from karsten to clean up documentation and to integrate

more fixes into rend-spec.txt.


svn:r12715

5 files changed, 17 insertions, 5 deletions

diff --git a/src/or/buffers.c b/src/or/buffers.c
index d422d44e59..cc4b393070 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1440,7 +1440,8 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
 "</p>\n"
 "<p>\n"
 "See <a href=\"https://www.torproject.org/documentation.html\">"
-           "https://www.torproject.org/documentation.html</a> for more information.\n"
+           "https://www.torproject.org/documentation.html</a> for more "
+           "information.\n"
 "<!-- Plus this comment, to make the body response more than 512 bytes, so "
 "     IE will be willing to display it. Comment comment comment comment "
 "     comment comment comment comment comment comment comment comment.-->\n"
diff --git a/src/or/command.c b/src/or/command.c
index aa060faf3c..fe1a3594d6 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -776,3 +776,4 @@ command_process_link_auth_cell(cell_t *cell, or_connection_t *conn)
   connection_mark_for_close(TO_CONN(conn));
 }
 #endif
+
diff --git a/src/or/config.c b/src/or/config.c
index 3cc6789b8a..f9af03a62a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -291,7 +291,6 @@ static config_var_t _option_vars[] = {
   VAR("__AllDirActionsPrivate",  BOOL,  AllDirActionsPrivate,     "0"),
   VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"),
   VAR("__LeaveStreamsUnattached",BOOL,  LeaveStreamsUnattached,   "0"),
-  /* XXX020 Karsten: this still needs a man page entry -RD */
   V(MinUptimeHidServDirectoryV2, INTERVAL, "24 hours"),
   { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL }
 };
@@ -1901,7 +1900,8 @@ print_usage(void)
   printf(
 "Copyright 2001-2007 Roger Dingledine, Nick Mathewson.\n\n"
 "tor -f <torrc> [args]\n"
-"See man page for options, or https://www.torproject.org/ for documentation.\n");
+"See man page for options, or https://www.torproject.org/ for "
+"documentation.\n");
 }
 
 /** Print all non-obsolete torrc options. */
diff --git a/src/or/directory.c b/src/or/directory.c
index adfea43e63..39a65f50b7 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1743,6 +1743,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
           /* alice's ap_stream will notice when connection_mark_for_close
            * cleans it up */
           /*XXXX020 maybe retry quickly; timeout takes a while. */
+          /* This would require some kind of book-keeping which directories
+           * have been requested and which not. As directory servers are
+           * rather reliable, this should not be necessary, in constrast to
+           * v2 hidden service directories. -KL */
         } else {
           /* success. notify pending connections about this. */
           conn->_base.purpose = DIR_PURPOSE_HAS_FETCHED_RENDDESC;
@@ -1753,6 +1757,10 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
         /* not there. pending connections will be notified when
          * connection_mark_for_close cleans it up. */
         /*XXXX020 maybe retry quickly; timeout takes a while. */
+        /* This would require some kind of book-keeping which directories
+         * have been requested and which not. As directory servers are
+         * rather reliable, this should not be necessary, in constrast to
+         * v2 hidden service directories. -KL */
         break;
       case 400:
         log_warn(LD_REND,
@@ -2706,7 +2714,8 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers,
     switch (r) {
       case -1:
         log_notice(LD_DIRSERV,
-                   "Rejected router descriptor or extra-info from %s (\"%s\").",
+                   "Rejected router descriptor or extra-info from %s "
+                   "(\"%s\").",
                    conn->_base.address, msg);
         /* fall through */
       case 1:
diff --git a/src/or/or.h b/src/or/or.h
index fd5a15b015..8aa17a7cfe 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1208,7 +1208,8 @@ typedef struct signed_descriptor_t {
   size_t annotations_len;
   /** Length of the server descriptor. */
   size_t signed_descriptor_len;
-  /** Digest of the server descriptor, computed as specified in dir-spec.txt. */
+  /** Digest of the server descriptor, computed as specified in
+   * dir-spec.txt. */
   char signed_descriptor_digest[DIGEST_LEN];
   /** Identity digest of the router. */
   char identity_digest[DIGEST_LEN];