From: Paul Syverson <syverson@itd.nrl.navy.mil>
Date: Wed, 12 Nov 2003 17:25:53 +0000 (+0000)
Subject: Update and uncomment the Acks section. Also uncomment the authors.
X-Git-Tag: tor-0.0.2pre14~49
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0763f800543e57ecb78f90722bd84a327665fcb4;p=thirdparty%2Ftor.git

Update and uncomment the Acks section. Also uncomment the authors.
A spacing tweak.


svn:r801
---

diff --git a/doc/tor-design.tex b/doc/tor-design.tex
index 38175d613c..8935bd5964 100644
--- a/doc/tor-design.tex
+++ b/doc/tor-design.tex
@@ -46,9 +46,9 @@
 \title{Tor: The Second-Generation Onion Router}
 % Putting the 'Private' back in 'Virtual Private Network'
 
-%\author{Roger Dingledine \\ The Free Haven Project \\ arma@freehaven.net \and
-%Nick Mathewson \\ The Free Haven Project \\ nickm@freehaven.net \and
-%Paul Syverson \\ Naval Research Lab \\ syverson@itd.nrl.navy.mil}
+\author{Roger Dingledine \\ The Free Haven Project \\ arma@freehaven.net \and
+Nick Mathewson \\ The Free Haven Project \\ nickm@freehaven.net \and
+Paul Syverson \\ Naval Research Lab \\ syverson@itd.nrl.navy.mil}
 
 \maketitle
 \thispagestyle{empty}
@@ -261,7 +261,7 @@ adversary introduces timing patterns into traffic entering the network and
 looks
 for correlated patterns among exiting traffic.
 Although some work has been done to frustrate
-these attacks,%\footnote{
+these attacks, %\footnote{
 %  The most common approach is to pad and limit communication to a constant
 %  rate, or to limit
 %  the variation in traffic shape.  Doing so can have prohibitive bandwidth
@@ -1800,14 +1800,15 @@ our overall usability.
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 %% commented out for anonymous submission
-%\Section{Acknowledgments}
-% Peter Palfrader, Geoff Goodell, Adam Shostack, Joseph Sokol-Margolis,
-%   John Bashinski
-%   for editing and comments
-% Matej Pfajfar, Andrei Serjantov, Marc Rennhard for design discussions
-% Bram Cohen for congestion control discussions
-% Adam Back for suggesting telescoping circuits
-% Cathy Meadows for formal analysis of candidate extend DH protocols
+\Section{Acknowledgments}
+ Peter Palfrader, Geoff Goodell, Adam Shostack, Joseph Sokol-Margolis,
+   John Bashinski, Zack Brown:
+   for editing and comments.
+ Matej Pfajfar, Andrei Serjantov, Marc Rennhard: for design discussions.
+ Bram Cohen for congestion control discussions.
+ Adam Back for suggesting telescoping circuits.
+ Cathy Meadows for formal analysis of the extend protocol.
+ This work supported by ONR and DARPA.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%