[tor-commits] [torbrowser/maint-2.4] Merge branch 'maint-2.3' into maint-2.4

[erinn at torproject.org]

commit 9b7d95454aaf67420de85c6e4fb65f672872e4bf
Merge: b2e32f4 03ebcff
Author: Erinn Clark <erinn at torproject.org>
Date:   Fri Jan 4 11:52:58 2013 +0100

    Merge branch 'maint-2.3' into maint-2.4
    
    Conflicts:
    	build-scripts/linux-alpha.mk
    	build-scripts/osx-alpha.mk
    	build-scripts/versions-alpha.mk
    	build-scripts/windows-alpha.mk

 README.LINUX-2.2          |   29 ---
 README.LINUX-2.3          |    8 +-
 README.OSX-2.2            |   23 ---
 README.OSX-2.3            |    8 +-
 README.WIN-2.2            |   27 ---
 README.WIN-2.3            |    8 +-
 build-scripts/linux.mk    |    2 +-
 build-scripts/osx.mk      |    2 +-
 build-scripts/versions.mk |    8 +-
 build-scripts/windows.mk  |    2 +-
 changelog.linux-2.2       |  404 ------------------------------------------
 changelog.linux-2.3       |    9 +
 changelog.osx-2.2         |  424 ---------------------------------------------
 changelog.osx-2.3         |    9 +
 changelog.windows-2.2     |  397 ------------------------------------------
 changelog.windows-2.3     |    9 +
 16 files changed, 46 insertions(+), 1323 deletions(-)