21 files changed, 240 insertions, 176 deletions
diff --git a/autogen.sh b/autogen.sh
index efe6d360d9..92239bf3fc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -3,6 +3,5 @@
 aclocal &&
 	autoheader &&
 	autoconf &&
-	automake --add-missing --copy
-./configure
-
+	automake --add-missing --copy &&
+	./configure
diff --git a/configure.in b/configure.in
index a1b1ffaffb..3b2470ea51 100644
--- a/configure.in
+++ b/configure.in
@@ -220,5 +220,5 @@ AC_SUBST(LOCALSTATEDIR)
 
 echo "confdir: $CONFDIR"
 
-AC_OUTPUT(Makefile contrib/tor.sh contrib/torify contrib/Makefile src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile src/config/Makefile src/common/Makefile src/or/Makefile)
+AC_OUTPUT(Makefile contrib/tor.sh contrib/torify contrib/Makefile src/config/torrc.sample doc/tor.1 src/Makefile doc/Makefile doc/design-paper/Makefile src/config/Makefile src/common/Makefile src/or/Makefile)
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 434b04b7b2..d0a0307d2e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,7 @@
-
-EXTRA_DIST = tor-spec.txt CLIENTS FAQ HACKING rend-spec.txt tor-design.tex tor-doc.html tor-doc.css
+EXTRA_DIST = tor-spec.txt CLIENTS FAQ HACKING rend-spec.txt tor-doc.html tor-doc.css
 
 man_MANS = tor.1
+
+SUBDIRS = design-paper
+
+DIST_SUBDIRS = design-paper
diff --git a/doc/design-paper/Makefile.am b/doc/design-paper/Makefile.am
new file mode 100644
index 0000000000..0fb3d9dd27
--- /dev/null
+++ b/doc/design-paper/Makefile.am
@@ -0,0 +1,26 @@
+
+cell-struct.eps: cell-struct.fig
+	fig2dev -L eps $< $@
+interaction.eps: interaction.fig
+	fig2dev -L eps $< $@
+cell-struct.pdf: cell-struct.fig
+	fig2dev -L pdf $< $@
+interaction.pdf: interaction.fig
+	fig2dev -L pdf $< $@
+
+tor-design.ps: cell-struct.eps interaction.eps tor-design.bib tor-design.tex usenix.sty latex8.bst
+	latex tor-design.tex
+	bibtex tor-design
+	latex tor-design.tex
+	latex tor-design.tex
+	dvips -o $@ tor-design.dvi
+
+tor-design.pdf: cell-struct.pdf interaction.pdf tor-design.bib tor-design.tex usenix.sty latex8.bst
+	pdflatex tor-design.tex
+	bibtex tor-design
+	pdflatex tor-design.tex
+	pdflatex tor-design.tex
+
+EXTRA_DIST = cell-struct.fig interaction.fig tor-design.bib usenix.sty latex8.bst tor-design.tex
+
+DISTCLEANFILES = cell-struct.eps interaction.eps cell-struct.pdf interaction.pdf tor-design.aux tor-design.bbl tor-design.blg tor-design.log tor-design.dvi tor-design.ps
diff --git a/doc/design-paper/Makefile.in b/doc/design-paper/Makefile.in
new file mode 100644
index 0000000000..748af2ddb3
--- /dev/null
+++ b/doc/design-paper/Makefile.in
@@ -0,0 +1,206 @@
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+BINDIR = @BINDIR@
+CC = @CC@
+CONFDIR = @CONFDIR@
+HAVE_LIB = @HAVE_LIB@
+LIB = @LIB@
+LOCALSTATEDIR = @LOCALSTATEDIR@
+LTLIB = @LTLIB@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+VERSION = @VERSION@
+
+EXTRA_DIST = cell-struct.fig interaction.fig tor-design.bib usenix.sty latex8.bst tor-design.tex
+
+DISTCLEANFILES = cell-struct.eps interaction.eps cell-struct.pdf interaction.pdf tor-design.aux tor-design.bbl tor-design.blg tor-design.log tor-design.dvi tor-design.ps
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = ../../orconfig.h
+CONFIG_CLEAN_FILES = 
+DIST_COMMON =  Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/design-paper/Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = doc/design-paper
+
+distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/design-paper/Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  if test -d $$d/$$file; then \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	  fi; \
+	done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am:
+install-data: install-data-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am:
+uninstall: uninstall-am
+all-am: Makefile
+all-redirect: all-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
+
+maintainer-clean-generic:
+mostlyclean-am:  mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am:  clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am:  distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am:  maintainer-clean-generic distclean-am
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
+
+
+cell-struct.eps: cell-struct.fig
+	fig2dev -L eps $< $@
+interaction.eps: interaction.fig
+	fig2dev -L eps $< $@
+cell-struct.pdf: cell-struct.fig
+	fig2dev -L pdf $< $@
+interaction.pdf: interaction.fig
+	fig2dev -L pdf $< $@
+
+tor-design.ps: cell-struct.eps interaction.eps tor-design.bib tor-design.tex usenix.sty latex8.bst
+	latex tor-design.tex
+	bibtex tor-design
+	latex tor-design.tex
+	latex tor-design.tex
+	dvips -o $@ tor-design.dvi
+
+tor-design.pdf: cell-struct.pdf interaction.pdf tor-design.bib tor-design.tex usenix.sty latex8.bst
+	pdflatex tor-design.tex
+	bibtex tor-design
+	pdflatex tor-design.tex
+	pdflatex tor-design.tex
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/doc/cell-struct.eps b/doc/design-paper/cell-struct.eps
index eb9fcb8643..eb9fcb8643 100644
--- a/doc/cell-struct.eps
+++ b/doc/design-paper/cell-struct.eps
diff --git a/doc/cell-struct.fig b/doc/design-paper/cell-struct.fig
index 3490673ca6..3490673ca6 100644
--- a/doc/cell-struct.fig
+++ b/doc/design-paper/cell-struct.fig
diff --git a/doc/cell-struct.pdf b/doc/design-paper/cell-struct.pdf
index 1a95b8777a..8ca52deeb9 100644
--- a/doc/cell-struct.pdf
+++ b/doc/design-paper/cell-struct.pdf
diff --git a/doc/cell-struct.png b/doc/design-paper/cell-struct.png
index c0afa1c4a1..799bcc8c18 100644
--- a/doc/cell-struct.png
+++ b/doc/design-paper/cell-struct.png
diff --git a/doc/interaction.eps b/doc/design-paper/interaction.eps
index 9b4e3db619..9b4e3db619 100644
--- a/doc/interaction.eps
+++ b/doc/design-paper/interaction.eps
diff --git a/doc/interaction.fig b/doc/design-paper/interaction.fig
index a7b49e0a52..a7b49e0a52 100644
--- a/doc/interaction.fig
+++ b/doc/design-paper/interaction.fig
diff --git a/doc/interaction.pdf b/doc/design-paper/interaction.pdf
index 8def0add59..8def0add59 100644
--- a/doc/interaction.pdf
+++ b/doc/design-paper/interaction.pdf
diff --git a/doc/design-paper/interaction.png b/doc/design-paper/interaction.png
new file mode 100644
index 0000000000..2bb904fcd9
--- /dev/null
+++ b/doc/design-paper/interaction.png
diff --git a/doc/latex8.bst b/doc/design-paper/latex8.bst
index 2dd3249633..2dd3249633 100644
--- a/doc/latex8.bst
+++ b/doc/design-paper/latex8.bst
diff --git a/doc/tor-design.bib b/doc/design-paper/tor-design.bib
index cf60f2cd22..cf60f2cd22 100644
--- a/doc/tor-design.bib
+++ b/doc/design-paper/tor-design.bib
diff --git a/doc/tor-design.html b/doc/design-paper/tor-design.html
index a02731f174..a02731f174 100644
--- a/doc/tor-design.html
+++ b/doc/design-paper/tor-design.html
diff --git a/doc/tor-design.pdf b/doc/design-paper/tor-design.pdf
index 76a2265153..76a2265153 100644
--- a/doc/tor-design.pdf
+++ b/doc/design-paper/tor-design.pdf
diff --git a/doc/tor-design.tex b/doc/design-paper/tor-design.tex
index 0a27a92525..0a27a92525 100644
--- a/doc/tor-design.tex
+++ b/doc/design-paper/tor-design.tex
diff --git a/doc/usenix.sty b/doc/design-paper/usenix.sty
index 4442f11574..4442f11574 100644
--- a/doc/usenix.sty
+++ b/doc/design-paper/usenix.sty
diff --git a/doc/interaction.png b/doc/interaction.png
deleted file mode 100644
index 44db52a126..0000000000
--- a/doc/interaction.png
+++ /dev/null
diff --git a/doc/latex8.sty b/doc/latex8.sty
deleted file mode 100644
index 2028cee9c7..0000000000
--- a/doc/latex8.sty
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-% --------------------------------------------------------------- 
-%
-% $Id$
-% 
-% by Paolo.Ienne@di.epfl.ch 
-%
-% --------------------------------------------------------------- 
-%
-% no guarantee is given that the format corresponds perfectly to 
-% IEEE 8.5" x 11" Proceedings, but most features should be ok.
-%
-% --------------------------------------------------------------- 
-% with LaTeX2e:
-% =============
-%
-% use as 
-%   \documentclass[times,10pt,twocolumn]{article} 
-%   \usepackage{latex8}
-%   \usepackage{times}
-%
-% --------------------------------------------------------------- 
-% with LaTeX 2.09:
-% ================
-%
-% use as 
-%   \documentstyle[times,art10,twocolumn,latex8]{article}
-%
-% --------------------------------------------------------------- 
-% with both versions:
-% ===================
-%
-% specify \pagestyle{empty} to omit page numbers in the final 
-% version
-%
-% specify references as
-%   \bibliographystyle{latex8}
-%   \bibliography{...your files...}
-%
-% use Section{} and SubSection{} instead of standard section{} 
-%    and subsection{} to obtain headings in the form 
-%    "1.3. My heading"
-%
-% ---------------------------------------------------------------
-
-\typeout{IEEE 8.5 x 11-Inch Proceedings Style `latex8.sty'.}
-
-% ten point helvetica bold required for captions
-% in some sites the name of the helvetica bold font may differ, 
-% change the name here:
-\font\tenhv  = phvb at 10pt
-%\font\tenhv  = phvb7t at 10pt
-
-% eleven point times bold required for second-order headings 
-% \font\elvbf  = cmbx10 scaled 1100
-\font\elvbf  = ptmb scaled 1100
-
-% set dimensions of columns, gap between columns, and paragraph indent 
-\setlength{\textheight}{8.875in}
-\setlength{\textwidth}{6.875in}
-\setlength{\columnsep}{0.3125in}
-%\setlength{\columnsep}{0.26in}
-\setlength{\topmargin}{0in}
-\setlength{\headheight}{0in}
-\setlength{\headsep}{.5in}
-\setlength{\parindent}{1pc}
-\setlength{\oddsidemargin}{-.304in}
-\setlength{\evensidemargin}{-.304in}
-
-% memento from size10.clo
-% \normalsize{\@setfontsize\normalsize\@xpt\@xiipt} 
-% \small{\@setfontsize\small\@ixpt{11}}
-% \footnotesize{\@setfontsize\footnotesize\@viiipt{9.5}} 
-% \scriptsize{\@setfontsize\scriptsize\@viipt\@viiipt}
-% \tiny{\@setfontsize\tiny\@vpt\@vipt}
-% \large{\@setfontsize\large\@xiipt{14}} 
-% \Large{\@setfontsize\Large\@xivpt{18}} 
-% \LARGE{\@setfontsize\LARGE\@xviipt{22}} 
-% \huge{\@setfontsize\huge\@xxpt{25}}
-% \Huge{\@setfontsize\Huge\@xxvpt{30}}
-
-\def\@maketitle
-   {
-   \newpage
-   \null
-   \vskip .375in 
-   \begin{center}
-      {\Large \bf \@title \par} 
-      % additional two empty lines at the end of the title 
-      \vspace*{24pt} 
-      {
-      \large 
-      \lineskip .5em
-      \begin{tabular}[t]{c}
-         \@author 
-      \end{tabular}
-      \par
-      } 
-      % additional small space at the end of the author name 
-      \vskip .5em 
-      {
-       \large 
-      \begin{tabular}[t]{c}
-         \@affiliation 
-      \end{tabular}
-      \par 
-      \ifx \@empty \@email
-      \else
-         \begin{tabular}{r@{~}l}
-            E-mail: & {\tt \@email}
-         \end{tabular}
-         \par
-      \fi
-      }
-      % additional empty line at the end of the title block 
-      \vspace*{12pt} 
-   \end{center}
-   } 
-
-\def\abstract
-   {%
-   \centerline{\large\bf Abstract}%
-   \vspace*{12pt}%
-   \it%
-   }
-
-\def\endabstract
-   {
-   % additional empty line at the end of the abstract 
-   \vspace*{12pt} 
-   }
-
-\def\affiliation#1{\gdef\@affiliation{#1}} \gdef\@affiliation{}
-
-\def\email#1{\gdef\@email{#1}}
-\gdef\@email{}
-
-\newlength{\@ctmp}
-\newlength{\@figindent}
-\setlength{\@figindent}{1pc}
-
-\long\def\@makecaption#1#2{
-   \vskip 10pt
-   \setbox\@tempboxa\hbox{\tenhv\noindent #1.~#2} 
-   \setlength{\@ctmp}{\hsize}
-   \addtolength{\@ctmp}{-\@figindent}\addtolength{\@ctmp}{-\@figindent} 
-   % IF longer than one indented paragraph line
-   \ifdim \wd\@tempboxa >\@ctmp
-      % THEN set as an indented paragraph
-      \begin{list}{}{\leftmargin\@figindent \rightmargin\leftmargin} 
-         \item[]\tenhv #1.~#2\par
-      \end{list}
-   \else
-      % ELSE center
-      \hbox to\hsize{\hfil\box\@tempboxa\hfil} 
-   \fi}
-
-% correct heading spacing and type
-\def\section{\@startsection {section}{1}{\z@}
-   {14pt plus 2pt minus 2pt}{14pt plus 2pt minus 2pt} {\large\bf}} 
-\def\subsection{\@startsection {subsection}{2}{\z@}
-   {13pt plus 2pt minus 2pt}{13pt plus 2pt minus 2pt} {\elvbf}}
-
-% add the period after section numbers 
-\newcommand{\Section}[1]{\section{\hskip -1em.~#1}} 
-\newcommand{\SubSection}[1]{\subsection{\hskip -1em.~#1}}
-
-% end of file latex8.sty
-% ---------------------------------------------------------------