From: Peter Palfrader Date: Thu, 3 Sep 2009 13:19:37 +0000 (+0200) Subject: Merge branch 'debian-merge' into debian X-Git-Tag: tor-0.2.2.3-alpha~4^2~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b440a4d9369c4a6c4501b289f2e6ff089ba9a519;p=thirdparty%2Ftor.git Merge branch 'debian-merge' into debian * 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 ... --- b440a4d9369c4a6c4501b289f2e6ff089ba9a519