Merge commit 'karsten/proposal-166-impl-master'

diff --cc ChangeLog
index 5b169956d3e89d2ac95c0374449f1db485a72629,97f9a3b629e75f5ada71bd2c59dee71fa5213ef3..6208f23baf44b19a5352ebaca2dac62ab423fb78
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,28 -2,26 +2,29 @@@ Changes in version 0.2.2.1-alpha - 2009
    o Major features:
      - Add support for dynamic OpenSSL hardware crypto acceleration engines
        via new AccelName and AccelDir options.
 +    - Tor now supports tunneling all of its outgoing connections over a SOCKS
 +      proxy, using the SOCKS4Proxy and/or SOCKS5Proxy configuration options.
 +      Code by Christopher Davis.
  
    o New options for gathering stats safely:
-     - Directories that configure with --enable-dirreq-stats and set
-       "DirReqStatistics 1" write directory request stats to disk every
-       24 hours. As compared to the --enable-geoip-stats flag in 0.2.1.x,
-       there are a few improvements: 1) stats are written to disk exactly
-       every 24 hours; 2) estimated shares of v2 and v3 requests are
-       determined as mean values, not at the end of a measurement period;
-       3) unresolved requests are listed with country code '??';
-       4) directories also measure download times.
-     - Exit nodes that configure with --enable-exit-stats and set
-       "ExitPortStatistics 1" write statistics on the number of exit
-       streams and transferred bytes per port to disk every 24 hours.
-     - Relays that configure with --enable-buffer-stats and set
-       "CellStatistics 1" write statistics to disk every 24 hours on how
-       long cells spend in their circuit queues.
-     - Entry nodes that configure with --enable-entry-stats and set
-       "EntryStatistics 1" write statistics to disk every 24 hours on
-       the rough number and origins of connecting clients.
+     - Directories that set "DirReqStatistics 1" write statistics on
+       directory request to disk every 24 hours. As compared to the
+       --enable-geoip-stats flag in 0.2.1.x, there are a few improvements:
+       1) stats are written to disk exactly every 24 hours; 2) estimated
+       shares of v2 and v3 requests are determined as mean values, not at
+       the end of a measurement period; 3) unresolved requests are listed
+       with country code '??'; 4) directories also measure download times.
+     - Exit nodes that set "ExitPortStatistics 1" write statistics on the
+       number of exit streams and transferred bytes per port to disk every
+       24 hours.
+     - Relays that set "CellStatistics 1" write statistics on how long
+       cells spend in their circuit queues to disk every 24 hours.
+     - Entry nodes that set "EntryStatistics 1" write statistics on the
+       rough number and origins of connecting clients to disk every 24
+       hours.
+     - Relays that write any of the above statistics to disk and set
+       "ExtraInfoStatistics 1" include the past 24 hours of statistics in
+       their extra-info documents.
  
    o Minor features:
      - New --digests command-line switch to output the digests of the

diff --cc configure.in
Simple merge

diff --cc doc/spec/dir-spec.txt
Simple merge

diff --cc doc/tor.1.in
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/geoip.c
index c61ac3c5fd693f232fae60ae38966aeec7a2ecde,247e16cff312428e92af0dbfccc86a05d3d05206..befc3d9e06b6d611c527a7932792a729ca6de759
--- 1/src/or/geoip.c
--- 2/src/or/geoip.c
+++ b/src/or/geoip.c
@@@ -801,17 -780,13 +788,16 @@@ geoip_get_dirreq_history(geoip_client_a
                             dltimes[8*complete/10-1],
                             dltimes[9*complete/10-1],
                             dltimes[complete-1]);
 +    if (written<0)
 +      tor_free(result);
      tor_free(dltimes);
    }
 -  if (written < 0)
 -    result = NULL;
 -  smartlist_free(dirreq_times);
 + done:
 +  SMARTLIST_FOREACH(dirreq_completed, dirreq_map_entry_t *, ent,
 +                    tor_free(ent));
 +  smartlist_free(dirreq_completed);
    return result;
  }
- #endif
  
  /** How long do we have to have observed per-country request history before we
   * are willing to talk about it? */

diff --cc src/or/main.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/or/router.c
Simple merge

diff --cc src/or/routerparse.c
Simple merge

diff --cc src/or/test.c
Simple merge