[tor-commits] [tech-reports/master] Merge branch 'hidserv3' into master

[karsten at torproject.org]

commit c65aa9b86190bff0c212237fa82f4219d3b1d297
Merge: 54799c8 ad1068f
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Jun 17 20:29:17 2015 +0200

    Merge branch 'hidserv3' into master

 2015/hidden-service-stats/.gitignore               |    4 +
 2015/hidden-service-stats/Makefile                 |   18 +
 2015/hidden-service-stats/hidden-service-stats.bib |  183 +++
 2015/hidden-service-stats/hidden-service-stats.tex | 1694 ++++++++++++++++++++
 2015/hidden-service-stats/protocol.odg             |  Bin 0 -> 14037 bytes
 2015/hidden-service-stats/protocol.pdf             |  Bin 0 -> 20270 bytes
 2015/hidden-service-stats/tortechrep.cls           |    1 +
 7 files changed, 1900 insertions(+)