Permalink
Browse files

Merge branch 'master' of github.com:uberj/WR327

Conflicts:
	Proposal/Draft2/sample.tex
  • Loading branch information...
2 parents 6b1dedd + e3f8fda commit e4d9d620cbcf8a0b177973b07481473926a283b0 @uberj committed Feb 22, 2012
Showing with 13 additions and 3 deletions.
  1. +13 −3 Proposal/Draft2/sample.tex
View
@@ -15,7 +15,7 @@
\end{center}
\setlength{\topmargin}{0in}
\maketitle
-%\section*{Introduction}
+\section*{Introduction}
\noindent
It is my goal to investigate how engineers are working to improve latency and congestion issues in
Tor. The literature review will include all scholarly articles on Tor found via the Academic Search
@@ -112,16 +112,21 @@ \subsection*{White Papers}
\citeauthor*{Bauer}: This paper discusses the consequences of replacing the Round Robin algorithm and
proposes a new scheduling algorithm.
\item
+<<<<<<< HEAD
\citeauthor*{Edman}: This paper explores modifying Tor's path selection algorithm to help
clients avoid observers from discovering their identities.
+=======
+ \citeauthor*{Edman}: This paper explores modifications to Tor's path selection algorithm to help
+ clients prevent observers from discovering their identities.
+>>>>>>> e3f8fdafa3efb1fd57179bfd965cfcbe8b708aa3
\item
\citeauthor*{Moore}: This paper describes a different idea of how to improve latency. The
authors propose that traffic should be throttled at the ingress of the network.
\end{itemize}
-\section*{Conclusion}
+{\section*{Conclusion}}
\begin{itemize}
\item
Tor is a valuable cyber anonymity tool for many disciplines.
@@ -133,7 +138,12 @@ \section*{Conclusion}
I am asking for approval to do a literature review on the ways engineers are addressing the
congestion and latency issues within the Tor network.
+\newpage
\bibliographystyle{mla-good}
+<<<<<<< HEAD
%\bibliographystyle{plain-annote}
+=======
+\center \renewcommand\refname{Work Cited\\ }
+>>>>>>> e3f8fdafa3efb1fd57179bfd965cfcbe8b708aa3
\bibliography{sample}
-\end{document}
+\end{document}

0 comments on commit e4d9d62

Please sign in to comment.