This project is archived. Its data is read-only.

Commit 55d73def authored Oct 13, 2012 by Erinn Clark

Merge branch 'maint-2.2' into maint-2.3

parents 27f13b37 5b6d240d

README.LINUX-2.2

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ Included applications

		Vidalia 0.2.20 (with Qt 4.8.1)
		Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
		Firefox 10.0.8esr
		Firefox 10.0.9esr
		\_ Torbutton 1.4.6.3
		\|_ NoScript 2.5.7
		\|_ HTTPS-Everywhere 2.2.2

README.OSX-2.2

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ Included applications

		Vidalia 0.2.20 (with Qt 4.8.1)
		Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
		Firefox 10.0.8esr
		Firefox 10.0.9esr
		\_ Torbutton 1.4.6.3
		\|_ NoScript 2.5.7
		\|_ HTTPS-Everywhere 2.2.2

README.WIN-2.2

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ Included applications

		Vidalia 0.2.20 (with Qt 4.8.1)
		Tor 0.2.2.39 (with libevent-2.0.20-stable, zlib-1.2.7 and openssl-1.0.1c)
		Firefox 10.0.8esr
		Firefox 10.0.9esr
		\_ Torbutton 1.4.6.3
		\|_ NoScript 2.5.7
		\|_ HTTPS-Everywhere 2.2.2

build-scripts/linux.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@

		## Architecture
		ARCH_TYPE=$(shell uname -m)
		BUILD_NUM=2
		BUILD_NUM=3
		PLATFORM=Linux

		## Build machine specific settings

build-scripts/osx.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@

		## Architecture
		ARCH_TYPE=x86_64
		BUILD_NUM=2
		BUILD_NUM=3
		PLATFORM=MacOS

		## Set OSX-specific backwards compatibility options