minor cleanups

svn:r13190

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index c42e8ca4f55fcb0bef6f9ebddd6598789337472a..9fc8da8fb0e7151361c2299960306a79b90d224c 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1402,7 +1402,7 @@ connection_ap_handshake_rewrite_and_attach(edge_connection_t *conn,
       }
     } else if (socks->command == SOCKS_COMMAND_RESOLVE_PTR) {
       rep_hist_note_used_resolve(time(NULL)); /* help predict this next time */
-      ; /* nothing */
+      /* no extra processing needed */
     } else {
       tor_fragile_assert();
     }

diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index c639649de17bdb94ae9ae8244363f1fef4092e4c..144d0acf5bb1bf51eb4c03498b4056cc077ea042 100644 (file)
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -911,7 +911,7 @@ connection_or_set_state_open(or_connection_t *conn)
 
 /** Pack <b>cell</b> into wire-format, and write it onto <b>conn</b>'s outbuf.
  * For cells that use or affect a circuit, this should only be called by
- * connection_or_flush_from_first_active_circuit()
+ * connection_or_flush_from_first_active_circuit().
  */
 void
 connection_or_write_cell_to_buf(const cell_t *cell, or_connection_t *conn)

diff --git a/src/or/or.h b/src/or/or.h
index d19b41b94bfcf2006ccf19837eaf061d23ad0e1d..9b176b7fb453ba08f2dca786f125b1bd88c88c74 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2100,7 +2100,7 @@ typedef struct {
   /** Boolean: should we never publish a descriptor? Deprecated. */
   int NoPublish;
   /** To what authority types do we publish our descriptor? Choices are
-   * "v1", "v2", "bridge", or "". */
+   * "v1", "v2", "v3", "bridge", or "". */
   smartlist_t *PublishServerDescriptor;
   /** An authority type, derived from PublishServerDescriptor. */
   authority_type_t _PublishServerDescriptor;
@@ -2108,7 +2108,7 @@ typedef struct {
   int PublishHidServDescriptors;
   int FetchServerDescriptors; /**< Do we fetch server descriptors as normal? */
   int FetchHidServDescriptors; /** and hidden service descriptors? */
-  int HidServDirectoryV2; /**< Do we act as hs dir? */
+  int HidServDirectoryV2; /**< Do we participate in the HS DHT? */
 
   int MinUptimeHidServDirectoryV2; /**< As directory authority, accept hidden
                                     * service directories after what time? */
@@ -2176,17 +2176,17 @@ typedef struct {
   char *TestVia; /**< When reachability testing, use these as middle hop. */
   config_line_t *RendConfigLines; /**< List of configuration lines
                                           * for rendezvous services. */
-  char *ContactInfo; /**< Contact info to be published in the directory */
+  char *ContactInfo; /**< Contact info to be published in the directory. */
 
-  char *HttpProxy; /**< hostname[:port] to use as http proxy, if any */
-  uint32_t HttpProxyAddr; /**< Parsed IPv4 addr for http proxy, if any */
-  uint16_t HttpProxyPort; /**< Parsed port for http proxy, if any */
-  char *HttpProxyAuthenticator; /**< username:password string, if any */
+  char *HttpProxy; /**< hostname[:port] to use as http proxy, if any. */
+  uint32_t HttpProxyAddr; /**< Parsed IPv4 addr for http proxy, if any. */
+  uint16_t HttpProxyPort; /**< Parsed port for http proxy, if any. */
+  char *HttpProxyAuthenticator; /**< username:password string, if any. */
 
-  char *HttpsProxy; /**< hostname[:port] to use as https proxy, if any */
-  uint32_t HttpsProxyAddr; /**< Parsed IPv4 addr for https proxy, if any */
-  uint16_t HttpsProxyPort; /**< Parsed port for https proxy, if any */
-  char *HttpsProxyAuthenticator; /**< username:password string, if any */
+  char *HttpsProxy; /**< hostname[:port] to use as https proxy, if any. */
+  uint32_t HttpsProxyAddr; /**< Parsed IPv4 addr for https proxy, if any. */
+  uint16_t HttpsProxyPort; /**< Parsed port for https proxy, if any. */
+  char *HttpsProxyAuthenticator; /**< username:password string, if any. */
 
   /** List of configuration lines for replacement directory authorities.
    * If you just want to replace one class of authority at a time,
@@ -2309,9 +2309,9 @@ typedef struct {
 
   /** The length of time that we think a consensus should be fresh. */
   int V3AuthVotingInterval;
-  /** The length of time we think it will take to distribute votes */
+  /** The length of time we think it will take to distribute votes. */
   int V3AuthVoteDelay;
-  /** The length of time we think it will take to distribute signatures */
+  /** The length of time we think it will take to distribute signatures. */
   int V3AuthDistDelay;
   /** The number of intervals we think a consensus should be valid. */
   int V3AuthNIntervalsValid;