Merge commit 'karsten/geoipstats-shares-master'

diff --cc ChangeLog
index 3c778c86432d1693864efb3ba44ca97df68dd79d,c4cc07b311194449ebb20355d8f2787c2c75d257..30a776c29eedcec87cfd6be4ce3f096568a47aeb
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -16,8 -16,9 +16,10 @@@ Changes in version 0.2.2.1-alpha - 2009
        to make sure nothing writes beyond the end of an area.  This might
        help debug some conceivable causes of bug 930.
      - Directories that are configured with the --enable-geoip-stats flag
-       now write their GeoIP stats to disk exactly every 24 hours. Also,
-       unresolved requests are listed with country code '??'.
+       now write their GeoIP stats to disk exactly every 24 hours.
+       Estimated shares of v2 and v3 requests are determined as averages,
 -      not at the end of a measurement period.
++      not at the end of a measurement period. Also, unresolved requests
++      are listed with country code '??'.
      - Exit nodes can write statistics on the number of exit streams and
        transferred bytes per port to disk every 24 hours.  To enable this,
        run configure with the --enable-exit-stats option, and set

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