From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 12 Oct 2009 03:30:19 +0000 (-0400)
Subject: Merge commit 'public/android'
X-Git-Tag: tor-0.2.2.6-alpha~48
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da990d09c3b0bfd035b9c0f27ac6c84b7375a7c6;p=thirdparty%2Ftor.git

Merge commit 'public/android'
---

da990d09c3b0bfd035b9c0f27ac6c84b7375a7c6
diff --cc ChangeLog
index 4d4745aae1,a354cac78d..52bcd7e670
--- a/ChangeLog
+++ b/ChangeLog
@@@ -46,11 -13,18 +46,13 @@@ Changes in version 0.2.2.4-alpha - 2009
        can run tests in their own processes, have smarter setup/teardown
        code, and so on.  The unit test code has moved to its own
        subdirectory, and has been split into multiple modules.
+     - Numerous fixes from Nathan Freitas so that Tor can build correctly for
+       Android phones.
  
 -  o Minor bugfixes:
 -    - Fix a couple of smaller issues with gathering statistics. Bugfixes
 -      on 0.2.2.1-alpha.
 -    - Fix two memory leaks in the error case of
 -      circuit_build_times_parse_state. Bugfix on 0.2.2.2-alpha.
 -    - Make it explicit that we can't overflow in
 -      connection_ap_handshake_send_resolve. Bugfix on 0.0.7.1-1.
  
  Changes in version 0.2.2.3-alpha - 2009-09-23
 +  Tor 0.2.2.3-alpha fixes a few crash bugs in 0.2.2.2-alpha.
 +
    o Major bugfixes:
      - Fix an overzealous assert in our new circuit build timeout code.
        Bugfix on 0.2.2.2-alpha; fixes bug 1103.