From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 13 Nov 2009 18:01:22 +0000 (+0100)
Subject: Merge commit 'tor-0.2.1.20' into debian-merge
X-Git-Tag: tor-0.2.2.6-alpha~3^2~1^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e74939671b73da0b5dce119bc1d5701982bc3b6;p=thirdparty%2Ftor.git

Merge commit 'tor-0.2.1.20' into debian-merge

* commit 'tor-0.2.1.20': (36 commits)
  bump to 0.2.1.20
  Move moria1 and Tonga to alternate IP addresses.
  read the "circwindow" parameter from the consensus
  Code to parse and access network parameters.
  Revert "Teach connection_ap_can_use_exit about Exclude*Nodes"
  Work around a memory leak in openssl 0.9.8g (and maybe others)
  Teach connection_ap_can_use_exit about Exclude*Nodes
  make some bug 1090 warnings go away
  Fix a memory leak when parsing a ns
  Fix obscure 64-bit big-endian hidserv bug
  turns out the packaging changes aren't in 0.2.1.20
  update changelog with bundle details
  Use an _actual_ fix for the byte-reverse warning.
  Use a simpler fix for the byte-reversing warning
  Fix compile warnings on Snow Leopard
  Add getinfo accepted-server-descriptor. Clean spec.
  Reduce log level for bug case that we now know really exists.
  Only send reachability status events on overall success/failure
  update the README instructions and OS X makefiles
  Avoid segfault when accessing hidden service.
  ...
---

0e74939671b73da0b5dce119bc1d5701982bc3b6