commit 9e6ba63ee4f141f9f3bf5f82741e659f8e76a5c0 Merge: d716d11 7f0cf43 Author: Erinn Clark erinn@torproject.org Date: Thu Aug 2 07:57:49 2012 +0100

Merge branch 'maint-2.3'

build-scripts/config/alpha/torrc-obfsproxy-linux | 31 ++++++++++++++++ build-scripts/config/alpha/torrc-obfsproxy-osx | 31 ++++++++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy | 15 -------- .../config/alpha/vidalia.conf.ff-obfsproxy-linux | 21 +++++++++++ .../config/alpha/vidalia.conf.ff-obfsproxy-osx | 20 +++++++++++ build-scripts/linux-alpha.mk | 37 +++++++++++++++++++- build-scripts/osx-alpha.mk | 34 +++++++++++++++++- build-scripts/windows-alpha.mk | 35 +++++++++++++++++-- 8 files changed, 204 insertions(+), 20 deletions(-)