Merge commit 'sebastian/oldstuff'

Conflicts:

	ChangeLog

diff --cc ChangeLog
index f762c39beb5854ef409f1881e59092c1a7a15ddc,b676d3343372a830245e87fdd436132452e8d646..92e1ec1e5b9e11e5d20c4708395f5ed9f9ee665c
--- 1/ChangeLog
--- 2/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