Merge remote branch 'sebastian/manpage' (a379a0a4) · Commits · Legacy / gitolite / user / rransom / Tor

.gitignore

+16 −0

Changes for .gitignore: 16 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -93,6 +93,22 @@
		/doc/Makefile.in
		/doc/tor.1
		/doc/doxygen
		/doc/tor.1
		/doc/tor.1.in
		/doc/tor.html
		/doc/tor.html.in
		/doc/tor-gencert.1
		/doc/tor-gencert.1.in
		/doc/tor-gencert.html
		/doc/tor-gencert.html.in
		/doc/tor-resolve.1
		/doc/tor-resolve.1.in
		/doc/tor-resolve.html
		/doc/tor-resolve.html.in
		/doc/torify.1
		/doc/torify.1.in
		/doc/torify.html
		/doc/torify.html.in

		# /doc/design-paper/
		/doc/design-paper/Makefile

ChangeLog

+1 −0

Changes for ChangeLog: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -158,6 +158,7 @@ Changes in version 0.2.2.7-alpha - 2010-01-19
		- Remove the HSAuthorityRecordStats option that version 0 hidden
		service authorities could have used to track statistics of overall
		hidden service usage.
		- Stop shipping parts of the website in the tarballs.


		Changes in version 0.2.1.22 - 2010-01-19

configure.in

+5 −1

Changes for configure.in: 5 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -109,6 +109,10 @@ AC_PROG_RANLIB
		dnl autoconf 2.59 appears not to support AC_PROG_SED
		AC_CHECK_PROG([SED],[sed],[sed],[/bin/false])

		dnl check for asciidoc and a2x
		AC_PATH_PROG([ASCIIDOC], [asciidoc], none)
		AC_PATH_PROG([A2X], [a2x], none)

		AC_PATH_PROG([SHA1SUM], [sha1sum], none)
		AC_PATH_PROG([OPENSSL], [openssl], none)

		@@ -872,7 +876,7 @@ fi

		CPPFLAGS="$CPPFLAGS $TOR_CPPFLAGS_libevent $TOR_CPPFLAGS_openssl $TOR_CPPFLAGS_zlib"

		AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
		AC_CONFIG_FILES([Makefile tor.spec Doxyfile contrib/tor.sh contrib/torctl contrib/torify contrib/tor.logrotate contrib/Makefile contrib/osx/Makefile contrib/osx/TorBundleDesc.plist contrib/osx/TorBundleInfo.plist contrib/osx/TorDesc.plist contrib/osx/TorInfo.plist contrib/osx/TorStartupDesc.plist src/config/torrc.sample src/Makefile doc/Makefile doc/design-paper/Makefile doc/spec/Makefile src/config/Makefile src/common/Makefile src/or/Makefile src/test/Makefile src/win32/Makefile src/tools/Makefile contrib/suse/Makefile contrib/suse/tor.sh])
		AC_OUTPUT

		if test -x /usr/bin/perl && test -x ./contrib/updateVersions.pl ; then

contrib/Makefile.am

+1 −3

Changes for contrib/Makefile.am: 1 added line, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -3,10 +3,8 @@ DIST_SUBDIRS = osx suse

		confdir = $(sysconfdir)/tor

		EXTRA_DIST = exitlist tor-tsocks.conf torify.1 tor.nsi.in tor.sh torctl rc.subr cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico tor-ctrl.sh linux-tor-prio.sh tor-exit-notice.html
		EXTRA_DIST = exitlist tor-tsocks.conf tor.nsi.in tor.sh torctl rc.subr cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico tor-ctrl.sh linux-tor-prio.sh tor-exit-notice.html

		conf_DATA = tor-tsocks.conf

		bin_SCRIPTS = torify

		man_MANS = torify.1

contrib/torify.1

deleted100644 → 0

+0 −42

Changes for contrib/torify.1: 0 added lines, 42 removed lines.
Original line number	Diff line number	Diff line
		.TH torify 1 "" Jan-2009 ""
		.\" manual page by Peter Palfrader and Jacob Appelbaum
		.SH NAME
		.LP
		torify \- wrapper for torsocks or tsocks and tor

		.SH SYNOPSIS
		\fBtorify\fP\ \fIapplication\fP\ [\fIapplication's\ arguments\fP]

		.SH DESCRIPTION
		\fBtorify\fR is a simple wrapper that attempts to find the best underlying Tor
		wrapper available on a system. It calls torsocks or tsocks with a tor specific
		configuration file.

		torsocks is an improved wrapper that explictly rejects UDP, safely resolves DNS
		lookups and properly socksifies your TCP connections.

		tsocks itself is a wrapper between the tsocks library and the application
		that you would like to run socksified.

		Please note that since both method use LD_PRELOAD, torify cannot be applied
		to suid binaries.

		.SH WARNING
		You should also be aware that the way tsocks currently works only TCP
		connections are socksified. Be aware that this will in most circumstances
		not include hostname lookups which would still be routed through your
		normal system resolver to your usual resolving nameservers. The
		\fBtor-resolve\fR(1) tool can be useful as a workaround in some cases.
		The Tor FAQ at https://wiki.torproject.org/noreply/TheOnionRouter/TorFAQ might
		have further information on this subject.

		When used with torsocks, torify should not leak DNS requests or UDP data.

		Both will leak ICMP data.

		.SH SEE ALSO
		.BR tor (1),
		.BR tor-resolve (1),
		.BR torsocks (1),
		.BR tsocks (1),
		.BR tsocks.conf (5).