Permalink
Browse files

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

Conflicts:
	Proposal/Draft2/sample.tex
  • Loading branch information...
2 parents 255ac5c + 9080bb9 commit 13e12f7211c2c99ef15d21a2898a24488e033deb @uberj committed Feb 15, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 Proposal/Draft2/sample.tex
@@ -30,7 +30,7 @@
\section*{Background}
\subsection*{What is Tor?}
- Tor is enables users to use the Internet anonymously. Tor was originally developed by the Navy
+ Tor enables users to use the Internet anonymously. Tor was originally developed by the Navy
and is used by militaries, journalist, law enforcement, activists, and the average internet user
\citep[2]{Tor:web}.
%To ensure a user's privacy and anonymity Tor uses multiple layers of
@@ -48,7 +48,7 @@ \section*{Background}
\subsection*{Why is Tor important?}
ONI, the OpenNet Initiative, reported that "the Middle East and North Africa is one of the most
- heavily censored regions in the world". It also claimed that it "conducted tests for technical
+ heavily censored regions in the world". ONI says that it "conducted tests for technical
Internet filtering in all of the countries in the Middle East and North Africa between 2008 and
2009. Test results prove that the governments and Internet service providers (ISPs) censor
content deemed politically sensitive; critical of governments, leaders or ruling families;

0 comments on commit 13e12f7

Please sign in to comment.