From 49337a8d3cde18be48d281b49e89b21aae4f5352 Mon Sep 17 00:00:00 2001
From: Philipp Winter <phw@nymity.ch>
Date: Wed, 20 Jul 2016 11:03:45 -0400
Subject: [PATCH] Add remaining PETS'16 papers.

Also, harmonise the URLs of the existing PETS papers.
---
 Changelog.txt  |  5 +++++
 header.tpl     |  2 +-
 references.bib | 42 ++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 4dc0f31..8dea22d 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,8 @@
+* 2016-07-20
+	- Added paper ``A Framework for the Game-theoretic Analysis of Censorship Resistance''
+	- Added paper ``SoK: Making Sense of Censorship Resistance Systems''
+	- Added paper ``Salmon: Robust Proxy Distribution for Censorship Circumvention''
+
 * 2016-07-06
 	- Added paper ``Satellite: Joint Analysis of CDNs and Network-Level Interference''
 
diff --git a/header.tpl b/header.tpl
index f329b75..dff663b 100644
--- a/header.tpl
+++ b/header.tpl
@@ -83,7 +83,7 @@
       (<a href="author_reverse.html">reverse</a>) <a href="author.html">author</a> <br />
       Feedback: <a href="mailto:phw@nymity.ch">phw@nymity.ch</a> (<a
       href="https://nymity.ch/openpgp_public_key.txt">OpenPGP</a>) <br />
-      Last updated: <a href="Changelog.txt">2016-07-06</a> <br />
+      Last updated: <a href="Changelog.txt">2016-07-20</a> <br />
     </div>
   </div>
 </div>
diff --git a/references.bib b/references.bib
index fe538f3..859d184 100644
--- a/references.bib
+++ b/references.bib
@@ -1,3 +1,39 @@
+@article{Elahi2016a,
+	author = {Tariq Elahi and John A. Doucette and Hadi Hosseini and Steven J. Murdoch and Ian Goldberg},
+	title = {A Framework for the Game-theoretic Analysis of Censorship Resistance},
+	journal = {Privacy Enhancing Technologies},
+	volume = {2016},
+	number = {4},
+	publisher = {De Gruyter Open},
+	year = {2016},
+    pages = {83--101},
+	url = {http://www.degruyter.com/downloadpdf/j/popets.2016.2016.issue-4/popets-2016-0030/popets-2016-0030.xml},
+}
+
+@article{Khattak2016a,
+	author = {Sheharbano Khattak and Tariq Elahi and Laurent Simon and Colleen M. Swanson and Steven J. Murdoch and Ian Goldberg},
+	title = {{SoK}: Making Sense of Censorship Resistance Systems},
+	journal = {Privacy Enhancing Technologies},
+	volume = {2016},
+	number = {4},
+	publisher = {De Gruyter Open},
+	year = {2016},
+    pages = {37--61},
+	url = {http://www.degruyter.com/downloadpdf/j/popets.2016.2016.issue-4/popets-2016-0028/popets-2016-0028.xml},
+}
+
+@article{Douglas2016a,
+	author = {Frederick Douglas and Rorshach and Weiyang Pan and Matthew Caesar},
+	title = {{Salmon}: Robust Proxy Distribution for Censorship Circumvention},
+	journal = {Privacy Enhancing Technologies},
+	volume = {2016},
+	number = {4},
+	publisher = {De Gruyter Open},
+	year = {2016},
+    pages = {4--20},
+	url = {http://www.degruyter.com/downloadpdf/j/popets.2016.2016.issue-4/popets-2016-0026/popets-2016-0026.xml},
+}
+
 @inproceedings{Scott2016a,
 	author = {Will Scott and Thomas Anderson and Tadayoshi Kohno and Arvind Krishnamurthy},
 	title = {{S}atellite: Joint Analysis of {CDN}s and Network-Level Interference},
@@ -51,7 +87,8 @@
 	number = {2},
 	publisher = {De Gruyter Open},
 	year = {2016},
-	url = {http://www.degruyter.com/dg/viewarticle.fullcontentlink:pdfeventlink/$002fj$002fpopets.2015.2016.issue-2$002fpopets-2016-0011$002fpopets-2016-0011.pdf/popets-2016-0011.pdf?t:ac=j$002fpopets.2015.2016.issue-2$002fpopets-2016-0011$002fpopets-2016-0011.xml}
+    pages = {175--192},
+    url = {http://www.degruyter.com/downloadpdf/j/popets.2015.2016.issue-2/popets-2016-0011/popets-2016-0011.xml},
 }
 
 @article{McPherson2016a,
@@ -62,7 +99,8 @@
 	number = {3},
 	publisher = {De Gruyter Open},
 	year = {2016},
-	url = {http://www.cs.cornell.edu/~shmat/shmat_pets16.pdf},
+    pages = {212--225},
+	url = {http://www.degruyter.com/downloadpdf/j/popets.2016.2016.issue-3/popets-2016-0024/popets-2016-0024.xml},
 }
 
 @inproceedings{Kohls2016a,