aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/checkOptionDocs.pl1
-rwxr-xr-xcontrib/checkSpace.pl5
-rwxr-xr-xcontrib/cross.sh1
-rwxr-xr-xcontrib/directory-archive/fetch-all2
-rwxr-xr-xcontrib/directory-archive/fetch-all-v31
-rw-r--r--contrib/id_to_fp.c1
-rwxr-xr-xcontrib/nagios-check-tor-authority-cert2
-rw-r--r--contrib/osx/package.sh1
-rwxr-xr-xcontrib/osx/uninstall_tor_bundle.sh2
-rw-r--r--contrib/polipo/package.sh1
-rw-r--r--contrib/rc.subr1
-rw-r--r--contrib/tor-mingw.nsi.in3
-rwxr-xr-xcontrib/tor-resolve.py1
-rw-r--r--contrib/torify.118
-rwxr-xr-xcontrib/torify.in65
15 files changed, 69 insertions, 36 deletions
diff --git a/contrib/checkOptionDocs.pl b/contrib/checkOptionDocs.pl
index ca3fba55e..c2e875736 100755
--- a/contrib/checkOptionDocs.pl
+++ b/contrib/checkOptionDocs.pl
@@ -1,5 +1,4 @@
#!/usr/bin/perl -w
-# $Id
use strict;
my %options = ();
diff --git a/contrib/checkSpace.pl b/contrib/checkSpace.pl
index 37f079c52..db061a082 100755
--- a/contrib/checkSpace.pl
+++ b/contrib/checkSpace.pl
@@ -42,9 +42,8 @@ for $fn (@ARGV) {
$lastnil = 0;
}
## Terminals are still 80 columns wide in my world. I refuse to
- ## accept double-line lines. Except, of course, svn Id tags
- ## can make us go long.
- if (/^.{80}/ && !/\$Id: /) {
+ ## accept double-line lines.
+ if (/^.{80}/) {
print " Wide:$fn:$.\n";
}
### Juju to skip over comments and strings, since the tests
diff --git a/contrib/cross.sh b/contrib/cross.sh
index e660be780..af68755db 100755
--- a/contrib/cross.sh
+++ b/contrib/cross.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-# $Id$
# Copyright 2006 Michael Mohr with modifications by Roger Dingledine
# See LICENSE for licensing information.
diff --git a/contrib/directory-archive/fetch-all b/contrib/directory-archive/fetch-all
index fabcbb8bc..dfa5a1b3e 100755
--- a/contrib/directory-archive/fetch-all
+++ b/contrib/directory-archive/fetch-all
@@ -30,8 +30,8 @@ DIRSERVERS=""
DIRSERVERS="$DIRSERVERS 86.59.21.38:80" # tor26
DIRSERVERS="$DIRSERVERS 128.31.0.34:9031" # moria1
DIRSERVERS="$DIRSERVERS 128.31.0.34:9032" # moria2
-#DIRSERVERS="$DIRSERVERS 140.247.60.64:80" # lefkada
DIRSERVERS="$DIRSERVERS 194.109.206.212:80" # dizum
+
DATEDIR=$(date "+%Y/%m/%d")
TIME=$(date "+%Y%m%d-%H%M%S")
diff --git a/contrib/directory-archive/fetch-all-v3 b/contrib/directory-archive/fetch-all-v3
index 02b3d5d9e..a4746e02c 100755
--- a/contrib/directory-archive/fetch-all-v3
+++ b/contrib/directory-archive/fetch-all-v3
@@ -35,6 +35,7 @@ DIRSERVERS="$DIRSERVERS 80.190.246.100:80" # gabelmoo
DIRSERVERS="$DIRSERVERS 194.109.206.212:80" # dizum
#DIRSERVERS="$DIRSERVERS 128.31.0.34:9032" # moria2
DIRSERVERS="$DIRSERVERS 213.73.91.31:80" # dannenberg
+DIRSERVERS="$DIRSERVERS 208.83.223.34:443" # urras
TIME=$(date "+%Y%m%d-%H%M%S")
. fetch-all-functions
diff --git a/contrib/id_to_fp.c b/contrib/id_to_fp.c
index 73395e16c..55b025dfa 100644
--- a/contrib/id_to_fp.c
+++ b/contrib/id_to_fp.c
@@ -1,5 +1,4 @@
/* Copyright 2006 Nick Mathewson; see LICENSE for licensing information */
-/* $Id$ */
/* id_to_fp.c : Helper for directory authority ops. When somebody sends us
* a private key, this utility converts the private key into a fingerprint
diff --git a/contrib/nagios-check-tor-authority-cert b/contrib/nagios-check-tor-authority-cert
index 0e2c1d06c..46dc7284b 100755
--- a/contrib/nagios-check-tor-authority-cert
+++ b/contrib/nagios-check-tor-authority-cert
@@ -8,8 +8,6 @@
# Usage: nagios-check-tor-authority-cert <authority identity fingerprint>
# e.g.: nagios-check-tor-authority-cert A9AC67E64B200BBF2FA26DF194AC0469E2A948C6
-# $Id$
-
# Copyright (c) 2008 Peter Palfrader <peter@palfrader.org>
#
# Permission is hereby granted, free of charge, to any person obtaining
diff --git a/contrib/osx/package.sh b/contrib/osx/package.sh
index 040c7cd4c..eeb0f9507 100644
--- a/contrib/osx/package.sh
+++ b/contrib/osx/package.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-# $Id$
# Copyright 2004-2005 Nick Mathewson.
# Copyright 2005-2007 Andrew Lewman
# Copyright 2008 The Tor Project, Inc.
diff --git a/contrib/osx/uninstall_tor_bundle.sh b/contrib/osx/uninstall_tor_bundle.sh
index 9089407ed..b7c439429 100755
--- a/contrib/osx/uninstall_tor_bundle.sh
+++ b/contrib/osx/uninstall_tor_bundle.sh
@@ -134,7 +134,7 @@ fi
## clean up
echo ". Cleaning up"
rm -rf $TEMP_BOM_CONTENTS
-rm -rf /Library/Privoxy/ /Library/StartupItems/Privoxy/ /Library/Tor/ /Library/StartupItems/Tor/ /Library/Torbutton/
+rm -rf /Library/Privoxy/ /Library/StartupItems/Privoxy/ /Library/Tor/ /Library/StartupItems/Tor/ /Library/Torbutton/ /Library/Receipts/Privoxy.pkg /Library/Receipts/torbutton.pkg /Library/Receipts/Tor.pkg /Library/Receipts/Vidalia.pkg /Library/Receipts/TorStartup.pkg
echo ". Finished"
diff --git a/contrib/polipo/package.sh b/contrib/polipo/package.sh
index 83f74212b..4ec72c81d 100644
--- a/contrib/polipo/package.sh
+++ b/contrib/polipo/package.sh
@@ -1,5 +1,4 @@
#!/bin/sh
-# $Id: package.sh 8992 2006-12-23 03:12:09Z phobos $
# Copyright 2004-2005 Nick Mathewson & Andrew Lewman.
# Copyright 2005-2008 Andrew Lewman
# This is licensed under the Modified BSD License.
diff --git a/contrib/rc.subr b/contrib/rc.subr
index 117ae71d4..d757e8952 100644
--- a/contrib/rc.subr
+++ b/contrib/rc.subr
@@ -1,5 +1,4 @@
#!/bin/sh
-# $Id$
# $FreeBSD: ports/security/tor-devel/files/tor.in,v 1.1 2006/02/17 22:21:25 mnag Exp $
#
# (rc.subr written by Peter Thoenen for Net/FreeBSD)
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 053c14215..9dcbc6bac 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -9,7 +9,7 @@
!include "FileFunc.nsh"
!insertmacro GetParameters
-!define VERSION "0.2.1.19"
+!define VERSION "0.2.2.1-alpha"
!define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE"
@@ -216,6 +216,7 @@ Function un.InstallFiles
Delete "$INSTDIR\tor.ico"
Delete "$SMSTARTUP\Tor.lnk"
Delete "$INSTDIR\Uninstall.exe"
+ Delete "$INSTDIR\geoip"
FunctionEnd
Function un.InstallDirectories
diff --git a/contrib/tor-resolve.py b/contrib/tor-resolve.py
index 919bc876c..47ae1a0c3 100755
--- a/contrib/tor-resolve.py
+++ b/contrib/tor-resolve.py
@@ -1,5 +1,4 @@
#!/usr/bin/python
-#$Id$
import socket
import struct
diff --git a/contrib/torify.1 b/contrib/torify.1
index b08d46845..9ae4e40d9 100644
--- a/contrib/torify.1
+++ b/contrib/torify.1
@@ -1,22 +1,27 @@
.TH torify 1 "" Jan-2009 ""
-.\" manual page by Peter Palfrader
+.\" manual page by Peter Palfrader and Jacob Appelbaum
.SH NAME
.LP
-torify \- wrapper for tsocks and tor
+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 calls tsocks with a tor specific
+\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 tsocks uses LD_PRELOAD, torify cannot be applied
+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
@@ -25,8 +30,13 @@ normal system resolver to your usual resolving nameservers. The
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).
diff --git a/contrib/torify.in b/contrib/torify.in
index 05645fd07..5bf7d4dbc 100755
--- a/contrib/torify.in
+++ b/contrib/torify.in
@@ -10,36 +10,67 @@
# Define and ensure we have tsocks
# XXX: what if we don't have which?
+TORSOCKS="`which torsocks`"
TSOCKS="`which tsocks`"
+PROG=""
if [ ! -x "$TSOCKS" ]
then
- echo "$0: Can't find tsocks in PATH. Perhaps you haven't installed it?" >&2
- exit 1
+ echo "$0: Can't find tsocks in PATH. Perhaps you haven't installed it?" >&2
+else
+ PROG=$TSOCKS
+fi
+if [ ! -x "$TORSOCKS" ]
+then
+ echo "$0: Can't find torsocks in PATH. Perhaps you haven't installed it?" >&2
+else
+ PROG=$TORSOCKS
+fi
+
+if [ ! -x "$PROG" ]
+then
+ echo "$0: Can't find the required tor helpers in our PATH. Perhaps you haven't installed them?" >&2
+ exit 1;
fi
# Check for any argument list
if [ "$#" = 0 ]
then
- echo "Usage: $0 <command> [<options>...]" >&2
- exit 1
+ echo "Usage: $0 [-hv] <command> [<options>...]" >&2
+ exit 1
fi
if [ "$#" = 1 ] && ( [ "$1" = "-h" ] || [ "$1" = "--help" ] )
then
- echo "Usage: $0 <command> [<options>...]"
- exit 0
+ echo "Usage: $0 [-hv] <command> [<options>...]"
+ exit 0
fi
-# Define our tsocks config file
-TSOCKS_CONF_FILE="@CONFDIR@/tor-tsocks.conf"
-export TSOCKS_CONF_FILE
+if [ "$1" = "-v" ] || [ "$1" = "--verbose" ]
+then
+ echo "We're armed with the following tsocks: $TSOCKS"
+ echo "We're armed with the following torsocks: $TORSOCKS"
+ echo "We're attempting to use $PROG for all tor action."
+ shift 1
+fi
-# Check that we've got a tsocks config file
-if [ -r "$TSOCKS_CONF_FILE" ]
+if [ "$PROG" = "$TSOCKS" ]
then
- exec tsocks "$@"
- echo "$0: Failed to exec tsocks $@" >&2
- exit 1
-else
- echo "$0: Missing tsocks configuration file \"$TSOCKS_CONF_FILE\"." >&2
- exit 1
+ # Define our tsocks config file
+ TSOCKS_CONF_FILE="/etc/tor/tor-tsocks.conf"
+ export TSOCKS_CONF_FILE
+
+ # Check that we've got a tsocks config file
+ if [ -r "$TSOCKS_CONF_FILE" ]
+ then
+ echo "WARNING: tsocks is known to leak DNS and UDP data." >&2
+ exec tsocks "$@"
+ echo "$0: Failed to exec tsocks $@" >&2
+ exit 1
+ else
+ echo "$0: Missing tsocks configuration file \"$TSOCKS_CONF_FILE\"." >&2
+ exit 1
+ fi
+fi
+if [ "$PROG" = "$TORSOCKS" ]
+then
+ exec torsocks "$@"
fi
generated by cgit v1.2.3 (git 2.49.0) at 2025-05-05 06:34:15 +0000