From b8d1e0c66af657ab78cc5b7ac9075ced4ccf3658 Mon Sep 17 00:00:00 2001
From: Philipp Winter <phw@nymity.ch>
Date: Wed, 12 Aug 2015 18:26:02 -0400
Subject: [PATCH] Add USENIX Security'15 paper.

---
 Changelog.txt  | 1 +
 references.bib | 9 +++++++++
 2 files changed, 10 insertions(+)

diff --git a/Changelog.txt b/Changelog.txt
index 5c38427..879b998 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,4 +1,5 @@
 * 2015-08-12
+	- Added paper ``Marionette: A Programmable Network-Traffic Obfuscation System''
 	- Added paper ``Encore: Lightweight Measurement of Web Censorship with Cross-Origin Requests''
 
 * 2015-07-04
diff --git a/references.bib b/references.bib
index d65affb..9a76973 100644
--- a/references.bib
+++ b/references.bib
@@ -1,3 +1,12 @@
+@inproceedings{Dyer2015a,
+	author = {Kevin P. Dyer and Scott E. Coull and Thomas Shrimpton},
+	title = {Marionette: A Programmable Network-Traffic Obfuscation System},
+	booktitle = {USENIX Security Symposium},
+	publisher = {USENIX},
+	year = {2015},
+	url = {https://www.usenix.org/system/files/conference/usenixsecurity15/sec15-paper-dyer.pdf},
+}
+
 @inproceedings{Burnett2015a,
 	author = {Sam Burnett and Nick Feamster},
 	title = {Encore: Lightweight Measurement of Web Censorship with Cross-Origin Requests},