[tor-commits] [metrics-web/master] Update contents on Research page.

[karsten@xxxxxxxxxxxxxx]

commit 9b3292904c7b1426d1a9d2e4b631ee2a287d7a1a
Author: Karsten Loesing <karsten.loesing@xxxxxxx>
Date:   Wed Dec 14 20:36:23 2016 +0100

    Update contents on Research page.
---
 website/web/WEB-INF/research.jsp | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/website/web/WEB-INF/research.jsp b/website/web/WEB-INF/research.jsp
index 2acff3d..901c3e1 100644
--- a/website/web/WEB-INF/research.jsp
+++ b/website/web/WEB-INF/research.jsp
@@ -30,9 +30,45 @@ of data, rather than just dogma or perspective."
         <br>
         <!-- Navigation end -->
 
-<h3>Research</h3>
+<h1>Research</h1>
 <br>
 
+<p>Tor started out as a research project! We encourage research on all things
+Tor.</p>
+
+<p>Look around the papers section below for some ideas on what others have
+researched in the past. Contact <some general email list here, torproject?> if
+you want to discuss ideas.</p>
+
+<h2>Feel free to use our data for your research!</h2>
+
+<p>If you do, please cite https://metrics.torproject.org/ or the following <a
+href="http://freehaven.net/anonbib/#wecsr10measuring-tor";>paper</a>:</p>
+
+<pre>
+@inproceedings{wecsr10measuring-tor,
+  title = {A Case Study on Measuring Statistical Data in the {T}or Anonymity Network},
+  author = {Karsten Loesing and Steven J. Murdoch and Roger Dingledine},
+  booktitle = {Proceedings of the Workshop on Ethics in Computer Security Research (WECSR 2010)},
+  year = {2010},
+  month = {January},
+  location = {Tenerife, Canary Islands, Spain},
+  publisher = {Springer},
+  series = {LNCS},
+}
+</pre>
+
+<p>Thank you for acknowledging this work through a citation.</p>
+
+<h2>Want to collect your own data for research?</h2>
+
+<p>Look at the <a href="tools.html">tools pages</a> for services that collect
+Tor-related data.</p>
+
+<h2>Research Papers</h2>
+
+<p>Here are some Tor-related papers. (...)</p>
+
     </div>
   </div>
   <div class="bottom" id="bottom">



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits