mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 13:13:44 +01:00
Merge commit 'origin/maint-0.2.1'
Resolved onflicts in: ChangeLog src/or/config.c src/or/or.h
This commit is contained in:
commit
df354a002c
19
ChangeLog
19
ChangeLog
@ -51,10 +51,19 @@ Changes in version 0.2.2.1-alpha - 2009-0?-??
|
||||
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
|
||||
@ -73,6 +82,12 @@ Changes in version 0.2.1.19 - 2009-07-28
|
||||
|
||||
|
||||
Changes in version 0.2.1.18 - 2009-07-24
|
||||
Tor 0.2.1.18 lays the foundations for performance improvements,
|
||||
adds status events to help users diagnose bootstrap problems, adds
|
||||
optional authentication/authorization for hidden services, fixes a
|
||||
variety of potential anonymity problems, and includes a huge pile of
|
||||
other features and bug fixes.
|
||||
|
||||
o Build fixes:
|
||||
- Add LIBS=-lrt to Makefile.am so the Tor RPMs use a static libevent.
|
||||
|
||||
|
31
ReleaseNotes
31
ReleaseNotes
@ -3,7 +3,38 @@ This document summarizes new features and bugfixes in each stable release
|
||||
of Tor. If you want to see more detailed descriptions of the changes in
|
||||
each development snapshot, see the ChangeLog file.
|
||||
|
||||
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.
|
||||
|
||||
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. Diagnosis and
|
||||
part of patch provided by "optimist".
|
||||
|
||||
o Minor features:
|
||||
- When a relay/bridge is writing out its identity key fingerprint to
|
||||
the "fingerprint" file and to its logs, write it without spaces. Now
|
||||
it will look like the fingerprints in our bridges documentation,
|
||||
and confuse fewer users.
|
||||
|
||||
o Minor bugfixes:
|
||||
- Relays no longer publish a new server descriptor if they change
|
||||
their MaxAdvertisedBandwidth config option but it doesn't end up
|
||||
changing their advertised bandwidth numbers. Bugfix on 0.2.0.28-rc;
|
||||
fixes bug 1026. Patch from Sebastian.
|
||||
- Avoid leaking memory every time we get a create cell but we have
|
||||
so many already queued that we refuse it. Bugfix on 0.2.0.19-alpha;
|
||||
fixes bug 1034. Reported by BarkerJr.
|
||||
|
||||
|
||||
Changes in version 0.2.1.18 - 2009-07-24
|
||||
Tor 0.2.1.18 lays the foundations for performance improvements,
|
||||
adds status events to help users diagnose bootstrap problems, adds
|
||||
optional authentication/authorization for hidden services, fixes a
|
||||
variety of potential anonymity problems, and includes a huge pile of
|
||||
other features and bug fixes.
|
||||
|
||||
o Major features (clients):
|
||||
- Start sending "bootstrap phase" status events to the controller,
|
||||
so it can keep the user informed of progress fetching directory
|
||||
|
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -1,3 +1,11 @@
|
||||
tor (0.2.1.19-1) unstable; urgency=low
|
||||
|
||||
* New upstream version.
|
||||
- Make accessing hidden services on 0.2.1.x work right (closes: #538960).
|
||||
[More items are in the upstream changelog.]
|
||||
|
||||
-- Peter Palfrader <weasel@debian.org> Wed, 29 Jul 2009 12:49:03 +0200
|
||||
|
||||
tor (0.2.1.18-1) unstable; urgency=low
|
||||
|
||||
* New upstream version.
|
||||
|
@ -1221,7 +1221,7 @@ options_need_geoip_info(or_options_t *options, const char **reason_out)
|
||||
|
||||
/** Return the bandwidthrate that we are going to report to the authorities
|
||||
* based on the config options. */
|
||||
int
|
||||
uint32_t
|
||||
get_effective_bwrate(or_options_t *options)
|
||||
{
|
||||
uint64_t bw = options->BandwidthRate;
|
||||
@ -1229,18 +1229,20 @@ get_effective_bwrate(or_options_t *options)
|
||||
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
|
||||
* based on the config options. */
|
||||
int
|
||||
uint32_t
|
||||
get_effective_bwburst(or_options_t *options)
|
||||
{
|
||||
uint64_t bw = options->BandwidthBurst;
|
||||
if (options->RelayBandwidthBurst > 0 && bw > options->RelayBandwidthBurst)
|
||||
bw = options->RelayBandwidthBurst;
|
||||
return (int)bw;
|
||||
/* ensure_bandwidth_cap() makes sure that this cast can't overflow. */
|
||||
return (uint32_t)bw;
|
||||
}
|
||||
|
||||
/** Fetch the active option list, and take actions based on it. All of the
|
||||
|
@ -2953,8 +2953,8 @@ 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 */
|
||||
|
Loading…
Reference in New Issue
Block a user