From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 3 Sep 2009 12:45:54 +0000 (+0200)
Subject: Merge commit 'tor-0.2.2.1-alpha' into debian-merge
X-Git-Tag: tor-0.2.2.3-alpha~4^2~3^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1407022162f386d0ed373b6aa9ea40faf2cfb556;p=thirdparty%2Ftor.git

Merge commit 'tor-0.2.2.1-alpha' into debian-merge

* 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.
  ...
---

1407022162f386d0ed373b6aa9ea40faf2cfb556