* debian-merge: (190 commits)
Forward port patches/06_add_compile_time_defaults.dpatch
Forward port patches/03_tor_manpage_in_section_8.dpatch
New upstream version
HiddenServiceVersion must be set to 2 currently.
put karsten's changelog in the right place
When Tor fails to parse a descriptor of any kind, dump it to disk.
update fetch-all with dir auth
changelog and spec changes for the .exit fix
bump to 0.2.2.1-alpha
typos in dir-spec
mark off a done proposal
clean up the changelog for 0.2.2.1-alpha
A changelog entry and a bit more documentation for socks-client
Clean up a couple of style issues in the socks-client branch.
new proposals: params in consensus, and lower circwindow
Add some fixes after discussion with Nick.
Refactor geoip_get_dirreq_history() some more.
Fix a memory leak in summarizing directory request timing.
Add the first 8 bytes of the git commit digest to our versions.
autoconf 2.59 appears not to support AC_PROG_SED
...
* commit 'tor-0.2.2.1-alpha': (187 commits)
HiddenServiceVersion must be set to 2 currently.
put karsten's changelog in the right place
When Tor fails to parse a descriptor of any kind, dump it to disk.
update fetch-all with dir auth
changelog and spec changes for the .exit fix
bump to 0.2.2.1-alpha
typos in dir-spec
mark off a done proposal
clean up the changelog for 0.2.2.1-alpha
A changelog entry and a bit more documentation for socks-client
Clean up a couple of style issues in the socks-client branch.
new proposals: params in consensus, and lower circwindow
Add some fixes after discussion with Nick.
Refactor geoip_get_dirreq_history() some more.
Fix a memory leak in summarizing directory request timing.
Add the first 8 bytes of the git commit digest to our versions.
autoconf 2.59 appears not to support AC_PROG_SED
Survive unparseable cached cert file
Notice v3 cert parsing failures
Make crypto_digest_get_digest nondestructive again.
...
Fix an obscure bug where hidden services on 64-bit big-endian
systems might mis-read the timestamp in v3 introduce cells, and
refuse to connect back to the client. Discovered by "rotor".
Bugfix on 0.2.1.6-alpha.
(Given that we're pretty much assuming that int is 32 bits, and given that
hex values are always unsigned, taking out the "ul" from 0xff000000 should
be fine.)
Add a "getinfo status/accepted-server-descriptor" controller
command, which is the recommended way for controllers to learn
whether our server descriptor has been successfully received by at
least on directory authority. Un-recommend good-server-descriptor
getinfo and status events until we have a better design for them.
We were telling the controller about CHECKING_REACHABILITY and
REACHABILITY_FAILED status events whenever we launch a testing
circuit or notice that one has failed. Instead, only tell the
controller when we want to inform the user of overall success or
overall failure. Bugfix on 0.1.2.6-alpha. Fixes bug 1075. Reported
by SwissTorExit.
When we added support for fractional units (like 1.5 MB) I broke
support for giving units with no space (like 2MB). This patch should
fix that. It also adds a propoer tor_parse_double().
Fix for bug 1076. Bugfix on 0.2.2.1-alpha.
We were triggering a CLOCK_SKEW controller status event whenever
we connect via the v2 connection protocol to any relay that has
a wrong clock. Instead, we should only inform the controller when
it's a trusted authority that claims our clock is wrong. Bugfix
on 0.2.0.20-rc; starts to fix bug 1074. Reported by SwissTorExit.
