Merge branch 'master' into fix-todos

dbosk · dbosk · commit 1ae6c8f4dd53 · 2017-11-03T10:26:14.000+01:00
diff --git a/OTPKX.tex b/OTPKX.tex
@@ -1,3 +1,6 @@
+\subsubsection{When the Adversary Controls the Network}
+\label{WhenAdversaryControlsNetwork}
+
 \textcite{OTPKX} argue that if the adversary controls the entire network, then 
 the approach to deniability taken by \ac{OTR} and Signal does not suffice.
 The problem is that Eve can record a transcript of all communications
diff --git a/PairwiseComm.tex b/PairwiseComm.tex
@@ -147,7 +147,4 @@ \subsubsection{Secure Email and Text Messaging}
 The result is that Eve has many more candidates for the authorship of 
 a conversation.
 
-\subsubsection{When the Adversary Controls the Network}
-\label{WhenAdversaryControlsNetwork}
-
 \input{OTPKX.tex}
diff --git a/abstract.tex b/abstract.tex
@@ -34,7 +34,7 @@
 % \end{itemize}
 
 \keywords{%
-  protest;
+  protesting;
   demonstration;
   \Aclp{OSN};
   \Aclp{PET}
diff --git a/makefiles b/makefiles
@@ -1 +1 @@
-Subproject commit 23e36cc587f9c9b5dd4816bd39c1c150368b25db
+Subproject commit 2e989847edc76c0f277e696c4252b58a1d570843
diff --git a/protesting.tex b/protesting.tex
@@ -113,7 +113,8 @@
 
 \title{%
   Applying Privacy-Enhancing Technologies:
-  One Alternative Future of Protests
+  %One Alternative Future of Protests
+  One Alternative Future of Protesting
 }
 %\title{%
 %  Protests in the Age of Privacy-Enhancing Technologies

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,8 @@`
`113`	`113`
`114`	`114`	`\title{%`
`115`	`115`	`Applying Privacy-Enhancing Technologies:`
`116`		`- One Alternative Future of Protests`
	`116`	`+ %One Alternative Future of Protests`
	`117`	`+ One Alternative Future of Protesting`
`117`	`118`	`}`
`118`	`119`	`%\title{%`
`119`	`120`	`% Protests in the Age of Privacy-Enhancing Technologies`