From: Roger Dingledine <arma@torproject.org>
Date: Tue, 16 Feb 2010 07:34:52 +0000 (-0500)
Subject: Merge commit 'sebastian/oldstuff'
X-Git-Tag: tor-0.2.2.9-alpha~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de0330b0929a83dc765f51bb6997f2cc8b7618be;p=thirdparty%2Ftor.git

Merge commit 'sebastian/oldstuff'

Conflicts:

	ChangeLog
---

de0330b0929a83dc765f51bb6997f2cc8b7618be
diff --cc ChangeLog
index f762c39beb,b676d33433..92e1ec1e5b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -25,9 -25,10 +25,13 @@@ Changes in version 0.2.2.9-alpha - 2010
      - 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