From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 18 Feb 2010 17:01:56 +0000 (-0500)
Subject: Merge remote branch 'origin/maint-0.2.1'
X-Git-Tag: tor-0.2.2.9-alpha~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=715f104eebac8d35d9cd7a404ac9924e9d623774;p=thirdparty%2Ftor.git

Merge remote branch 'origin/maint-0.2.1'

Conflicts:
	ChangeLog
	configure.in
	contrib/tor-mingw.nsi.in
	src/win32/orconfig.h
---

715f104eebac8d35d9cd7a404ac9924e9d623774
diff --cc ChangeLog
index 92e1ec1e5b,376c8500c8..6ec19e6527
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,59 -1,14 +1,69 @@@
 +Changes in version 0.2.2.9-alpha - 2010-??-??
 +  o Major bugfixes:
 +    - Authorities could be tricked into giving out the Exit flag to relays
 +      that didn't allow exiting to any ports. This could screw with load
 +      balancing and stats. Bugfix on 0.1.1.6-alpha, fixes bug 1238. Bug
 +      discovered by Martin Kowalczyk.
 +
 +  o Minor bugfixes:
 +    - When deciding whether to use strange flags to turn TLS renegotiation
 +      on, detect the OpenSSL version at run-time, not compile time.  We
 +      need to do this because Apple doesn't update its dev-tools headers
 +      when it updates its libraries in a security patch.
 +    - Fix static compilation by listing the openssl libraries in the right
 +      order.  Fixes bug 1237.
 +    - Actually reject .exit hostnames when we're supposed to be rejecting
 +      them; do not pass them on to the exit server.  Bugfix on 0.2.2.7-alpha;
 +      found and diagnosed by Scott Bennett and Downie on or-talk.
 +    - Don't spam the controller with log messages when we have no file
 +      descriptors available. Rate-limiting for log messages was already
 +      implemented in the past.
 +    - Avoid a bogus overlapped memcpy in tor_addr_copy().  Found by
 +      "memcpyfail".
 +
 +  o Code simplifications and refactoring:
 +    - Generate our manpage and HTML documentation using Asciidoc.  This
 +      should make it easier to maintain the documentation, and produce
 +      nicer HTML.
 +    - Remove the --enable-iphone option.  According to reports from
 +      Marco Bonetti, Tor builds fine without any special tweaking on
 +      recent iPhone SDK versions.
 +    - Removed some unnecessary files from the source distribution. The
 +      AUTHORS file had its content merged into the people page on the
 +      website. The roadmaps and design doc can now be found in the
 +      projects directory in svn.
 +
 +  o Removed features:
 +    - Stop shipping parts of the website and the design paper in the
 +      source tarballs.
 +
 +
 +Changes in version 0.2.2.8-alpha - 2010-01-26
 +  o Major bugfixes:
 +    - Fix a memory corruption bug on bridges that occured during the
 +      inclusion of stats data in extra-info descriptors. Also fix the
 +      interface for geoip_get_bridge_stats* to prevent similar bugs in
 +      the future. Diagnosis by Tas, patch by Karsten and Sebastian.
 +      Fixes bug 1208; bugfix on 0.2.2.7-alpha.
 +
 +  o Minor bugfixes:
 +    - Ignore OutboundBindAddress when connecting to localhost.
 +      Connections to localhost need to come _from_ localhost, or else
 +      local servers (like DNS and outgoing HTTP/SOCKS proxies) will often
 +      refuse to listen.
 +
 +
- Changes in version 0.2.1.23 - 2010-0?-??
+ Changes in version 0.2.1.24 - 2010-??-??
+   o Minor bugfixes:
+     - Work correctly out-of-the-box with even more vendor-patched versions
+       of OpenSSL.
+ 
+ 
+ Changes in version 0.2.1.23 - 2010-02-13
+   Tor 0.2.1.23 fixes a huge client-side performance bug, makes Tor work
+   again on the latest OS X, and updates the location of a directory
+   authority.
+ 
    o Major bugfixes (performance):
      - We were selecting our guards uniformly at random, and then weighting
        which of our guards we'd use uniformly at random. This imbalance
diff --cc contrib/tor-mingw.nsi.in
index 2390e4a572,ffe836c39e..0f7f669c27
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@@ -8,7 -8,8 +8,8 @@@
  !include "LogicLib.nsh"
  !include "FileFunc.nsh"
  !insertmacro GetParameters
 -  
 -!define VERSION "0.2.1.23-dev"
++
 +!define VERSION "0.2.2.8-alpha-dev"
  !define INSTALLER "tor-${VERSION}-win32.exe"
  !define WEBSITE "https://www.torproject.org/"
  !define LICENSE "LICENSE"