Clean the contrib directory with torch and machete.

We've accumulated a lot of cruft in this directory over the years: so
much, that it passed the point of being so disorganized that we no
longer browsed through it to see how bad it had gotten.

This patch (based on changes by rl1987) tries to remove the most
useless items, and split the others into reasonable directories.  It
creates a new scripts/ directory for maint and test scripts.

This patch was generated with the script below.  No other changes are made in
this patch.

#############
# new directories
mkdir -p contrib/test-tools
mkdir -p contrib/or-tools
mkdir -p contrib/dirauth-tools
mkdir -p contrib/operator-tools
mkdir -p contrib/client-tools
mkdir -p contrib/test-tools
mkdir -p contrib/dist
mkdir -p contrib/dist/suse
mkdir -p contrib/win32build

mkdir -p scripts/maint
mkdir -p scripts/test

############
# Deleted -- nobody who wants this is going to be looking for it here any
# longer.  Also, nobody wants it.
git rm contrib/auto-naming/README

# Deleted: We no longer do polipo.
git rm contrib/polipo/Makefile.mingw
git rm contrib/polipo/README
git rm contrib/polipo/polipo-mingw.nsi

# We haven't even tried to run this for ages. It is a relic of a bygone era
git rm contrib/mdd.py

# contrib/dir-tools/directory-archive/
# Tools for running a directory archive. No longer used - deleting them.
git rm contrib/directory-archive/crontab.sample
git rm contrib/directory-archive/fetch-all
git rm contrib/directory-archive/fetch-all-v3
git rm contrib/directory-archive/tar-them-up
git rm contrib/directory-archive/fetch-all-functions
git rm contrib/directory-archive/sort-into-month-folder

# This appears to be related to very old windows packaging stuff.
git rm contrib/bundle.nsi
git rm contrib/package_nsis-weasel.sh
git rm contrib/package_nsis.sh
git rm contrib/netinst.nsi
git rm contrib/torinst32.ico
git rm contrib/xenobite.ico

# This should not be needed for cross-compilation any more, should it?
git rm contrib/cross.sh

# I don't think anyone ever used this.
git rm contrib/make-signature.sh

# These are attempts to send tor controller commands from the command-line.
# They don't support modern authentication.
git rm contrib/tor-ctrl.sh

# this is for fetching about a tor server from a dirauth. But it
# doesn't authenticate the dirauth: yuck.
git rm contrib/sd

# wow, such unused, very perl4.
git rm contrib/tor-stress

####### contrib/dirauth-tools/
# Tools for running a directory authority

git mv contrib/add-tor contrib/dirauth-tools/
git mv contrib/nagios-check-tor-authority-cert contrib/dirauth-tools/

#######
# contrib/or-tools/
# Tools for examining relays
git mv contrib/check-tor contrib/or-tools/check-tor
git mv contrib/checksocks.pl contrib/or-tools/checksocks.pl
git mv contrib/exitlist contrib/or-tools/exitlist

#######
# contrib/operator-tools

# Tools for running a relay.
git mv contrib/linux-tor-prio.sh contrib/operator-tools/linux-tor-prio.sh
git mv contrib/tor-exit-notice.html contrib/operator-tools/tor-exit-notice.html
git mv contrib/tor.logrotate.in contrib/operator-tools/

######
# contrib/dist

git mv contrib/rc.subr contrib/dist/
git mv contrib/tor.sh.in contrib/dist/
git mv contrib/torctl.in contrib/dist/
git mv contrib/suse/* contrib/dist/suse/

######
# client-tools
git mv contrib/torify contrib/client-tools/torify
git mv contrib/tor-resolve.py contrib/client-tools/

######
# win32build

git mv contrib/package_nsis-mingw.sh contrib/win32build/
git mv contrib/tor.nsi.in contrib/win32build/
# Erinn didn't ask for this...
git mv contrib/tor-mingw.nsi.in contrib/win32build/
git mv contrib/tor.ico contrib/win32build/

######
# scripts/test
git mv contrib/cov-blame scripts/test/cov-blame
git mv contrib/cov-diff scripts/test/cov-diff
git mv contrib/coverage scripts/test/coverage
git mv contrib/scan-build.sh scripts/test/

######## scripts/maint
# Maintainance scripts
#
# These are scripts for developers to use when hacking on Tor.  They mostly
# look at the Tor source in one way or another.
git mv contrib/findMergedChanges.pl scripts/maint/findMergedChanges.pl
git mv contrib/checkOptionDocs.pl scripts/maint/checkOptionDocs.pl
git mv contrib/checkSpace.pl scripts/maint/checkSpace.pl
git mv contrib/redox.py scripts/maint/redox.py
git mv contrib/updateVersions.pl scripts/maint/updateVersions.pl
git mv contrib/checkLogs.pl scripts/maint/checkLogs.pl
git mv contrib/format_changelog.py scripts/maint/

contrib/auto-naming/README

-Tor directory authorities may maintain a binding of server identities
-(their long term identity key) and nicknames.
-
-The auto-naming scripts have been moved to svn in
-projects/tor-naming/auto-naming/trunk/
-

contrib/bundle.nsi

-!include "MUI.nsh"
-!include "LogicLib.nsh"
-!include "FileFunc.nsh"
-  
-!define VERSION "0.2.1.13"
-!define INSTALLER "TorBundle.exe"
-!define WEBSITE "https://www.torproject.org/"
-!define LICENSE "LICENSE"
- 
-SetCompressor /SOLID BZIP2
-RequestExecutionLevel user
-OutFile ${INSTALLER}
-InstallDir "$LOCALAPPDATA\TorInstPkgs"
-SetOverWrite on
-Name "Tor ${VERSION} Bundle"
-Caption "Tor ${VERSION} Bundle Setup"
-BrandingText "Tor Bundle Installer"
-CRCCheck on
-XPStyle on
-ShowInstDetails hide
-VIProductVersion "${VERSION}"
-VIAddVersionKey "ProductName" "Tor"
-VIAddVersionKey "Comments" "${WEBSITE}"
-VIAddVersionKey "LegalTrademarks" "Three line BSD"
-VIAddVersionKey "LegalCopyright" "2004-2011, Roger Dingledine, Nick Mathewson, The Tor Project, Inc."
-VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}"
-VIAddVersionKey "FileVersion" "${VERSION}"
-
-!define MUI_ICON "torinst32.ico"
-!define MUI_HEADERIMAGE_BITMAP "${NSISDIR}\Contrib\Graphics\Header\win.bmp"
-!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_LANGUAGE "English"
-
-Section "Tor" Tor
-	SectionIn RO
-	SetOutPath $INSTDIR
-	Call ExtractPackages
-        Call RunInstallers
-	Call LaunchVidalia
-SectionEnd
-
-Function ExtractPackages
-	File "license.msi"
-	File "tor.msi"
-	File "torbutton.msi"
-	File "thandy.msi"
-	File "polipo.msi"
-	File "vidalia.msi"
-        File "tbcheck.bat"
-FunctionEnd
-
-Function RunInstallers
-	ExecWait 'msiexec /i "$INSTDIR\license.msi" /qn'
-	ExecWait 'msiexec /i "$INSTDIR\tor.msi" NOSC=1 /qn'
-	ExecWait 'msiexec /i "$INSTDIR\thandy.msi" NOSC=1 /qn'
-	ExecWait 'msiexec /i "$INSTDIR\polipo.msi" NOSC=1 /qn'
-	ExecWait 'msiexec /i "$INSTDIR\torbutton.msi" /qn'
-	ExecWait 'msiexec /i "$INSTDIR\vidalia.msi" /qn'
-        ExpandEnvStrings $0 %COMSPEC%
-        Exec '"$0" /C "$INSTDIR\tbcheck.bat"'
-FunctionEnd
-
-Function LaunchVidalia
-	SetOutPath "$LOCALAPPDATA\Programs\Vidalia"
-	Exec 'vidalia.exe -loglevel info -logfile log.txt'
-FunctionEnd
-

contrib/cross.sh

-#!/bin/bash
-# Copyright 2006 Michael Mohr with modifications by Roger Dingledine
-# See LICENSE for licensing information.
-
-#######################################################################
-#  Tor-cross: a tool to help cross-compile Tor
-#
-#  The purpose of a cross-compiler is to produce an executable for
-#  one system (CPU) on another.  This is useful, for example, when
-#  the target system does not have a native compiler available.
-#  You might, for example, wish to cross-compile a program on your
-#  host (the computer you're working on now) for a target such as
-#  a router or handheld computer.
-#
-#  A number of environment variables must be set in order for this
-#  script to work:
-#        $PREFIX, $CROSSPATH, $HOST_TRIPLET, $HOST,
-#        and (optionally) $BUILD
-#  Please run the script for a description of each one.  If automated
-#  builds are desired, the above variables can be exported at the top
-#  of this script.
-#
-#  Recent releases of Tor include test programs in configure. Normally
-#  this is a good thing, since it catches a number of problems.
-#  However, this also presents a problem when cross compiling, since
-#  you can't run binary images for the target system on the host.
-#
-#  Tor-cross assumes that you know what you're doing and removes a
-#  number of checks known to cause problems with this process.
-#  Note that this does not guarantee that the program will run or
-#  even compile; it simply allows configure to generate the Makefiles.
-#
-#  Stripping the binaries should almost always be done for an
-#  embedded environment where space is at an exacting premium.
-#  However, the default is NOT to strip them since they are useful for
-#  debugging.  If you do not plan to do any debugging and you
-#  don't care about the debugging symbols, set $STRIP to "yes" before
-#  running this script.
-#
-#  Tor-cross was written by Michael Mohr.  He can be contacted at
-#  m(dot)mohr(at)laposte(dot)net.  Comments are appreciated, but
-#  flames go to /dev/null.
-#
-#  The target with which this script is tested is little-endian
-#  MIPS Linux, built on an Athlon-based Linux desktop.
-#
-#######################################################################
-
-# disable the platform-specific tests in configure
-export CROSS_COMPILE=yes
-
-# for error conditions
-EXITVAL=0
-
-if [ ! -f autogen.sh ]
-then
-  echo "Please run this script from the root of the Tor distribution"
-  exit -1
-fi
-
-if [ ! -f configure ]
-then
-  if [ -z $GEN_BUILD ]
-  then
-    echo "To automatically generate the build environment, set \$GEN_BUILD"
-    echo "to yes; for example,"
-    echo "	export GEN_BUILD=yes"
-    EXITVAL=-1
-  fi
-fi
-
-if [ -z $PREFIX ]
-then
-  echo "You must define \$PREFIX since you are cross-compiling."
-  echo "Select a non-system location (i.e. /tmp/tor-cross):"
-  echo "	export PREFIX=/tmp/tor-cross"
-  EXITVAL=-1
-fi
-
-if [ -z $CROSSPATH ]
-then
-  echo "You must define the location of your cross-compiler's"
-  echo "directory using \$CROSSPATH; for example,"
-  echo "	export CROSSPATH=/opt/cross/staging_dir_mipsel/bin"
-  EXITVAL=-1
-fi
-
-if [ -z $HOST_TRIPLET ]
-then
-  echo "You must define \$HOST_TRIPLET to continue.  For example,"
-  echo "if you normally cross-compile applications using"
-  echo "mipsel-linux-uclibc-gcc, you would set \$HOST_TRIPLET like so:"
-  echo "	export HOST_TRIPLET=mipsel-linux-uclibc-"
-  EXITVAL=-1
-fi
-
-if [ -z $HOST ]
-then
-  echo "You must specify a target processor with \$HOST; for example:"
-  echo "	export HOST=mipsel-unknown-elf"
-  EXITVAL=-1
-fi
-
-if [ -z $BUILD ]
-then
-  echo "You should specify the host machine's type with \$BUILD; for example:"
-  echo "	export BUILD=i686-pc-linux-gnu"
-  echo "If you wish to let configure autodetect the host, set \$BUILD to 'auto':"
-  echo "	export BUILD=auto"
-  EXITVAL=-1
-fi
-
-if [ ! -x $CROSSPATH/$HOST_TRIPLETgcc ]
-then
-  echo "The specified toolchain does not contain an executable C compiler."
-  echo "Please double-check your settings and rerun cross.sh."
-  EXITVAL=-1
-fi
-
-if [ $EXITVAL -ne 0 ]
-then
-  echo "Remember, you can hard-code these values in cross.sh if needed."
-  exit $EXITVAL
-fi
-
-if [ ! -z "$GEN_BUILD" -a ! -f configure ]
-then
-  export NOCONF=yes
-  ./autogen.sh
-fi
-
-# clean up any existing object files
-if [ -f src/or/tor ]
-then
-  make clean
-fi
-
-# Set up the build environment and try to run configure
-export PATH=$PATH:$CROSSPATH
-export RANLIB=${HOST_TRIPLET}ranlib
-export CC=${HOST_TRIPLET}gcc
-
-if [ $BUILD == "auto" ]
-then
-  ./configure \
-	--enable-debug \
-	--enable-eventdns \
-	--prefix=$PREFIX \
-	--host=$HOST
-else
-  ./configure \
-	--enable-debug \
-	--enable-eventdns \
-	--prefix=$PREFIX \
-	--host=$HOST \
-	--build=$BUILD
-fi
-
-# has a problem occurred?
-if [ $? -ne 0 ]
-then
-  echo ""
-  echo "A problem has been detected with configure."
-  echo "Please check the output above and rerun cross.sh"
-  echo ""
-  exit -1
-fi
-
-# Now we're cookin'
-
-make
-
-# has a problem occurred?
-if [ $? -ne 0 ]
-then
-  echo ""
-  echo "A problem has been detected with make."
-  echo "Please check the output above and rerun make."
-  echo ""
-  exit -1
-fi
-
-# if $STRIP has length (i.e. STRIP=yes), strip the binaries
-if [ ! -z $STRIP ]
-then
-${HOST_TRIPLET}strip \
-	src/or/tor \
-	src/test/test \
-	src/tools/tor-resolve
-fi
-
-echo ""
-echo "Tor should be compiled at this point.  Now run 'make install' to"
-echo "install to $PREFIX"
-echo ""

contrib/directory-archive/crontab.sample

-10 * * * * cd projects/tor-v2dir && ./fetch-all-v3
-40 * * * * cd projects/tor-v2dir && ./fetch-all
-15 3 6 * * cd projects/tor-v2dir && ./sort-into-month-folder > /dev/null && ./tar-them-up last > /dev/null

contrib/directory-archive/fetch-all

-#!/bin/bash
-
-# Download all current v2 directory status documents, then download
-# the descriptors and extra info documents.
-
-# Copyright (c) 2005, 2006, 2007, 2008 Peter Palfrader
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-TZ=UTC
-export TZ
-
-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 194.109.206.212:80"	# dizum
-
-DATEDIR=$(date "+%Y/%m/%d")
-TIME=$(date "+%Y%m%d-%H%M%S")
-
-. fetch-all-functions
-
-statuses=""
-for dirserver in $DIRSERVERS; do
-	authorities=$(wget -q -O - http://$dirserver/tor/status/all | egrep '^fingerprint ' | awk '{print $2}')
-	if [ "$authorities" == "" ]; then
-		echo "Did not get a list of authorities from $dirserver, going to next" 2>&1
-		continue
-	fi
-
-	dir="status/$DATEDIR"
-	[ -d "$dir" ] || mkdir -p "$dir"
-
-	authprefix="$dir/$TIME-"
-	for fp in $authorities; do
-		wget -q -O "$authprefix$fp" http://$dirserver/tor/status/fp/"$fp"
-		bzip2 "$authprefix$fp"
-		statuses="$statuses $authprefix$fp.bz2"
-	done
-	if [ "$statuses" == "" ]; then
-		echo "Did not get any statuses from $dirserver, going to next" 2>&1
-		continue
-	else
-		break
-	fi
-done
-
-if [ "$statuses" = "" ]; then
-	echo "No statuses available" 2>&1
-	exit 1
-fi
-
-digests=$( for i in ` bzcat $statuses | awk '$1 == "r" {printf "%s=\n", $4}' | sort -u `; do
-		echo $i | \
-		base64-decode | \
-		perl -e 'undef $/; $a=<>; print unpack("H\*", $a),"\n";';
-	done )
-for digest in $digests; do
-	fetch_digest "$digest" "server-descriptor"
-done

contrib/directory-archive/fetch-all-functions

-#!/bin/bash
-
-# function used by fetch-all* to download server descriptors and
-# extra info documents
-
-# Copyright (c) 2005, 2006, 2007, 2008 Peter Palfrader
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-
-fetch_digest() {
-	local digest
-	local objecttype
-	local urlpart
-	local pathpart
-	local target
-	local targetdir
-	local dirserver
-	local ei
-
-	digest="$1"
-	objecttype="$2"
-	if [ "$objecttype" = "server-descriptor" ] ; then
-		urlpart="server"
-		pathpart="server-descriptor"
-	elif [ "$objecttype" = "extra-info" ] ; then
-		urlpart="extra"
-		pathpart="extra-info"
-	else
-		echo "Called fetch_digest with illegal objecttype '$objecttype'" >&2
-		exit 1
-	fi
-	target=$( echo $digest | sed -e 's#^\(.\)\(.\)#'"$pathpart"'/\1/\2/\1\2#' )
-	targetdir=$( dirname $target )
-	[ -d "$targetdir" ] || mkdir -p "$targetdir"
-	if ! [ -e "$target" ]; then
-		for dirserver in $DIRSERVERS; do
-			wget -q -O "$target" http://$dirserver/tor/$urlpart/d/"$digest" || rm -f "$target"
-			if [ -s "$target" ]; then
-				if egrep '^opt extra-info-digest ' "$target" > /dev/null; then
-					ei=$( egrep '^opt extra-info-digest ' "$target" | awk '{print $3}' | tr 'A-F' 'a-f' )
-					fetch_digest "$ei" "extra-info"
-				elif egrep '^extra-info-digest ' "$target" > /dev/null; then
-					ei=$( egrep '^extra-info-digest ' "$target" | awk '{print $2}' | tr 'A-F' 'a-f' )
-					fetch_digest "$ei" "extra-info"
-				fi
-				break
-			else
-				rm -f "$target"
-			fi
-		done
-	fi
-	#if ! [ -e "$target" ]; then
-	#	echo "$objecttype $digest" >> failed
-	#fi
-}
-
-if [ -x /usr/bin/base64 ] ; then
-	base64-decode() {
-		/usr/bin/base64 -d
-	}
-else
-	base64-decode() {
-		perl -MMIME::Base64 -e 'print decode_base64(<>)'
-	}
-fi

contrib/directory-archive/fetch-all-v3

-#!/bin/bash
-
-# Download all current v3 directory status votes and the consensus document,
-# then download the descriptors and extra info documents.
-
-# Copyright (c) 2005, 2006, 2007, 2008 Peter Palfrader
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-TZ=UTC
-export TZ
-
-DIRSERVERS=""
-DIRSERVERS="$DIRSERVERS 86.59.21.38:80"		# tor26
-DIRSERVERS="$DIRSERVERS 128.31.0.34:9031"	# moria1
-DIRSERVERS="$DIRSERVERS 216.224.124.114:9030"	# ides
-DIRSERVERS="$DIRSERVERS 80.190.246.100:80"	# gabelmoo
-#DIRSERVERS="$DIRSERVERS 140.247.60.64:80"	# lefkada
-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
-
-consensus=""
-tmpdir="consensus/tmp"
-[ -d "$tmpdir" ] || mkdir -p "$tmpdir"
-for dirserver in $DIRSERVERS; do
-	wget -q -O "$tmpdir/$TIME-consensus" http://$dirserver/tor/status-vote/current/consensus
-	if [ "$?" != 0 ]; then
-		rm -f "$tmpdir/$TIME-consensus"
-		continue
-	fi
-
-	freshconsensus="$tmpdir/$TIME-consensus"
-
-	timestamp=$(awk '$1=="valid-after" {printf "%s-%s", $2, $3}' < "$freshconsensus")
-	datedir=$(awk '$1=="valid-after" {printf "%s", $2}' < "$freshconsensus" | tr '-' '/')
-	dir="consensus/$datedir"
-	[ -d "$dir" ] || mkdir -p "$dir"
-
-
-	consensus="$dir/$timestamp-consensus.bz2"
-	if ! [ -e "$consensus" ]; then
-		# the consensus is new, or at least we don't have it yet
-		bzip2 "$freshconsensus"
-		mv "$freshconsensus.bz2" "$consensus"
-		break
-	fi
-
-	rm -f "$freshconsensus"
-	echo "Consensus from $timestamp (gotten from $dirserver) already exists!" >&2
-	# maybe there is a newer one on a different authority, so try again.
-done
-
-if [ "$consensus" = "" ]; then
-	echo "No consensus available" 2>&1
-	exit 1
-fi
-
-
-votes=$(bzcat $consensus | awk '$1 == "vote-digest" {print $2}')
-for vote in $votes; do
-	for dirserver in $DIRSERVERS; do
-		wget -q -O "$dir/$TIME-vote-$vote" http://$dirserver/tor/status-vote/current/d/$vote
-		if [ "$?" != 0 ]; then
-			rm -f "$dir/$TIME-vote-$vote"
-			continue
-		fi
-		break
-	done
-	if [ -e "$dir/$TIME-vote-$vote" ]; then
-		voteridentity=$(awk '$1=="fingerprint" {print $2}' < "$dir/$TIME-vote-$vote")
-		if [ -e "$dir/$timestamp-vote-$voteridentity-$vote.bz2" ]; then
-			echo "Vote $vote from $voteridentity already exists!" >&2
-			rm -f "$dir/$TIME-vote-$vote"
-			continue;
-		fi
-		mv "$dir/$TIME-vote-$vote"  "$dir/$timestamp-vote-$voteridentity-$vote"
-		bzip2 "$dir/$timestamp-vote-$voteridentity-$vote"
-	else
-		echo "Failed to get vote $vote!" >&2
-	fi
-done
-
-digests=$( for i in ` bzcat $consensus | awk '$1 == "r" {printf "%s=\n", $4}' | sort -u `; do
-		echo $i | \
-		base64-decode | \
-		perl -e 'undef $/; $a=<>; print unpack("H\*", $a),"\n";';
-	done )
-for digest in $digests; do
-	fetch_digest "$digest" "server-descriptor"
-done

contrib/directory-archive/sort-into-month-folder

-#!/usr/bin/perl -w
-
-# Sort dumped consensuses, statuses, descriptors etc into per-month folders.
-
-# Copyright (c) 2006, 2007, 2008 Peter Palfrader
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-use strict;
-use File::Find;
-use File::Basename;
-use File::stat;
-use Time::Local;
-
-
-my $cutofftime;
-
-
-sub wanted() {
-	return unless -f;
-	my $mtime = stat($_)->mtime;
-	return if $mtime >= $cutofftime;
-
-	my (undef,undef,undef,undef,$mon,$year,undef,undef,undef) = gmtime $mtime;
-
-	my $bn = basename $_;
-	my $dn = dirname $_;
-	my @path = split /\//, $dn;
-	$path[0] .= sprintf 's-%4d-%02d', 1900+$year, $mon+1;
-	$dn = join '/', @path;
-
-	if (! -d $dn) {
-		my $p = '.';
-		for my $component (@path) {
-			$p .= '/'.$component;
-			if (! -d $p) {
-				mkdir $p or die ("Cannot mkdir $p: $!\n");
-			};
-		};
-	};
-
-	print "$_ -> $dn/$bn\n";
-	rename $_, $dn.'/'.$bn or die ("Cannot rename $_ to $dn/$bn: $!\n");
-};
-
-my (undef,undef,undef,undef,$mon,$year,undef,undef,undef) = gmtime(time - 5*24*3600);
-$cutofftime = timegm(0,0,0,1,$mon,$year);
-find(	{
-		wanted		=> \&wanted,
-		no_chdir	=> 1
-	},
-	'server-descriptor');
-
-find(	{
-		wanted		=> \&wanted,
-		no_chdir	=> 1
-	},
-	'extra-info');

contrib/directory-archive/tar-them-up

-#!/bin/sh
-
-# Tar up dumped consensuses, statuses, descriptors etc from per-month folders
-# into per-month tarballs.
-
-# Copyright (c) 2006, 2007, 2008 Peter Palfrader
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-set -e
-set -x
-set -u
-
-usage() {
-	echo "Usage: $0 <year> <month>" >&2
-	echo "       $0 last            (does last month)" >&2
-	exit 1
-}
-
-if [ -z "${1:-}" ]; then
-	usage
-fi
-
-if [ "$1" = "last" ]; then
-	year=`date --date="last month" +'%Y'`
-	month=`date --date="last month" +'%m'`
-elif [ -z "${2:-}" ]; then
-	usage
-else
-	year="$1"
-	month="$2"
-fi
-
-if [ "$year" -lt 2000 ] || [ "$year" -gt 2020 ] ||
-   [ "$month" -lt 1 ] || [ "$month" -gt 12 ] ||
-   [ "`echo -n $month | wc -c`" != 2 ]; then
-	usage
-fi
-
-
-this_year=`date --utc +'%Y'`
-this_month=`date --utc +'%m'`
-
-if [ "`date -d $this_year-$this_month-01 +%s`" -le "`date -d $year-$month-01 +%s`" ]; then
-	echo "Date in the future or current month?" >&2
-	exit 1
-fi
-
-
-
-
-
-for file in \
-	"extra-infos-$year-$month.tar.bz2"		\
-	"server-descriptors-$year-$month.tar.bz2"	\
-	"consensuses-$year-$month.tar.bz2"		\
-	"statuses-$year-$month.tar.bz2"			\
-	; do
-	if [ -e "$file" ]; then
-		echo "$file already exists" >&2
-		exit 1
-	fi
-done
-
-for dir in \
-	"extra-infos-$year-$month"		\
-	"server-descriptors-$year-$month"	\
-	"consensus/$year/$month"		\
-	"status/$year/$month"			\
-	; do
-	if ! [ -d "$dir" ]; then
-		echo "$dir not found" >&2
-		exit 1
-	fi
-done
-
-for dir in \
-	"consensuses-$year-$month"		\
-	"statuses-$year-$month"			\
-	; do
-	if [ -e "$dir" ]; then
-		echo "$dir already exists" >&2
-		exit 1
-	fi
-done
-
-for kind in consensus status; do
-	mv "$kind"/$year/$month "$kind"es-$year-$month
-	find "$kind"es-$year-$month -type f -name '*.bz2' -print0 | xargs -0 bunzip2 -v
-	tar cjvf "$kind"es-$year-$month.tar.bz2 "$kind"es-$year-$month
-	rm -rf "$kind"es-$year-$month
-done
-
-for kind in extra-infos server-descriptors; do
-	tar cjvf "$kind"-$year-$month.tar.bz2 "$kind"-$year-$month
-	rm -rf "$kind"-$year-$month
-done
-
-
-
-[ -d Archive ] || mkdir Archive
-
-for kind in consensus status; do
-	t="$kind"es-$year-$month.tar.bz2
-	! [ -e Archive/"$t" ] && mv "$t" Archive/"$t"
-done
-
-for kind in extra-infos server-descriptors; do
-	t="$kind"-$year-$month.tar.bz2
-	! [ -e Archive/"$t" ] && mv "$t" Archive/"$t"
-done

contrib/make-signature.sh

-#!/bin/sh
-
-set -eu
-
-if test "$1" = "" ; then
-    echo "I need a package as an argument."
-    exit 1
-fi
-
-PACKAGEFILE=$1
-
-if test ! -f "$PACKAGEFILE" ; then
-    echo "$PACKAGEFILE is not a file."
-    exit 1
-fi
-
-DIGESTNAME=sha256
-DIGESTOUTPUT=`gpg --print-md $DIGESTNAME $PACKAGEFILE`
-
-RAWDIGEST=`gpg --print-md $DIGESTNAME $PACKAGEFILE | sed -e 's/^[^ ]*: //' `
-
-# These regexes are a little fragile, but I think they work for us.
-VERSION=`echo $PACKAGEFILE | sed -e 's/^[a-z\-]*//' -e 's/\.[\.a-z]*$//' `
-PACKAGE=`echo $PACKAGEFILE | sed -e 's/-[0-9].*//'`
-SIGFILE_UNSIGNED="$PACKAGE-$VERSION-signature"
-SIGNATUREFILE="$SIGFILE_UNSIGNED.asc"
-
-cat >$SIGFILE_UNSIGNED <<EOF
-This is the signature file for "$PACKAGEFILE",
-which contains version "$VERSION" of "$PACKAGE".
-
-Here's how to check this signature.
-
-1) Make sure that this is really a signature file, and not a forgery,
-   with:
-
-     "gpg --verify $SIGNATUREFILE"
-
-   The key should be one of the keys that signs the Tor release; the
-   official Tor website has more information on those.
-
-   If this step fails, then either you are missing the correct key, or
-   this signature file was not really signed by a Tor packager.
-   Beware!
-
-2) Make sure that the package you wanted is indeed "$PACKAGE", and that
-   its version you wanted is indeed "$VERSION".  If you wanted a
-   different package, or a different version, this signature file is
-   not the right one!
-
-3) Now that you're sure you have the right signature file, make sure
-   that you got the right package.  Check its $DIGESTNAME digest with
-
-     "gpg --print-md $DIGESTNAME $PACKAGEFILE"
-
-   The output should match this, exactly:
-
-$DIGESTOUTPUT
-
-   Make sure that every part of the output matches: don't just check the
-   first few characters.  If the digest does not match, you do not have
-   the right package file.  It could even be a forgery.
-
-Frequently asked questions:
-
-Q: Why not just sign the package file, like you used to do?
-A: GPG signatures authenticate file contents, but not file names.  If
-   somebody gave you a renamed file with a matching renamed signature
-   file, the signature would still be given as "valid".
-
--- 
-FILENAME: $PACKAGEFILE
-PACKAGE: $PACKAGE
-VERSION: $VERSION
-DIGESTALG: $DIGESTNAME
-DIGEST: $RAWDIGEST
-EOF
-
-gpg --clearsign $SIGFILE_UNSIGNED

contrib/mdd.py

-#!/usr/bin/env python2.3
-
-import re, sys
-import textwrap
-
-files = sys.argv[1:]
-funcDeclaredIn = {}
-fileDeclares = {}
-functionCalls = {}
-funcCalledByFile = {}
-funcCalledByFunc = {}
-
-cpp_re = re.compile(r'//.*$')
-c_re = re.compile(r'/[*]+(?:[^*]+|[*]+[^/*])*[*]+/', re.M|re.S)
-
-for fname in files:
-    f = open(fname, 'r')
-    curFunc = "???"
-    functionCalls.setdefault(curFunc,{})
-    lineno = 0
-    body = f.read()
-    body = cpp_re.sub(" ",body)
-    body = c_re.sub(" ",body)
-    #if fname == 'dns.c': print body
-    for line in body.split("\n"):
-        lineno += 1
-        m = re.match(r'^[^\s/].*\s(\w+)\([^;]*$', line)
-        if m:
-            #print line, "->", m.group(1)
-            curFunc = m.group(1)
-            if curFunc[0] == '_': curFunc = curFunc[1:]
-            functionCalls.setdefault(curFunc,{})
-            funcDeclaredIn[m.group(1)] = fname
-            fileDeclares.setdefault(fname, {})[m.group(1)] = 1
-            continue
-        m = re.match(r'^(\w+)\([^;]', line)
-        if m:
-            #print line, "->", m.group(1)
-            curFunc = m.group(1)
-            if curFunc[0] == '_': curFunc = curFunc[1:]
-            functionCalls.setdefault(curFunc,{})
-            funcDeclaredIn[m.group(1)] = fname
-            fileDeclares.setdefault(fname, {})[m.group(1)] = 1
-            continue
-        while line:
-            m = re.search(r'(\w+)\(', line)
-            if not m: break
-            #print fname, line, curFunc, "->", m.group(1)
-            fn = m.group(1)
-            if fn[0] == '_':
-                fn = fn[1:]
-            functionCalls[curFunc][m.group(1)] = 1
-            #if curFunc == "???":
-            #    print ">>!!!!! at %s:%s"%(fname,lineno)
-            funcCalledByFunc.setdefault(m.group(1), {})[curFunc]=1
-            funcCalledByFile.setdefault(m.group(1), {})[fname]=1
-            line = line[m.end():]
-
-    f.close()
-
-fileUsers = {}
-fileUses = {}
-
-for fname in files:
-    print "%s:"%fname
-    users = {}
-    for func in fileDeclares[fname]:
-        cb = funcCalledByFile.get(func,{}).keys()
-        for f in cb: users[f] = 1
-        #print "users[%s] = %s"%(f,users[f])
-    users = users.keys()
-    users.sort()
-    fileUsers[fname] = users
-    for user in users:
-        fileUses.setdefault(user,[]).append(fname)
-        if user == fname: continue
-        print "  from %s:"%user
-        for func in fileDeclares[fname]:
-            if funcCalledByFile.get(func,{}).get(user,0):
-                print "    %s()"%func
-
-def wrap(s, pre):
-    return textwrap.fill(s,
-                         width=77, initial_indent=pre,
-                         subsequent_indent=" "*len(pre))
-
-for fname in files:
-    print
-    print "===== %s"%fname
-    print wrap(" ".join(fileUses[fname]),
-               "        Calls: ")
-    print wrap(" ".join(fileUsers[fname]),
-              "    Called by: ")
-
-print "=============================="
-
-funcnames = functionCalls.keys()
-funcnames.sort()
-
-if 1:
-    for func in funcnames:
-        print "===== %s"%func
-        callers = [c for c in funcCalledByFunc.get(func,{}).keys()
-                   if c != "???"]
-        callers.sort()
-        called = [c for c in functionCalls[func].keys() if c != "???" and
-                  c in funcnames]
-        called.sort()
-        print wrap(" ".join(callers),
-                   "  Called by:")
-        print wrap(" ".join(called),
-                   "      Calls:")
-
-# simple topological sort.
-functionDepth = {}
-while 1:
-    BIG = 1000000
-    any = 0
-    for func in funcnames:
-        if functionDepth.has_key(func):
-            continue
-        called = [c for c in functionCalls[func] if c != func and
-                  functionCalls.has_key(c)]
-        if len(called) == 0:
-            functionDepth[func] = 0
-            #print "Depth(%s)=%s"%(func,0)
-            any = 1
-            continue
-        calledDepths = [ functionDepth.get(c,BIG) for c in called ]
-        if max(calledDepths) < BIG:
-            d = functionDepth[func] = max(calledDepths)+1
-            #print "Depth(%s)=%s"%(func,d)
-            any = 1
-            continue
-    if not any:
-        break
-
-# compute lexical closure.
-cycCalls = {}
-for func in funcnames:
-    if not functionDepth.has_key(func):
-        calls = [ c for c in functionCalls[func] if c != func and
-                  functionCalls.has_key(c) and not functionDepth.has_key(c)]
-        cycCalls[func] = d = {}
-        for c in calls:
-            d[c]=1
-
-cycNames = cycCalls.keys()
-while 1:
-    any = 0
-    for func in cycNames:
-        L = len(cycCalls[func])
-        for called in cycCalls[func].keys():
-            cycCalls[func].update(cycCalls[called])
-        if L != len(cycCalls[func]):
-            any = 1
-    if not any:
-        break
-
-depthList = [ (v,k) for k,v in functionDepth.items() ]
-depthList.sort()
-cycList = [ (len(v),k) for k,v in cycCalls.items() ]
-cycList.sort()
-for depth,name in depthList:
-    print "Depth[%s]=%s"%(name,depth)
-for bredth,name in cycList:
-    print "Width[%s]=%s"%(name,bredth)
-
-print "Sorted %s / %s"%(len(functionDepth),len(funcnames))