From: Nick Mathewson Date: Thu, 30 Jul 2009 14:16:04 +0000 (-0400) Subject: Merge commit 'origin/maint-0.2.1' X-Git-Tag: tor-0.2.2.1-alpha~35 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df354a002cbb8d10f7bf9fd1cae4ca48c53c56bc;p=thirdparty%2Ftor.git Merge commit 'origin/maint-0.2.1' Resolved onflicts in: ChangeLog src/or/config.c src/or/or.h --- df354a002cbb8d10f7bf9fd1cae4ca48c53c56bc diff --cc ChangeLog index 1465407ce7,132c81597f..1d9b71b766 --- a/ChangeLog +++ b/ChangeLog @@@ -1,60 -1,16 +1,69 @@@ +Changes in version 0.2.2.1-alpha - 2009-0?-?? + o Major features: + - Add support for dynamic OpenSSL hardware crypto acceleration engines + via new AccelName and AccelDir options. + + 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. + + o Minor features: + - New --digests command-line switch to output the digests of the + source files Tor was built with. + - The "torify" script now uses torsocks where available. + - The memarea code now uses a sentinel value at the end of each area + to make sure nothing writes beyond the end of an area. This might + help debug some conceivable causes of bug 930. + - Time and memory units in the configuration file can now be set to + fractional units. For example, "2.5 MB" is now a valid value for + AccountingMax. + - Certain Tor clients (such as those behind check.torproject.org) may + want to fetch the consensus in an extra early manner. To enable this + a user may now set FetchDirInfoExtraEarly to 1. This also depends on + setting FetchDirInfoEarly to 1. Previous behavior will stay the same + as only certain clients who must have this information sooner should + set this option. + + o Deprecated and removed features: + - The controller no longer accepts the old obsolete "addr-mappings/" + or "unregistered-servers-" GETINFO values. + - Hidden services no longer publish version 0 descriptors, and clients + do not request or use version 0 descriptors. However, the authorities + still accept and serve version 0 descriptors when contacted by older + hidden services/clients. + - The EXTENDED_EVENTS and VERBOSE_NAMES controller features are now + always on; using them is necessary for correct forward-compatible + controllers. + + + Changes in version 0.2.1.20 - 2009-??-?? + o Minor bugfixes: + - Fix a signed/unsigned compile warning in 0.2.1.19. + + Changes in version 0.2.1.19 - 2009-07-28 + Tor 0.2.1.19 fixes a major bug with accessing and providing hidden + services on Tor 0.2.1.3-alpha through 0.2.1.18. + o Major bugfixes: - - Make accessing hidden services on 0.2.1.x work right - again. Bugfix on 0.2.1.3-alpha; workaround for bug 1038. + - Make accessing hidden services on 0.2.1.x work right again. + Bugfix on 0.2.1.3-alpha; workaround for bug 1038. Diagnosis and + part of patch provided by "optimist". o Minor features: - When a relay/bridge is writing out its identity key fingerprint to diff --cc src/or/config.c index cedd7f7529,603f1b606d..1e559070ef --- a/src/or/config.c +++ b/src/or/config.c @@@ -1229,7 -1232,9 +1229,8 @@@ get_effective_bwrate(or_options_t *opti bw = options->MaxAdvertisedBandwidth; if (options->RelayBandwidthRate > 0 && bw > options->RelayBandwidthRate) bw = options->RelayBandwidthRate; - return (int)bw; - + /* ensure_bandwidth_cap() makes sure that this cast can't overflow. */ + return (uint32_t)bw; } /** Return the bandwidthburst that we are going to report to the authorities diff --cc src/or/or.h index 65b582fd83,319b3a9d10..4f215d6448 --- a/src/or/or.h +++ b/src/or/or.h @@@ -2952,9 -2926,8 +2952,9 @@@ int options_need_geoip_info(or_options_ int getinfo_helper_config(control_connection_t *conn, const char *question, char **answer); +const char *tor_get_digests(void); - int get_effective_bwrate(or_options_t *options); - int get_effective_bwburst(or_options_t *options); + uint32_t get_effective_bwrate(or_options_t *options); + uint32_t get_effective_bwburst(or_options_t *options); #ifdef CONFIG_PRIVATE /* Used only by config.c and test.c */