Commit 136c7482 authored by Andrew Lewman's avatar Andrew Lewman
Browse files

Backport: the alpha installer for osx has been through four release, 

consider it well tested.


svn:r13065
parent a0eb9022

contrib/osx/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -8,5 +8,5 @@ EXTRA_DIST = PrivoxyConfDesc.plist PrivoxyConfInfo.plist \ 
    TorInfo.plist.in TorStartupDesc.plist.in TorStartupInfo.plist \

    package.sh privoxy.config TorPostflight addsysuser            \

    Tor_Uninstaller.applescript uninstall_tor_bundle.sh           \

    package_list.txt tor_logo.gif                                 \

    TorPreFlight
 
    TorbuttonInfo.plist TorbuttonDesc.plist                       \

    package_list.txt tor_logo.gif TorPreFlight

contrib/osx/Tor

+6 −7
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ if [ $ARCH != "universal" ]; then 
	export EVENT_NOKQUEUE=1

fi





##

# Tor Service

##

contrib/osx/TorBundleDesc.plist.in

+2 −2
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
	<key>IFPkgDescriptionDeleteWarning</key>

	<string></string>

	<key>IFPkgDescriptionDescription</key>

	<string>Bundled package of Tor @VERSION@ and Privoxy.</string>

	<string>Bundled package of Tor @VERSION@, Privoxy 3.0.6, and Torbutton.</string>

	<key>IFPkgDescriptionTitle</key>

	<string>Tor - Privoxy Bundle</string>

	<string>Tor - Privoxy - Torbutton Bundle</string>

	<key>IFPkgDescriptionVersion</key>

	<string>@VERSION@</string>

</dict>

contrib/osx/TorBundleInfo.plist.in

+6 −0
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ 
			<key>IFPkgFlagPackageSelection</key>

			<string>selected</string>

		</dict>

		<dict>

			<key>IFPkgFlagPackageLocation</key>

			<string>torbutton.pkg</string>

			<key>IFPkgFlagPackageSelection</key>

			<string>selected</string>

		</dict>

	</array>

        <key>IFPkgFormatVersion</key>

        <real>0.10000000149011612</real>

contrib/osx/TorBundleWelcome.rtf

+25 −10
Original line number Diff line number Diff line 
{\rtf1\mac\ansicpg10000\cocoartf102

{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Bold;}

{\rtf1\mac\ansicpg10000\cocoartf824\cocoasubrtf420

{\fonttbl\f0\fswiss\fcharset77 Helvetica;\f1\fswiss\fcharset77 Helvetica-Oblique;\f2\fswiss\fcharset77 Helvetica-Bold;

}

{\colortbl;\red255\green255\blue255;}

\paperw11900\paperh16840\margl1440\margr1440\vieww9000\viewh9000\viewkind0

\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\ql\qnatural



\f0\fs24 \cf0 Welcome to Tor - Privoxy Bundle installer.\

This will install Tor and privoxy in your computer.\

\f0\fs24 \cf0 Welcome to Tor - Privoxy - Torbutton Bundle installer.\

This will install Tor, Privoxy, and Torbutton in your computer.\

\



\f1\b Tor and Privoxy are separate products.\

\f1\i Tor, Privoxy, and Torbutton are separate products.\

They are packaged together for your convenience.

\f2\i0\b \



\f0\b0 \

\

\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural

\cf0 Tor is a system for using the Internet anonymously, and allowing\



\f2\b \cf0 Tor

\f0\b0  is a system for using the Internet anonymously, and allowing\

others to do so.\

\

	For more information, please visit https://www.torproject.org/\

\

Privoxy stands between your web browser and Tor to make your web surfing experience safer.\



\f2\b Privoxy

\f0\b0  stands between your web browser and Tor to make your web surfing experience safer.\

\

	For more information, please visit http://www.privoxy.org/\

\

\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural



\f2\b \cf0 Torbutton

\f0\b0  is a 1-click way for Firefox users to enable or disable the browser's use of Tor.   

\f1\i Torbutton will not install if you do not have Firefox installed.

\f0\i0 \

\

For more information, please visit http://www.privoxy.org/}
 
	For more information, please visit https://torbutton.torproject.org/}