Merge remote-tracking branch 'origin/maint-0.2.2'

src/common/compat_libevent.c

@@ -252,9 +252,9 @@ tor_libevent_get_method(void)
 #endif
 }
 
-/** Return the le_version_t for the current version of libevent.  If the
+/** Return the le_version_t for the version of libevent specified in the
- * version is very new, return LE_OTHER.  If the version is so old that it
+ * string <b>v</b>.  If the version is very new or uses an unrecognized
- * doesn't support event_get_version(), return LE_OLD. DOCDOC */
+ * version, format, return LE_OTHER. */
 static le_version_t
 tor_decode_libevent_version(const char *v)
 {
@@ -304,7 +304,7 @@ le_versions_compatibility(le_version_t v)
 }
 
 /** Return the version number of the currently running version of Libevent.
-    See le_version_t for info on the format.
+ * See le_version_t for info on the format.
  */
 static le_version_t
 tor_get_libevent_version(const char **v_out)

src/or/config.c

@@ -4874,10 +4874,10 @@ options_save_current(void)
 }
 
 /** Mapping from a unit name to a multiplier for converting that unit into a
- * base unit. */
+ * base unit.  Used by config_parse_unit. */
 struct unit_table_t {
-  const char *unit;
+  const char *unit; /**< The name of the unit */
-  uint64_t multiplier;
+  uint64_t multiplier; /**< How many of the base unit appear in this unit */
 };
 
 /** Table to map the names of memory units to the number of bytes they

src/or/relay.c

@@ -53,9 +53,9 @@ static int circuit_consider_stop_edge_reading(circuit_t *circ,
                                               crypt_path_t *layer_hint);
 static int circuit_queue_streams_are_blocked(circuit_t *circ);
 
+/* XXXX023 move this all to compat_libevent */
 /** Cache the current hi-res time; the cache gets reset when libevent
  * calls us. */
-
 static struct timeval cached_time_hires = {0, 0};
 
 /** Stop reading on edge connections when we have this many cells
@@ -77,7 +77,7 @@ tor_gettimeofday_cached(struct timeval *tv)
 void
 tor_gettimeofday_cache_clear(void)
 {
-    cached_time_hires.tv_sec = 0;
+  cached_time_hires.tv_sec = 0;
 }
 
 /** Stats: how many relay cells have originated at this hop, or have

src/or/relay.h

@@ -64,5 +64,7 @@ void cell_ewma_set_scale_factor(or_options_t *options,
                                 networkstatus_t *consensus);
 void circuit_clear_cell_queue(circuit_t *circ, or_connection_t *orconn);
 
+void tor_gettimeofday_cache_clear(void);
+
 #endif
 

src/or/rephist.c

@@ -2326,7 +2326,6 @@ typedef struct circ_buffer_stats_t {
   double mean_time_cells_in_queue;
 } circ_buffer_stats_t;
 
-/** Holds stats. */
 smartlist_t *circuits_for_buffer_stats = NULL;
 
 /** Remember cell statistics for circuit <b>circ</b> at time

src/or/routerparse.h

@@ -82,7 +82,5 @@ int rend_parse_introduction_points(rend_service_descriptor_t *parsed,
                                    size_t intro_points_encoded_size);
 int rend_parse_client_keys(strmap_t *parsed_clients, const char *str);
 
-void tor_gettimeofday_cache_clear(void);
-
 #endif