From 7ef91f33b3e5b81d9c7a5b0166de72cdd211733e Mon Sep 17 00:00:00 2001
From: Philipp Winter <phw@nymity.ch>
Date: Tue, 20 Oct 2015 12:23:04 -0400
Subject: [PATCH] Add two censorship-related CCS'15 papers.

---
 Changelog.txt  |  4 ++++
 header.tpl     |  2 +-
 references.bib | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/Changelog.txt b/Changelog.txt
index 2677eef..0e27d92 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,7 @@
+* 2015-10-20
+	- Added paper ``CacheBrowser: Bypassing Chinese Censorship without Proxies Using Cached Content''
+	- Added paper ``Seeing through Network-Protocol Obfuscation''
+
 * 2015-09-06
 	- Added paper ``Forgive Us our SYNs: Technical and Ethical Considerations for Measuring Internet Filtering''
 	- Added paper ``BridgeSPA: Improving Tor Bridges with Single Packet Authorization''
diff --git a/header.tpl b/header.tpl
index 03d52e5..f21e1b4 100644
--- a/header.tpl
+++ b/header.tpl
@@ -73,7 +73,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">2015-09-06</a> <br />
+      Last updated: <a href="Changelog.txt">2015-10-20</a> <br />
     </div>
   </div>
 </div>
diff --git a/references.bib b/references.bib
index 03f10e4..f0d54f0 100644
--- a/references.bib
+++ b/references.bib
@@ -1,3 +1,21 @@
+@inproceedings{Holowczak2015a,
+	author = {John Holowczak and Amir Houmansadr},
+	title = {{C}ache{B}rowser: Bypassing {C}hinese Censorship without Proxies Using Cached Content},
+	booktitle = {Computer and Communications Security},
+	publisher = {ACM},
+	year = {2015},
+	url = {https://people.cs.umass.edu/~amir/papers/CacheBrowser.pdf},
+}
+
+@inproceedings{Wang2015a,
+	author = {Liang Wang and Kevin P. Dyer and Aditya Akella and Thomas Ristenpart and Thomas Shrimpton},
+	title = {Seeing through Network-Protocol Obfuscation},
+	booktitle = {Computer and Communications Security},
+	year = {2015},
+	publisher = {ACM},
+	url = {http://pages.cs.wisc.edu/~liangw/pub/ccsfp653-wangA.pdf},
+}
+
 @inproceedings{Crandall2015a,
 	author = {Jedidiah R. Crandall and Masashi Crete-Nishihata and Jeffrey Knockel},
 	title = {Forgive Us our {SYN}s: Technical and Ethical Considerations for Measuring {I}nternet Filtering},