Revert "Assume that @conference was meant to be @inproceedings as valid Bibtex by BibTex.py". We can solve this differently according to https://nwalsh.com/tex/texhelp/bibtx-11.html - gnunetbib

commit ae67ae730cdc810c242c3e16d92adf98966f82b8
parent 6b2d023e754d506cc9422ed013f33d97860d4e22
Author: Nils Gillmann <ng0@n0.is>
Date:   Sat,  6 Oct 2018 13:47:38 +0000

Revert "Assume that @conference was meant to be @inproceedings as valid Bibtex by BibTex.py".
We can solve this differently according to https://nwalsh.com/tex/texhelp/bibtx-11.html

This reverts commit 6b2d023e754d506cc9422ed013f33d97860d4e22.

Diffstat:
M gnunetbib.bib  | 1439 ++++++++++++++++++++++++++++++++++++++++---------------------------------------

1 file changed, 720 insertions(+), 719 deletions(-)
diff --git a/gnunetbib.bib b/gnunetbib.bib
@@ -23,6 +23,7 @@
 @string{credentials = "E-Cash / Anonymous Credentials"}
 @string{misc = "Misc"}
 @string{torperf = "Tor Performance"}
+@string{conference = "Conference"}
 
 #
 # Proposed new sections: application privacy, data anonymization, ...
@@ -61,7 +62,7 @@
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/lurchi-bs-thesis.pdf},
 	author = {Christian Ulrich}
 }
-@inproceedings {dold2016byzantine,
+@conference {dold2016byzantine,
 	title = {Byzantine Set-Union Consensus using Efficient Set Reconciliation},
 	booktitle = {International Conference on Availability, Reliability and Security (ARES)},
 	year = {2016},
@@ -69,7 +70,7 @@
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/dold2016byzantine.pdf},
 	author = {Dold, Florian and Grothoff, Christian}
 }
-@inproceedings {consensus2016,
+@conference {consensus2016,
 	title = {Byzantine Set-Union Consensus using Efficient Set Reconciliation},
 	booktitle = {International Conference on Availability, Reliability and Security (ARES)},
 	year = {2016},
@@ -80,7 +81,7 @@
         www_section = {https://bibliography.gnunet.org/},
 	author = {Florian Dold and Christian Grothoff}
 }
-@inproceedings {taler2016space,
+@conference {taler2016space,
 	title = {Enabling Secure Web Payments with GNU Taler},
 	booktitle = {6th International Conference on Security, Privacy and Applied Cryptographic Engineering},
 	year = {2016},
@@ -109,7 +110,7 @@
         www_section = {https://bibliography.gnunet.org/},
 	author = {Christian Ricardo K{\"u}hne}
 }
-@inproceedings {2016,
+@conference {2016,
 	title = {Managing and Presenting User Attributes over a Decentralized Secure Name System},
 	booktitle = {Data Privacy Management and Security Assurance - 11th International Workshop, {DPM} 2016 and 5th International Workshop, {QASA} 2016, Heraklion, Crete, Greece, September 26-27, 2016, Proceedings},
 	year = {2016},
@@ -122,7 +123,7 @@
         www_section = {https://bibliography.gnunet.org/},
 	author = {Martin Schanzenbach and Christian Banse}
 }
-@inproceedings {p4t2016,
+@conference {p4t2016,
 	title = {Privacy-Preserving Abuse Detection in Future Decentralised Online Social Networks},
 	booktitle = {Data Privacy Management (DPM)},
 	year = {2016},
@@ -239,7 +240,7 @@
         www_section = {https://bibliography.gnunet.org/},
 	author = {Nicolas Bene{\v s}}
 }
-@inproceedings {paper_short2014,
+@conference {paper_short2014,
 	title = {Automatic Transport Selection and Resource Allocation for Resilient Communication in Decentralised Networks},
 	booktitle = {14-th IEEE International Conference on Peer-to-Peer Computing},
 	year = {2014},
@@ -271,7 +272,7 @@ We present a hybrid PIR protocol that combines two PIR protocols, one from each 
 	author = {Devet, Casey and Goldberg, Ian},
 	editor = {De Cristofaro, Emiliano and Murdoch, StevenJ}
 }
-@inproceedings {CADET,
+@conference {CADET,
 	title = {CADET: Confidential Ad-hoc Decentralized End-to-End Transport},
 	booktitle = {Med-Hoc-Net 2014},
 	year = {2014},
@@ -282,7 +283,7 @@ We present a hybrid PIR protocol that combines two PIR protocols, one from each 
         www_section = {https://bibliography.gnunet.org/},
 	author = {Polot, Bartlomiej and Christian Grothoff}
 }
-@inproceedings {DistributedSearch2014Hermann,
+@conference {DistributedSearch2014Hermann,
 	title = {Censorship-Resistant and Privacy-Preserving Distributed Web Search},
 	booktitle = {IEEE International Conference on Peer to Peer computing},
 	year = {2014},
@@ -291,7 +292,7 @@ We present a hybrid PIR protocol that combines two PIR protocols, one from each 
         www_section = {https://bibliography.gnunet.org/},
 	author = {Michael Herrmann and Ren Zhang and Kai-Chun Ning and Claudia Diaz}
 }
-@inproceedings {CANS2014camera-ready,
+@conference {CANS2014camera-ready,
 	title = {A Censorship-Resistant, Privacy-Enhancing and Fully Decentralized Name System},
 	booktitle = {International Conference on Cryptology and Network Security (CANS)},
 	year = {2014},
@@ -467,7 +468,7 @@ This thesis also describes Knock, a free software implementation of TCP Stealth 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ma_kirsch_2014_0.pdf},
 	author = {Julian Kirsch}
 }
-@inproceedings {strint2014,
+@conference {strint2014,
 	title = {The Internet is Broken: Idealistic Ideas for Building a GNU Network},
 	booktitle = {W3C/IAB Workshop on Strengthening the Internet Against Pervasive Monitoring (STRINT)},
 	year = {2014},
@@ -519,7 +520,7 @@ obtained with different parameter sets and different test cases are presented an
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/arias2014bs.pdf},
 	author = {Raphael Arias}
 }
-@inproceedings {DBLP:conf/stoc/Ullman13,
+@conference {DBLP:conf/stoc/Ullman13,
 	booktitle = {Answering $n^{2+o(1)}$ Counting Queries with Differential Privacy is Hard},
 	year = {2013},
 	pages = {361{\textendash}370},
@@ -556,7 +557,7 @@ In this paper we explore the implications of differential privacy when the indis
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/gnunet-psyc.pdf},
 	author = {Gabor X Toth}
 }
-@inproceedings {fps2013wachs,
+@conference {fps2013wachs,
 	title = {On the Feasibility of a Censorship Resistant Decentralized Name System},
 	booktitle = {6th International Symposium on Foundations \&amp; Practice of Security (FPS 2013)},
 	year = {2013},
@@ -571,7 +572,7 @@ This paper maps the design space and gives design requirements for censorship re
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fps2013wachs.pdf},
 	author = {Matthias Wachs and Martin Schanzenbach and Christian Grothoff}
 }
-@inproceedings {DBLP:conf/netys/BoutetFJKR13,
+@conference {DBLP:conf/netys/BoutetFJKR13,
 	title = {FreeRec: An Anonymous and Distributed Personalization Architecture},
 	year = {2013},
 	pages = {58{\textendash}73},
@@ -613,7 +614,7 @@ In this paper we describe the problems that occur when debugging widely distribu
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/main_0.pdf},
 	author = {Markus Teich}
 }
-@inproceedings {2013_3,
+@conference {2013_3,
 	title = {Persea: A Sybil-resistant Social DHT},
 	booktitle = {Proceedings of the Third ACM Conference on Data and Application Security and Privacy},
 	year = {2013},
@@ -677,7 +678,7 @@ This thesis includes extensive measurement data highlighting the possible benefi
 	doi = {10.1098/rsta.2012.0380},
 	author = {Kermarrec, Anne-Marie}
 }
-@inproceedings {2013_6,
+@conference {2013_6,
 	title = {Trawling for Tor Hidden Services: Detection, Measurement, Deanonymization},
 	booktitle = {Security and Privacy (SP), 2013 IEEE Symposium on},
 	year = {2013},
@@ -686,7 +687,7 @@ This thesis includes extensive measurement data highlighting the possible benefi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Trawling_for_tor_HS.pdf},
 	author = {Biryukov, A. and Pustogarov, I. and Weinmann, R.}
 }
-@inproceedings {2013_7,
+@conference {2013_7,
 	title = {WhatsUp: A Decentralized Instant News Recommender},
 	booktitle = {IEEE 27th International Symposium on Parallel \& Distributed Processing},
 	year = {2013},
@@ -729,7 +730,7 @@ This thesis includes extensive measurement data highlighting the possible benefi
 	author = {Alaggan, Mohammad and Gambs, S{\'e}bastien and Kermarrec, Anne-Marie},
 	editor = {Richa, Andr{\'e}aW. and Scheideler, Christian}
 }
-@inproceedings {congestion-tor12,
+@conference {congestion-tor12,
 	title = {Congestion-aware Path Selection for Tor},
 	booktitle = {FC{\textquoteright}12 - Proceedings of the 16th International Conference in Financial Cryptography and Data Security },
 	year = {2012},
@@ -741,7 +742,7 @@ serve that some nodes persist in being under-utilized or congested. This can deg
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/FC\%2712\%20-\%20Congestion-aware\%20Path\%20Selection\%20for\%20Tor.pdf},
 	author = {Tao Wang and Kevin Bauer and Clara Forero and Ian Goldberg}
 }
-@inproceedings {2012_1,
+@conference {2012_1,
 	title = {CRISP: Collusion-resistant Incentive-compatible Routing and Forwarding in Opportunistic Networks},
 	booktitle = {Proceedings of the 15th ACM International Conference on Modeling, Analysis and Simulation of Wireless and Mobile Systems},
 	year = {2012},
@@ -849,7 +850,7 @@ accuracy of the protocol},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/nse-techreport.pdf},
 	author = {Nathan S Evans and Polot, Bartlomiej and Christian Grothoff}
 }
-@inproceedings {2012_6,
+@conference {2012_6,
 	title = {Efficient and Secure Decentralized Network Size Estimation},
 	booktitle = {IFIP International Conferences on Networking (Networking 2012)},
 	year = {2012},
@@ -864,7 +865,7 @@ accuracy of the protocol},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/paper-ifip.pdf},
 	author = {Nathan S Evans and Polot, Bartlomiej and Christian Grothoff}
 }
-@inproceedings {gossipico2012,
+@conference {gossipico2012,
 	title = {Gossip-based counting in dynamic networks},
 	booktitle = {IFIP International Conferences on Networking (Networking 2012)},
 	year = {2012},
@@ -877,7 +878,7 @@ accuracy of the protocol},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Gossipico.pdf},
 	author = {Ruud van de Bovenkamp and Fernando Kuipers and Piet Van Mieghem}
 }
-@inproceedings {DBLP:conf/tridentcom/HermenierR12,
+@conference {DBLP:conf/tridentcom/HermenierR12,
 	title = {How to Build a Better Testbed: Lessons from a Decade of Network Experiments on Emulab},
 	booktitle = {TRIDENTCOM},
 	year = {2012},
@@ -886,7 +887,7 @@ accuracy of the protocol},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/how-to-build-a-better-testbed.pdf},
 	author = {Fabien Hermenier and Robert Ricci}
 }
-@inproceedings {2012_7,
+@conference {2012_7,
 	title = {Koi: A Location-Privacy Platform for Smartphone Apps},
 	booktitle = {Proceedings of the 9th Symposium on Networked Systems Design and Implementation (NSDI)},
 	year = {2012},
@@ -898,7 +899,7 @@ In this paper, we propose privacy-preserving location-based matching as a fundam
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/nsdi12-koi.pdf},
 	author = {Saikat Guha and Mudit Jain and Venkata Padmanabhan}
 }
-@inproceedings {oakland2012-lap,
+@conference {oakland2012-lap,
 	title = {LAP: Lightweight Anonymity and Privacy},
 	booktitle = {Proceedings of the 2012 IEEE Symposium on Security and Privacy},
 	year = {2012},
@@ -913,7 +914,7 @@ remote tracking. To show practicality, we demonstrate that LAP can work on top o
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/LAP\%3A\%20Lightweight\%20Anonymity\%20and\%20Privacy.pdf},
 	author = {Hsu-Chun Hsiao and Tiffany Hyun-Jin Kim and Adrian Perrig and Akira Yamada and Sam Nelson and Marco Gruteser and Wei Ming}
 }
-@inproceedings {oakland2012-lastor,
+@conference {oakland2012-lastor,
 	title = {LASTor: A Low-Latency AS-Aware Tor Client},
 	booktitle = {Proceedings of the 2012 IEEE Symposium on Security and Privacy},
 	year = {2012},
@@ -1004,7 +1005,7 @@ In this master thesis we introduce Monkey, a new tool that provides a solution f
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/safey-thesis-monkey.pdf , https://gnunet.org/git/bibliography.git/tree/docs/safey-presentation-monkey.pdf},
 	author = {Safey A. Halim}
 }
-@inproceedings {2012_10,
+@conference {2012_10,
 	title = {NTALG - TCP NAT traversal with application-level gateways},
 	booktitle = {Consumer Communications and Networking Conference (CCNC), 2012 IEEE},
 	year = {2012},
@@ -1027,7 +1028,7 @@ a small test setup with laptop computers and home NAT routers},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/octopus_dht.pdf},
 	author = {Wang, Qiyan and Borisov, Nikita}
 }
-@inproceedings {oakland2012-peekaboo,
+@conference {oakland2012-peekaboo,
 	title = {Peek-a-Boo, I Still See You: Why Efficient Traffic Analysis Countermeasures Fail},
 	booktitle = {Proceedings of the 2012 IEEE Symposium on Security and Privacy},
 	year = {2012},
@@ -1057,7 +1058,7 @@ purpose TA countermeasures can ever provide the type of security targeted in pri
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Personalization2012Toch.pdf},
 	author = {Toch, Eran and Wang, Yang and Cranor, LorrieFaith}
 }
-@inproceedings {DBLP:conf/focs/DworkNV12,
+@conference {DBLP:conf/focs/DworkNV12,
 	title = {The Privacy of the Analyst and the Power of the State},
 	year = {2012},
 	pages = {400{\textendash}409},
@@ -1144,7 +1145,7 @@ handle replication and, thus, to trade off replication costs for fair load distr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/TheoryandPracticeBloomFilter2011Tarkoma.pdf},
 	author = {Tarkoma, S. and Rothenberg, C.E. and Lagerspetz, E.}
 }
-@inproceedings {2012_17,
+@conference {2012_17,
 	title = {User Interests Driven Web Personalization Based on Multiple Social Networks},
 	booktitle = {Proceedings of the 4th International Workshop on Web Intelligence \&\#38; Communities},
 	year = {2012},
@@ -1159,7 +1160,7 @@ handle replication and, thus, to trade off replication costs for fair load distr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WebPersonalization2012Zeng.pdf},
 	author = {Zeng, Yi and Zhong, Ning and Ren, Xu and Wang, Yan}
 }
-@inproceedings {pets2011-bagai,
+@conference {pets2011-bagai,
 	title = {An Accurate System-Wide Anonymity Metric for Probabilistic Attacks},
 	booktitle = {PETS{\textquoteright}11 - Proceedings of the 11th Privacy Enhancing Technologies Symposium},
 	year = {2011},
@@ -1171,7 +1172,7 @@ generalization properties. Finally, we present a new anonymity metric that does 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/PETS\%2711\%20-\%20An\%20Accurate\%20System-Wide\%20Anonymity\%20Metric\%20for\%20Probabilistic\%20Attacks.pdf},
 	author = {Rajiv Bagai and Huabo Lu and Rong Li and Bin Tang}
 }
-@inproceedings { cset2011evans,
+@conference { cset2011evans,
 	title = {Beyond Simulation: Large-Scale Distributed Emulation of P2P Protocols},
 	booktitle = {4th Workshop on Cyber Security Experimentation and Test (CSET 2011)},
 	year = {2011},
@@ -1183,7 +1184,7 @@ generalization properties. Finally, we present a new anonymity metric that does 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cset2011.pdf},
 	author = {Nathan S Evans and Christian Grothoff}
 }
-@inproceedings {bnymble11,
+@conference {bnymble11,
 	title = {BNymble: More anonymous blacklisting at almost no cost},
 	booktitle = {FC{\textquoteright}11 - Proceedings of Financial Cryptography and Data Security },
 	year = {2011},
@@ -1195,7 +1196,7 @@ BNymble is that we can achieve the anonymity goals of these more recent schemes 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/FC\%2711\%20-\%20BNymble.pdf},
 	author = {Peter Lofgren and Nicholas J. Hopper}
 }
-@inproceedings {wpes11-bridgespa,
+@conference {wpes11-bridgespa,
 	title = {BridgeSPA: Improving Tor Bridges with Single Packet Authorization},
 	booktitle = {WPES{\textquoteright}11 - Proceedings of the Workshop on Privacy in the Electronic Society },
 	year = {2011},
@@ -1207,7 +1208,7 @@ BNymble is that we can achieve the anonymity goals of these more recent schemes 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WPES\%2711\%20-\%20bridgeSPA.pdf},
 	author = {Rob Smits and Divam Jain and Sarah Pidcock and Ian Goldberg and Urs Hengartner}
 }
-@inproceedings {ccs2011-cirripede,
+@conference {ccs2011-cirripede,
 	title = {Cirripede: Circumvention Infrastructure using Router Redirection with Plausible Deniability},
 	booktitle = {CCS{\textquoteright}11 - Proceedings of the 18th ACM conference on Computer and Communications Security},
 	year = {2011},
@@ -1258,7 +1259,7 @@ and sequences. It discusses some properties needed to implement non-trivial CRDT
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/crdt.pdf},
 	author = {Marc Shapiro and Nuno Preguica and Carlos Baquero and Marek Zawirski}
 }
-@inproceedings {2011_2,
+@conference {2011_2,
 	title = {Considering Complex Search Techniques in DHTs under Churn},
 	booktitle = {CCNC 2011 - IEEE Consumer Communications and Networking Conference},
 	year = {2011},
@@ -1272,7 +1273,7 @@ and sequences. It discusses some properties needed to implement non-trivial CRDT
 	doi = {http://dx.doi.org/10.1109/CCNC.2011.5766542},
 	author = {Jamie Furness and Mario Kolberg}
 }
-@inproceedings {foci11-decoy,
+@conference {foci11-decoy,
 	title = {Decoy Routing: Toward Unblockable Internet Communication},
 	booktitle = {FOCI{\textquoteright}11 - Proceedings of the USENIX Workshop on Free and Open Communications on the Internet},
 	year = {2011},
@@ -1284,7 +1285,7 @@ is easily blocked) in order to provide circumvention. We show that if it is poss
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/FOCI\%2711\%20-\%20Decoy\%20Routing\%3A\%20Toward\%20Unblockable\%20Internet\%20Communication.pdf},
 	author = {Josh Karlin and Daniel Ellard and Alden W. Jackson and Christine E. Jones and Greg Lauer and David P. Mankins and W. Timothy Strayer}
 }
-@inproceedings {pets2011-defenestrator,
+@conference {pets2011-defenestrator,
 	title = {DefenestraTor: Throwing out Windows in Tor},
 	booktitle = {PETS{\textquoteright}11 - Proceedings of the 11th Privacy Enhancing Technologies Symposium },
 	year = {2011},
@@ -1308,7 +1309,7 @@ Our results also yield new separations between the local and global models of co
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/DistributedPrivateData2008Beimel.pdf},
 	author = {Amos Beimel and Kobbi Nissim and Eran Omri}
 }
-@inproceedings {cset11-experimentor,
+@conference {cset11-experimentor,
 	title = {ExperimenTor: A Testbed for Safe and Realistic Tor Experimentation},
 	booktitle = {CSET{\textquoteright}11 - Proceedings of the USENIX Workshop on Cyber Security Experimentation and Test},
 	year = {2011},
@@ -1320,7 +1321,7 @@ conducting Tor research in a way that ensures safety and realism, we present the
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/CSET\%2711\%20-\%20ExperimenTor.pdf},
 	author = {Kevin Bauer and Micah Sherr and Damon McCoy and Dirk Grunwald}
 }
-@inproceedings {acsac11-tortoise,
+@conference {acsac11-tortoise,
 	title = {Exploring the Potential Benefits of Expanded Rate Limiting in Tor: Slow and Steady Wins the Race With Tortoise},
 	booktitle = {ACSAC{\textquoteright}11 - Proceedings of 2011 Annual Computer Security Applications Conference},
 	year = {2011},
@@ -1332,7 +1333,7 @@ This paper argues the very counterintuitive notion that slowing down traffic on 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ACSAC\%2711\%20-\%20Tortoise.pdf},
 	author = {W. Brad Moore and Chris Wacek and Micah Sherr}
 }
-@inproceedings {acsac11-backlit,
+@conference {acsac11-backlit,
 	title = {Exposing Invisible Timing-based Traffic Watermarks with BACKLIT},
 	booktitle = {ACSAC{\textquoteright}11 - Proceedings of 2011 Annual Computer Security Applications Conference },
 	year = {2011},
@@ -1344,7 +1345,7 @@ with high accuracy and few false positives},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ACSAC\%2711\%20-\%20BACKLIT.pdf},
 	author = {Xiapu Luo and Peng Zhou and Junjie Zhang and Roberto Perdisci and Wenke Lee and Rocky K. C. Chang}
 }
-@inproceedings {wpes11-faust,
+@conference {wpes11-faust,
 	title = {FAUST: Efficient, TTP-Free Abuse Prevention by Anonymous Whitelisting},
 	booktitle = {WPES{\textquoteright}11 - Proceedings of the Workshop on Privacy in the Electronic Society},
 	year = {2011},
@@ -1358,7 +1359,7 @@ authenticate in future sessions. Faust uses no trusted third parties and is one 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WPES\%2711\%20-\%20FAUST.pdf},
 	author = {Peter Lofgren and Nicholas J. Hopper}
 }
-@inproceedings {Prusty:2011:FIO:2046707.2046731,
+@conference {Prusty:2011:FIO:2046707.2046731,
 	title = {Forensic investigation of the OneSwarm anonymous filesharing system},
 	booktitle = {Proceedings of the 18th ACM conference on Computer and communications security},
 	series = {CCS {\textquoteright}11},
@@ -1374,7 +1375,7 @@ authenticate in future sessions. Faust uses no trusted third parties and is one 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/prusty.ccs_.2011.pdf},
 	author = {Prusty, Swagatika and Brian Neil Levine and Marc Liberatore}
 }
-@inproceedings {oakland11-formalizing,
+@conference {oakland11-formalizing,
 	title = {Formalizing Anonymous Blacklisting Systems},
 	booktitle = {Proceedings of the 2011 IEEE Symposium on Security and Privacy},
 	year = {2011},
@@ -1388,7 +1389,7 @@ outline a set of new performance requirements that anonymous blacklisting system
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Formalizing\%20Anonymous\%20Blacklisting\%20Systems.pdf},
 	author = {Ryan Henry and Ian Goldberg}
 }
-@inproceedings { grothoff2011syssec,
+@conference { grothoff2011syssec,
 	title = {The Free Secure Network Systems Group: Secure Peer-to-Peer Networking and Beyond},
 	booktitle = {SysSec 2011},
 	year = {2011},
@@ -1443,7 +1444,7 @@ To better understand the security and performance properties of a popular low la
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/kevin-thesis.pdf},
 	author = {Kevin Bauer}
 }
-@inproceedings {wk11-malice-vs-anon,
+@conference {wk11-malice-vs-anon,
 	title = {Malice versus AN.ON: Possible Risks of Missing Replay and Integrity Protection},
 	booktitle = {FC{\textquoteright}11 - Proceedings of Financial Cryptography and Data Security },
 	year = {2011},
@@ -1510,7 +1511,7 @@ emulation framework capable of running a large number of nodes using our full co
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Privacy_PPNA2011Das.pdf},
 	author = {Das, Kamalika and Bhaduri, Kanishka and Kargupta, Hillol}
 }
-@inproceedings {LEBLOND:2011:INRIA-00574178:1,
+@conference {LEBLOND:2011:INRIA-00574178:1,
 	title = {One Bad Apple Spoils the Bunch: Exploiting P2P Applications to Trace and Profile Tor Users},
 	booktitle = {4th USENIX Workshop on Large-Scale Exploits and Emergent Threats (LEET {\textquoteright}11)},
 	year = {2011},
@@ -1556,7 +1557,7 @@ We call our extension PEREA-Naughtiness. We prove the security of our constructi
 	www_section = {http://www.linuxjournaldigital.com/linuxjournal/201109$\#$pg68},
 	author = {Polot, Bartlomiej and Christian Grothoff}
 }
-@inproceedings {usenix11-pirtor,
+@conference {usenix11-pirtor,
 	title = {PIR-Tor: Scalable Anonymous Communication Using Private Information Retrieval},
 	booktitle = {Proceedings of the 20th USENIX Security Symposium},
 	year = {2011},
@@ -1568,7 +1569,7 @@ well understood and relatively easy to analyze, as opposed to peer-to-peer desig
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/USENIX\%20-\%20PIR-Tor.pdf},
 	author = {Prateek Mittal and Femi Olumofin and Carmela Troncoso and Borisov, Nikita and Ian Goldberg}
 }
-@inproceedings {DK11,
+@conference {DK11,
 	title = {Practical Privacy-Preserving Multiparty Linear Programming Based on Problem Transformation},
 	booktitle = {PASSAT{\textquoteright}11 - Proceedings of the Third IEEE International Conference on Information Privacy, Security, Risk and Trust},
 	year = {2011},
@@ -1618,7 +1619,7 @@ actual I2P network --- and discusses possible solutions},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/herrmann2011mt.pdf},
 	author = {Michael Herrmann}
 }
-@inproceedings { herrmann2010pet,
+@conference { herrmann2010pet,
 	title = {Privacy-Implications of Performance-Based Peer Selection by Onion-Routers: A Real-World Case Study using I2P},
 	booktitle = {Privacy Enhancing Technologies Symposium (PETS 2011)},
 	year = {2011},
@@ -1659,7 +1660,7 @@ private mechanism, will only gain a negligible advantage (up to a privacy parame
 	author = {Alaggan, Mohammad and Gambs, S{\'e}bastien and Kermarrec, Anne-Marie},
 	editor = {Fern{\`a}ndez Anta, Antonio and Lipari, Giuseppe and Roy, Matthieu}
 }
-@inproceedings {proximax11,
+@conference {proximax11,
 	title = {Proximax: Fighting Censorship With an Adaptive System for Distribution of Open Proxies},
 	booktitle = {FC{\textquoteright}11 - Proceedings of Financial Cryptography and Data Security },
 	year = {2011},
@@ -1670,13 +1671,13 @@ private mechanism, will only gain a negligible advantage (up to a privacy parame
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/FC\%2711\%20-\%20Proximax.pdf},
 	author = {Kirill Levchenko and Damon McCoy}
 }
-@inproceedings {DBLP:conf/dbsec/Kerschbaum11,
+@conference {DBLP:conf/dbsec/Kerschbaum11,
 	title = {Public-Key Encrypted Bloom Filters with Applications to Supply Chain Integrity},
 	year = {2011},
 	pages = {60{\textendash}75},
 	author = {Florian Kerschbaum}
 }
-@inproceedings {2011_10,
+@conference {2011_10,
 	title = {R5N : Randomized Recursive Routing for Restricted-Route Networks},
 	booktitle = {5th International Conference on Network and System Security (NSS 2011)},
 	year = {2011},
@@ -1690,7 +1691,7 @@ decentralized P2P networks operating in a restricted-route environment with mali
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/nss2011.pdf},
 	author = {Nathan S Evans and Christian Grothoff}
 }
-@inproceedings {2011_11,
+@conference {2011_11,
 	title = {On the Relation Between Differential Privacy and Quantitative Information Flow},
 	booktitle = {Proceedings of the 38th International Conference on Automata, Languages and Programming - Volume Part II},
 	year = {2011},
@@ -1719,7 +1720,7 @@ privacy and leakage, due to the graph symmetries induced by the adjacency relati
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Brumley\%20\%26\%20Tuveri\%20-\%20Timing\%20Attacks.pdf},
 	author = {Billy Bob Brumley and Nicola Tuveri}
 }
-@inproceedings {2011_12,
+@conference {2011_12,
 	title = {Scalability \& Paranoia in a Decentralized Social Network},
 	booktitle = {Federated Social Web},
 	year = {2011},
@@ -1762,7 +1763,7 @@ privacy and leakage, due to the graph symmetries induced by the adjacency relati
 	www_section = {http://www.sciencedirect.com/science/article/pii/S0377221710005552},
 	author = {Richard Pibernik and Yingying Zhang and Florian Kerschbaum and Axel Schr{\"o}pfer}
 }
-@inproceedings {conf/ndss/BackesMP11,
+@conference {conf/ndss/BackesMP11,
 	title = {A Security API for Distributed Social Networks},
 	booktitle = {NDSS{\textquoteright}11 - Proceedings of the Network and Distributed Security Symposium},
 	year = {2011},
@@ -1778,7 +1779,7 @@ We analyzed the security of our protocols by developing formal definitions of th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NDSS\%2711\%20-\%20Security\%20API\%20for\%20Distributed\%20Social\%20Networks.pdf},
 	author = {Michael Backes and Maffei, Matteo and Pecina, Kim}
 }
-@inproceedings {DBLP:conf/sigecom/GhoshR11,
+@conference {DBLP:conf/sigecom/GhoshR11,
 	title = {Selling Privacy at Auction},
 	year = {2011},
 	pages = {199{\textendash}208},
@@ -1802,7 +1803,7 @@ In this paper, we embrace the social aspects of the Web 2.0 by considering a nov
 	author = {Frey, Davide and J{\'e}gou, Arnaud and Kermarrec, Anne-Marie},
 	editor = {D{\'e}fago, Xavier and Petit, Franck and Villain, Vincent}
 }
-@inproceedings {ccs2011-stealthy,
+@conference {ccs2011-stealthy,
 	title = {Stealthy Traffic Analysis of Low-Latency Anonymous Communication Using Throughput Fingerprinting},
 	booktitle = {CCS{\textquoteright}11 - Proceedings of the 18th ACM conference on Computer and Communications Security},
 	year = {2011},
@@ -1818,7 +1819,7 @@ than 1.5\% in under 5 minutes. Our attacks are also more accurate and require fe
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/CCS\%2711\%20-\%20Throughput-fingerprinting.pdf},
 	author = {Prateek Mittal and Ahmed Khurshid and Joshua Juen and Matthew Caesar and Borisov, Nikita}
 }
-@inproceedings {2011_15,
+@conference {2011_15,
 	title = {SWIRL: A Scalable Watermark to Detect Correlated Network Flows},
 	booktitle = {NDSS{\textquoteright}11 - Proceedings of the Network and Distributed Security Symposium},
 	year = {2011},
@@ -1831,7 +1832,7 @@ attacks, marking each flow with a different pattern. SWIRL is robust to packet l
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NDSS11-2.pdf},
 	author = {Amir Houmansadr and Borisov, Nikita}
 }
-@inproceedings {usenix11-telex,
+@conference {usenix11-telex,
 	title = {Telex: Anticensorship in the Network Infrastructure},
 	booktitle = {Proceedings of the 20th USENIX Security Symposium},
 	year = {2011},
@@ -1843,7 +1844,7 @@ station but not to a censor. In addition, we use our tagging scheme to build a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Telex\%3A\%20Anticensorship\%20in\%20the\%20Network\%20Infrastructure.pdf},
 	author = {Eric Wustrow and Scott Wolchok and Ian Goldberg and J. Alex Halderman}
 }
-@inproceedings {ccs2011-trust,
+@conference {ccs2011-trust,
 	title = {Trust-based Anonymous Communication: Adversary Models and Routing Algorithms},
 	booktitle = {CCS{\textquoteright}11 - Proceedings of the 18th ACM conference on Computer and Communications Security},
 	year = {2011},
@@ -1856,7 +1857,7 @@ station but not to a censor. In addition, we use our tagging scheme to build a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/CCS\%2711\%20-\%20Trust-based\%20Anonymous\%20Communication1.pdf},
 	author = {Aaron Johnson and Paul Syverson and Roger Dingledine and Nick Mathewson}
 }
-@inproceedings {Yang:2011:USN:2068816.2068841,
+@conference {Yang:2011:USN:2068816.2068841,
 	title = {Uncovering social network sybils in the wild},
 	booktitle = {Proceedings of the 2011 ACM SIGCOMM conference on Internet measurement conference},
 	series = {IMC {\textquoteright}11},
@@ -1874,7 +1875,7 @@ station but not to a censor. In addition, we use our tagging scheme to build a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGCOMM\%2711\%20-\%20Uncovering\%20social\%20network\%20sybils.pdf},
 	author = {Yang, Zhi and Wilson, Christo and Wang, Xiao and Gao, Tingting and Ben Y. Zhao and Dai, Yafei}
 }
-@inproceedings {wpes11-panchenko,
+@conference {wpes11-panchenko,
 	title = {Website Fingerprinting in Onion Routing Based Anonymization Networks},
 	booktitle = {WPES{\textquoteright}11 - Proceedings of the Workshop on Privacy in the Electronic Society},
 	year = {2011},
@@ -1890,7 +1891,7 @@ JAP, the detection rate decreases from 80\% to 4\% and for Tor it drops from 55\
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WPES\%2711\%20-\%20Fingerprinting.pdf},
 	author = {Andriy Panchenko and Lukas Niessen and Andreas Zinnen and Thomas Engel}
 }
-@inproceedings {Eppstein:2011:WDE:2018436.2018462,
+@conference {Eppstein:2011:WDE:2018436.2018462,
 	title = {What{\textquoteright}s the difference?: efficient set reconciliation without prior context},
 	booktitle = {Proceedings of the ACM SIGCOMM 2011 conference},
 	series = {SIGCOMM {\textquoteright}11},
@@ -1918,7 +1919,7 @@ JAP, the detection rate decreases from 80\% to 4\% and for Tor it drops from 55\
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/CoRR\%20-\%20X-Vine.pdf},
 	author = {Prateek Mittal and Matthew Caesar and Borisov, Nikita}
 }
-@inproceedings {2011_16,
+@conference {2011_16,
 	title = {"You Might Also Like:" Privacy Risks of Collaborative Filtering},
 	booktitle = {Security and Privacy (SP), 2011 IEEE Symposium on},
 	year = {2011},
@@ -1941,7 +1942,7 @@ In this paper, we develop algorithms which take a moderate amount of auxiliary i
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Polot2010.pdf},
 	author = {Polot, Bartlomiej}
 }
-@inproceedings {2010_0,
+@conference {2010_0,
 	title = {Application of Random Walks to Decentralized Recommender Systems},
 	booktitle = {14th International Conference on Principles of Distributed Systems},
 	year = {2010},
@@ -1963,7 +1964,7 @@ In this paper, we develop algorithms which take a moderate amount of auxiliary i
 	www_section = {http://www.reference-global.com/doi/abs/10.1515/piko.2010.003},
 	author = {H{\"u}bsch, Christian and Mayer, Christoph P. and Oliver Waldhorst}
 }
-@inproceedings {2010_2,
+@conference {2010_2,
 	title = {Autonomous NAT Traversal},
 	booktitle = {10th IEEE International Conference on Peer-to-Peer Computing (IEEE P2P{\textquoteright}10)},
 	year = {2010},
@@ -1993,7 +1994,7 @@ method for establishing connections to peers behind NAT.  The proposed method fo
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Journal\%20of\%20AI\%20-\%20BnB-ADOPT.pdf},
 	author = {Yeoh, William and Felner, Ariel and Koenig, Sven}
 }
-@inproceedings {incentives-fc10,
+@conference {incentives-fc10,
 	title = {Building Incentives into Tor},
 	booktitle = {Proceedings of Financial Cryptography (FC {\textquoteright}10)},
 	year = {2010},
@@ -2004,7 +2005,7 @@ method for establishing connections to peers behind NAT.  The proposed method fo
 	author = {Tsuen-Wan {\textquoteleft}{\textquoteleft}Johnny{\textquoteright}{\textquoteright} Ngan and Roger Dingledine and Dan S. Wallach},
 	editor = {Radu Sion}
 }
-@inproceedings {1827424,
+@conference {1827424,
 	title = {Cordies: expressive event correlation in distributed systems},
 	booktitle = {DEBS {\textquoteright}10: Proceedings of the Fourth ACM International Conference on Distributed Event-Based Systems},
 	year = {2010},
@@ -2072,7 +2073,7 @@ To evaluate the platform{\textquoteright}s suitability for application developme
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/twr-dp2pwa.pdf},
 	author = {Toni Ruottu}
 }
-@inproceedings {continual,
+@conference {continual,
 	title = {Differential Privacy Under Continual Observation},
 	booktitle = {Proceedings of the 42nd ACM Symposium on Theory of Computing (STOC{\textquoteright}10)},
 	year = {2010},
@@ -2117,7 +2118,7 @@ To evaluate the platform{\textquoteright}s suitability for application developme
 	author = {Danezis, George and Claudia Diaz and Troncoso, Carmela and Laurie, Ben},
 	editor = {Atallah, MikhailJ. and Hopper, NicholasJ.}
 }
-@inproceedings {2010_6,
+@conference {2010_6,
 	title = {Efficient DHT attack mitigation through peers{\textquoteright} ID distribution },
 	booktitle = {HOTP2P{\textquoteright}10 - International Workshop on Hot Topics in Peer-to-Peer Systems},
 	year = {2010},
@@ -2130,7 +2131,7 @@ method detects the most efficient attacks with a very small false-negative rate,
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/HotP2P\%2710\%20-\%20KAD\%20DHT\%20attack\%20mitigation.pdf},
 	author = {Cholez, Thibault and Chrisment, Isabelle and Festor, Olivier}
 }
-@inproceedings {Koch:2010:EPL:1827418.1827440,
+@conference {Koch:2010:EPL:1827418.1827440,
 	title = {Event processing for large-scale distributed games},
 	booktitle = {Proceedings of the Fourth ACM International Conference on Distributed Event-Based Systems},
 	series = {DEBS {\textquoteright}10},
@@ -2146,7 +2147,7 @@ method detects the most efficient attacks with a very small false-negative rate,
 	www_section = {http://doi.acm.org/10.1145/1827418.1827440},
 	author = {Gerald G. Koch and Tariq, Muhammad Adnan and Boris Koldehofe and Kurt Rothermel}
 }
-@inproceedings {DBLP:conf/middleware/BertierFGKL10,
+@conference {DBLP:conf/middleware/BertierFGKL10,
 	title = {The Gossple Anonymous Social Network},
 	booktitle = { Proceedings of the ACM/IFIP/USENIX 11th International Conference on Middleware },
 	year = {2010},
@@ -2171,7 +2172,7 @@ method detects the most efficient attacks with a very small false-negative rate,
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Duminuco\%20\%26\%20Biersack\%20-\%20Hierarchical\%20Codes.pdf},
 	author = {Alessandro Duminuco and E W Biersack}
 }
-@inproceedings {2010_7,
+@conference {2010_7,
 	title = {How Accurately Can One{\textquoteright}s Interests Be Inferred from Friends?},
 	booktitle = {Proceedings of the 19th International Conference on World Wide Web},
 	year = {2010},
@@ -2203,7 +2204,7 @@ outperforms methods that use only one type of social content. Second, we present
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/tissec-latency-leak.pdf},
 	author = {Nicholas J. Hopper and Eugene Y. Vasserman and Eric Chan-Tin}
 }
-@inproceedings {DBLP:conf/tridentcom/NguyenRKFMB10,
+@conference {DBLP:conf/tridentcom/NguyenRKFMB10,
 	title = {How to Build Complex, Large-Scale Emulated Networks},
 	booktitle = {TRIDENTCOM},
 	year = {2010},
@@ -2236,7 +2237,7 @@ outperforms methods that use only one type of social content. Second, we present
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Malugo.pdf},
 	author = {Chan, Yu-Wei and Ho, Tsung-Hsuan and Shih, Po-Chi and Chung, Yeh-Ching}
 }
-@inproceedings {DBLP:conf/tridentcom/AlbrechtH10,
+@conference {DBLP:conf/tridentcom/AlbrechtH10,
 	title = {Managing Distributed Applications Using Gush},
 	booktitle = {TRIDENTCOM},
 	year = {2010},
@@ -2245,7 +2246,7 @@ outperforms methods that use only one type of social content. Second, we present
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/gush.pdf},
 	author = {Jeannie R. Albrecht and Danny Yuxing Huang}
 }
-@inproceedings {DBLP:conf/tridentcom/PeralaPML10,
+@conference {DBLP:conf/tridentcom/PeralaPML10,
 	title = {A Novel Testbed for P2P Networks},
 	booktitle = {TRIDENTCOM},
 	year = {2010},
@@ -2254,7 +2255,7 @@ outperforms methods that use only one type of social content. Second, we present
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/A\%20Novel\%20Testbed\%20for\%20P2P\%20Networks.pdf},
 	author = {Pekka H. J. Per{\"a}l{\"a} and Jori P. Paananen and Milton Mukhopadhyay and Jukka-Pekka Laulajainen}
 }
-@inproceedings {Locher:2010:PKN:2018057.2018085,
+@conference {Locher:2010:PKN:2018057.2018085,
 	title = {Poisoning the Kad network},
 	booktitle = {ICDCN{\textquoteright}10 - Proceedings of the 11th International Conference on Distributed Computing and Networking},
 	series = {ICDCN{\textquoteright}10},
@@ -2272,7 +2273,7 @@ outperforms methods that use only one type of social content. Second, we present
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ICDCN\%2710\%20-\%20Poisoning\%20the\%20Kad\%20Network.pdf},
 	author = {Thomas Locher and Mysicka, David and Stefan Schmid and Roger Wattenhofer}
 }
-@inproceedings {FessiIPTComm2010,
+@conference {FessiIPTComm2010,
 	title = {Pr2-P2PSIP: Privacy Preserving P2P Signaling for VoIP and IM},
 	booktitle = {Principles, Systems and Applications of IP Telecommunications (IPTComm), Munich},
 	year = {2010},
@@ -2314,7 +2315,7 @@ outperforms methods that use only one type of social content. Second, we present
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/privacy_preserving_similarity.pdf},
 	author = {Pang, Hweehwa and Shen, Jialie and Krishnan, Ramayya}
 }
-@inproceedings {2010_10,
+@conference {2010_10,
 	title = {Private Record Matching Using Differential Privacy},
 	booktitle = {Proceedings of the 13th International Conference on Extending Database Technology},
 	year = {2010},
@@ -2329,7 +2330,7 @@ outperforms methods that use only one type of social content. Second, we present
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/PrivateRecordMatching2010Inan.pdf},
 	author = {Inan, Ali and Kantarcioglu, Murat and Ghinita, Gabriel and Bertino, Elisa}
 }
-@inproceedings {1827425,
+@conference {1827425,
 	title = {Providing basic security mechanisms in broker-less publish/subscribe systems},
 	booktitle = {DEBS {\textquoteright}10: Proceedings of the Fourth ACM International Conference on Distributed Event-Based Systems},
 	year = {2010},
@@ -2362,7 +2363,7 @@ outperforms methods that use only one type of social content. Second, we present
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/p131-v40n1n-huebschA.pdf},
 	author = {H{\"u}bsch, Christian and Mayer, Christoph P. and Sebastian Mies and Roland Bless and Oliver Waldhorst and Martina Zitterbart}
 }
-@inproceedings {2010_11,
+@conference {2010_11,
 	title = {On Runtime Adaptation of Application-Layer Multicast Protocol Parameters},
 	booktitle = {Proceedings of Networked Services and Applications {\textendash} Engineering, Control and Management (EUNICE)},
 	series = {Lecture Notes in Computer Science},
@@ -2374,7 +2375,7 @@ outperforms methods that use only one type of social content. Second, we present
 	www_section = {http://www.tm.uni-karlsruhe.de/itm/WebMan/view.php?view=publikationen_detail\&id=389\&lang=en},
 	author = {H{\"u}bsch, Christian and Mayer, Christoph P. and Oliver Waldhorst}
 }
-@inproceedings {2010_12,
+@conference {2010_12,
 	title = {Scalable Application-Layer Multicast Simulations with OverSim},
 	booktitle = {7th Annual IEEE Consumer Communiations \& Networking Conference},
 	year = {2010},
@@ -2382,7 +2383,7 @@ outperforms methods that use only one type of social content. Second, we present
 	keywords = {multicast, NICE, OverSim, Scribe},
 	author = {Stephan Krause and H{\"u}bsch, Christian}
 }
-@inproceedings {Burkhart:2010:SPA:1929820.1929840,
+@conference {Burkhart:2010:SPA:1929820.1929840,
 	title = {SEPIA: privacy-preserving aggregation of multi-domain network events and statistics},
 	booktitle = {Proceedings of the 19th USENIX conference on Security},
 	series = {USENIX Security{\textquoteright}10},
@@ -2399,13 +2400,13 @@ outperforms methods that use only one type of social content. Second, we present
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/USENIX\%20Security\%2710\%20-\%20SEPIA.pdf},
 	author = {Burkhart, Martin and Strasser, Mario and Many, Dilip and Dimitropoulos, Xenofontas}
 }
-@inproceedings {Marks2010a,
+@conference {Marks2010a,
 	title = {Unleashing Tor, BitTorrent \& Co.: How to Relieve TCP Deficiencies in Overlays},
 	booktitle = {LCN 2010: Proceedings of the 35th IEEE Conference on Local Computer Networks},
 	year = {2010},
 	author = {Daniel Marks and Florian Tschorsch and Bjoern Scheuermann}
 }
-@inproceedings {2010_13,
+@conference {2010_13,
 	title = {User-perceived Performance of the NICE Application Layer Multicast Protocol in Large and Highly Dynamic Groups},
 	booktitle = {Proceedings of 15th International GI/ITG Conference on "Measurement, Modelling and Evaluation of Computing Systems"},
 	year = {2010},
@@ -2423,7 +2424,7 @@ This work was partially funded as part of the Spontaneous Virtual Networks (SpoV
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/User-Perceived\%20Performance\%20of\%20the\%20NICE\%20Application\%20Layer\%20Multicast\%20Protocol\%20in\%20Large\%20and\%20Highly\%20Dynamic\%20Groups_1.pdf},
 	author = {H{\"u}bsch, Christian and Mayer, Christoph P. and Oliver Waldhorst}
 }
-@inproceedings {2010_14,
+@conference {2010_14,
 	title = {Using Legacy Applications in Future Heterogeneous Networks with ariba},
 	booktitle = {Proceedings of IEEE INFOCOM},
 	year = {2010},
@@ -2431,7 +2432,7 @@ This work was partially funded as part of the Spontaneous Virtual Networks (SpoV
 	address = {San Diego, CA, USA},
 	author = {H{\"u}bsch, Christian and Mayer, Christoph P. and Sebastian Mies and Roland Bless and Oliver Waldhorst and Martina Zitterbart}
 }
-@inproceedings {DBLP:conf/ccs/EdmanS09,
+@conference {DBLP:conf/ccs/EdmanS09,
 	title = {AS-awareness in Tor path selection},
 	booktitle = {Proceedings of the 2009 ACM Conference on Computer and Communications Security, CCS 2009, Chicago, Illinois, USA, November 9-13, 2009},
 	year = {2009},
@@ -2449,7 +2450,7 @@ Five years ago a previous study examined the AS-level threat against client and 
 	author = {Matthew Edman and Paul Syverson},
 	editor = {Ehab Al-Shaer and Somesh Jha and Angelos D. Keromytis}
 }
-@inproceedings {Attrapadung:2009:AES:1696791.1696811,
+@conference {Attrapadung:2009:AES:1696791.1696811,
 	title = {Attribute-Based Encryption Supporting Direct/Indirect Revocation Modes},
 	booktitle = {Proceedings of the 12th IMA International Conference on Cryptography and Coding},
 	series = {Cryptography and Coding {\textquoteright}09},
@@ -2465,7 +2466,7 @@ Five years ago a previous study examined the AS-level threat against client and 
 	www_section = {http://dx.doi.org/10.1007/978-3-642-10868-6_17},
 	author = {Attrapadung, Nuttapong and Imai, Hideki}
 }
-@inproceedings {DBLP:conf/ccs/TroncosoD09,
+@conference {DBLP:conf/ccs/TroncosoD09,
 	title = {The bayesian traffic analysis of mix networks},
 	booktitle = {Proceedings of the 2009 ACM Conference on Computer and Communications Security, CCS 2009, Chicago, Illinois, USA, November 9-13, 2009},
 	year = {2009},
@@ -2481,7 +2482,7 @@ Five years ago a previous study examined the AS-level threat against client and 
 	author = {Carmela Troncoso and George Danezis},
 	editor = {Ehab Al-Shaer and Somesh Jha and Angelos D. Keromytis}
 }
-@inproceedings {1659021,
+@conference {1659021,
 	title = {Bloom filters and overlays for routing in pocket switched networks},
 	booktitle = {Co-Next Student Workshop {\textquoteright}09: Proceedings of the 5th international student workshop on Emerging networking experiments and technologies},
 	year = {2009},
@@ -2497,7 +2498,7 @@ Five years ago a previous study examined the AS-level threat against client and 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/conext09-phdworkshop-cameraready.pdf},
 	author = {Mayer, Christoph P.}
 }
-@inproceedings {Knoll:2009:BPS:1590968.1591829,
+@conference {Knoll:2009:BPS:1590968.1591829,
 	title = {Bootstrapping Peer-to-Peer Systems Using IRC},
 	booktitle = {WETICE{\textquoteright}09 - Proceedings of the 18th IEEE International Workshops on Enabling Technologies: Infrastructures for Collaborative Enterprises},
 	series = {WETICE {\textquoteright}09},
@@ -2523,19 +2524,19 @@ Five years ago a previous study examined the AS-level threat against client and 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Brahms-Comnet-Mar09.pdf , https://gnunet.org/git/bibliography.git/tree/docs/Brahms-rps-mar09.pdf},
 	author = {Edward Bortnikov and Maxim Gurevich and Idit Keidar and Gabriel Kliot and Alexander Shraer}
 }
-@inproceedings {DBLP:conf/sss/Kermarrec09,
+@conference {DBLP:conf/sss/Kermarrec09,
 	title = {Challenges in Personalizing and Decentralizing the Web: An Overview of GOSSPLE},
 	year = {2009},
 	pages = {1{\textendash}16},
 	author = {Anne-Marie Kermarrec}
 }
-@inproceedings {2009_1,
+@conference {2009_1,
 	title = {CLIO/UNISONO: practical distributed and overlay- wide network measurement},
 	year = {2009},
 	abstract = {Building on previous work, we present an early version of our CLIO/UNISONO framework for distributed network measurements. CLIO/UNISONO is a generic measurement framework specifically aimed at overlays that need measurements for optimization purposes. In this talk, we briefly introduce the most important concepts and then focus on some more advanced mechanisms like measurements across connectivity domains and remote orders},
 	author = {Ralph Holz and Dirk Haage}
 }
-@inproceedings {2009_2,
+@conference {2009_2,
 	title = {A Collusion-Resistant Distributed Scalar Product Protocol with Application to Privacy-Preserving Computation of Trust},
 	booktitle = {Network Computing and Applications, 2009. NCA 2009. Eighth IEEE International Symposium on},
 	year = {2009},
@@ -2555,7 +2556,7 @@ Five years ago a previous study examined the AS-level threat against client and 
 	pages = {131{\textendash}139},
 	author = {Ryo Nojima and Youki Kadobayashi}
 }
-@inproceedings {DBLP:conf/sp/NarayananS09,
+@conference {DBLP:conf/sp/NarayananS09,
 	title = {De-anonymizing Social Networks},
 	booktitle = {Proceedings of the 30th IEEE Symposium on Security and Privacy (S\&P 2009), 17-20 May, Oakland, California, USA},
 	year = {2009},
@@ -2590,7 +2591,7 @@ Our de-anonymization algorithm is based purely on the network topology, does not
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Journal\%20of\%20Parallel\%20\%26\%20Distributed\%20Computing\%20-\%20Deleting\%20files\%20in\%20the\%20Celeste\%20p2p\%20storage\%20systems.pdf},
 	author = {Badishi, Gal and Caronni, Germano and Keidar, Idit and Rom, Raphael and Scott, Glenn}
 }
-@inproceedings {2009_3,
+@conference {2009_3,
 	title = {Differentially Private Recommender Systems: Building Privacy into the Netflix Prize Contenders},
 	booktitle = {Proceedings of the 15th ACM SIGKDD International Conference on Knowledge Discovery and Data Mining},
 	year = {2009},
@@ -2611,7 +2612,7 @@ We measure the empirical trade-off between accuracy and privacy in these adaptat
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/PrivateRecommender2009McSherry.pdf},
 	author = {McSherry, Frank and Mironov, Ilya}
 }
-@inproceedings {2009_4,
+@conference {2009_4,
 	title = {Enhancing Application-Layer Multicast Solutions by Wireless Underlay Support},
 	booktitle = {Kommunikation in Verteilten Systemen (KiVS) 2009, Kassel, Germany},
 	year = {2009},
@@ -2630,7 +2631,7 @@ We measure the empirical trade-off between accuracy and privacy in these adaptat
 	address = {Munich, Germany},
 	author = {Markus Bucher}
 }
-@inproceedings {Cholez:2009:ESA:1574663.1574671,
+@conference {Cholez:2009:ESA:1574663.1574671,
 	title = {Evaluation of Sybil Attacks Protection Schemes in KAD},
 	booktitle = {AIMS{\textquoteright}09 - Proceedings of the 3rd International Conference on Autonomous Infrastructure, Management and Security: Scalability of Networks and Services},
 	series = {Lecture Notes in Computer Science},
@@ -2670,7 +2671,7 @@ We measure the empirical trade-off between accuracy and privacy in these adaptat
 	author = {Bogetoft, Peter and Christensen, Dan Lund and Damg{\'a}rd, Ivan and Geisler, Martin and Jakobsen, Thomas and Kr{\o}igaard, Mikkel and Nielsen, Janus Dam and Nielsen, Jesper Buus and Nielsen, Kurt and Pagter, Jakob and Schwartzbach, Michael and Toft, Tomas},
 	editor = {Roger Dingledine and Philippe Golle}
 }
-@inproceedings {wpes09-dht-attack,
+@conference {wpes09-dht-attack,
 	title = {Hashing it out in public: Common failure modes of DHT-based anonymity schemes},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2009)},
 	year = {2009},
@@ -2685,7 +2686,7 @@ We measure the empirical trade-off between accuracy and privacy in these adaptat
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/wpes09-dht-attack.pdf},
 	author = {Andrew Tran and Nicholas J. Hopper and Yongdae Kim}
 }
-@inproceedings {1656984,
+@conference {1656984,
 	title = {Heterogeneous gossip},
 	booktitle = {Middleware {\textquoteright}09: Proceedings of the 10th ACM/IFIP/USENIX International Conference on Middleware},
 	year = {2009},
@@ -2714,7 +2715,7 @@ This paper presents HEAP, HEterogeneity-Aware gossip Protocol, where nodes dynam
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Long\%20Term\%20Study\%20of\%20Peer\%20Behavior\%20in\%20the\%20kad\%20DHT.pdf},
 	author = {Steiner, Moritz and En-Najjary, Taoufik and E W Biersack}
 }
-@inproceedings {1551621,
+@conference {1551621,
 	title = {Maintaining reference graphs of globally accessible objects in fully decentralized distributed systems},
 	booktitle = {HPDC {\textquoteright}09: Proceedings of the 18th ACM international symposium on High performance distributed computing},
 	year = {2009},
@@ -2729,7 +2730,7 @@ This paper presents HEAP, HEterogeneity-Aware gossip Protocol, where nodes dynam
 	www_section = {http://portal.acm.org/citation.cfm?id=1551609.1551621$\#$},
 	author = {Bjoern Saballus and Thomas Fuhrmann}
 }
-@inproceedings { moscibroda:on,
+@conference { moscibroda:on,
 	title = {On Mechanism Design without Payments for Throughput Maximization},
 	booktitle = {INFOCOM{\textquoteright}09. Proceedings of the 28th IEEE International Conference on Computer Communications},
 	year = {2009},
@@ -2745,7 +2746,7 @@ This paper presents HEAP, HEterogeneity-Aware gossip Protocol, where nodes dynam
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOMM\%2709\%20-\%20Mechanism\%20design\%20without\%20payments.pdf},
 	author = {Thomas Moscibroda and Stefan Schmid}
 }
-@inproceedings {DBLP:conf/ccs/VassermanJTHK09,
+@conference {DBLP:conf/ccs/VassermanJTHK09,
 	title = {Membership-concealing overlay networks},
 	booktitle = {Proceedings of the 2009 ACM Conference on Computer and Communications Security, CCS 2009, Chicago, Illinois, USA, November 9-13, 2009},
 	year = {2009},
@@ -2830,7 +2831,7 @@ In this paper we establish the optimal trade-off between the round complexity an
 	author = {Moran, Tal and Naor, Moni and Segev, Gil},
 	editor = {Reingold, Omer}
 }
-@inproceedings {2009_9,
+@conference {2009_9,
 	title = {Optimization of distributed services with UNISONO},
 	booktitle = {GI/ITG KuVS Fachgespr{\"a}ch NGN Service Delivery Platforms \& Service Overlay Networks},
 	year = {2009},
@@ -2839,7 +2840,7 @@ In this paper we establish the optimal trade-off between the round complexity an
 	www_section = {http://www.net.in.tum.de/de/mitarbeiter/holz/},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/unisono_kuvs-ngn.pdf}
 }
-@inproceedings {2009_10,
+@conference {2009_10,
 	title = {Peer Profiling and Selection in the I2P Anonymous Network},
 	booktitle = {PET-CON 2009.1},
 	year = {2009},
@@ -2849,7 +2850,7 @@ In this paper we establish the optimal trade-off between the round complexity an
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/I2P-PET-CON-2009.1.pdf},
 	author = {Lars Schimmer}
 }
-@inproceedings {p2p09-peersim,
+@conference {p2p09-peersim,
 	title = {PeerSim: A Scalable P2P Simulator},
 	booktitle = {P2P{\textquoteright}09 - Proceedings of the 9th International Conference on Peer-to-Peer},
 	year = {2009},
@@ -2864,7 +2865,7 @@ In this paper we establish the optimal trade-off between the round complexity an
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/P2P\%2709\%20-\%20PeerSim.pdf},
 	author = {Alberto Montresor and M{\'a}rk Jelasity and Gian Paolo Jesi and Spyros Voulgaris}
 }
-@inproceedings {Plank:2009:PEE:1525908.1525927,
+@conference {Plank:2009:PEE:1525908.1525927,
 	title = {A performance evaluation and examination of open-source erasure coding libraries for storage},
 	booktitle = {FAST{\textquoteright}09 - Proccedings of the 7th Conference on File and Storage Technologies},
 	year = {2009},
@@ -2879,7 +2880,7 @@ In this paper we establish the optimal trade-off between the round complexity an
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/FAST\%2709\%20-\%20Open-source\%20erasure\%20coding\%20libraries\%20for\%20storage.pdf},
 	author = {James S. Plank and Luo, Jianqiang and Schuman, Catherine D. and Lihao Xu and Wilcox-O{\textquoteright}Hearn, Zooko}
 }
-@inproceedings {5328076,
+@conference {5328076,
 	title = {Performance Evaluation of On-Demand Multipath Distance Vector Routing Protocol under Different Traffic Models},
 	booktitle = {International Conference on Advances in Recent Technologies in Communication and Computing, 2009. ARTCom {\textquoteright}09},
 	year = {2009},
@@ -2891,7 +2892,7 @@ In this paper we establish the optimal trade-off between the round complexity an
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/multipath-dv-perf.pdf},
 	author = {Malarkodi, B. and Rakesh, P. and Venkataramani, B.}
 }
-@inproceedings { evans2009tor,
+@conference { evans2009tor,
 	title = {A Practical Congestion Attack on Tor Using Long Paths},
 	booktitle = {18th USENIX Security Symposium},
 	year = {2009},
@@ -2909,7 +2910,7 @@ We then strengthen the original congestion attack by combining it with a novel b
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/tor.pdf},
 	author = {Nathan S Evans and Roger Dingledine and Christian Grothoff}
 }
-@inproceedings {Duminuco:2009:PSR:1584339.1584602,
+@conference {Duminuco:2009:PSR:1584339.1584602,
 	title = {A Practical Study of Regenerating Codes for Peer-to-Peer Backup Systems},
 	booktitle = {ICDCS{\textquoteright}09 - Proceedings of the 29th IEEE International Conference on Distributed Computing Systems},
 	series = {ICDCS {\textquoteright}09},
@@ -2927,7 +2928,7 @@ We then strengthen the original congestion attack by combining it with a novel b
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ICDCS\%2709\%20-\%20Regenerating\%20codes\%20for\%20p2p\%20backup\%20systems.pdf},
 	author = {Alessandro Duminuco and E W Biersack}
 }
-@inproceedings {2009_11,
+@conference {2009_11,
 	title = {Privacy Integrated Queries: An Extensible Platform for Privacy-preserving Data Analysis},
 	booktitle = {Proceedings of the 2009 ACM SIGMOD International Conference on Management of Data},
 	year = {2009},
@@ -2942,7 +2943,7 @@ We then strengthen the original congestion attack by combining it with a novel b
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/PrivacyIntergratedQueries2009McSherry.pdf},
 	author = {McSherry, Frank D.}
 }
-@inproceedings {Tariqetal:2009:ProbLatencyBounds,
+@conference {Tariqetal:2009:ProbLatencyBounds,
 	title = {Providing Probabilistic Latency Bounds for Dynamic Publish/Subscribe Systems},
 	booktitle = {Kommunikation in Verteilten Systemen (KiVS)},
 	year = {2009},
@@ -2957,7 +2958,7 @@ We then strengthen the original congestion attack by combining it with a novel b
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/QoS_pubsub.pdf},
 	author = {Tariq, Muhammad Adnan and Boris Koldehofe and Gerald G. Koch and Kurt Rothermel}
 }
-@inproceedings {conf/infocom/WuLR09,
+@conference {conf/infocom/WuLR09,
 	title = {Queuing Network Models for Multi-Channel P2P Live Streaming Systems},
 	booktitle = {INFOCOM{\textquoteright}09. Proceedings of the 28th IEEE International Conference on Computer Communications},
 	year = {2009},
@@ -2973,7 +2974,7 @@ We then strengthen the original congestion attack by combining it with a novel b
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOM\%2709\%20-\%20Queusing\%20models\%20for\%20p2p\%20streaming\%20systems.pdf},
 	author = {Wu, Di and Yong Liu and Keith W. Ross}
 }
-@inproceedings {wpes09-bridge-attack,
+@conference {wpes09-bridge-attack,
 	title = {On the risks of serving whenever you surf: Vulnerabilities in Tor{\textquoteright}s blocking resistance design},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2009)},
 	year = {2009},
@@ -3002,7 +3003,7 @@ We then strengthen the original congestion attack by combining it with a novel b
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/OPODIS-116b.pdf},
 	author = {Awerbuch, Baruch and Scheideler, Christian}
 }
-@inproceedings {1658999,
+@conference {1658999,
 	title = {Scalable landmark flooding: a scalable routing protocol for WSNs},
 	booktitle = {Co-Next Student Workshop {\textquoteright}09: Proceedings of the 5th international student workshop on Emerging networking experiments and technologies},
 	year = {2009},
@@ -3020,7 +3021,7 @@ In this paper, we propose Scalable Landmark Flooding (SLF), a new routing protoc
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/di09slf.pdf},
 	author = {Di, Pengfei and Thomas Fuhrmann}
 }
-@inproceedings {ccs09-torsk,
+@conference {ccs09-torsk,
 	title = {Scalable onion routing with Torsk},
 	booktitle = {Proceedings of CCS 2009},
 	year = {2009},
@@ -3037,7 +3038,7 @@ Unlike previous proposals for P2P anonymity schemes, Torsk does not require all 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ccs09-torsk.pdf},
 	author = {Jon McLachlan and Andrew Tran and Nicholas J. Hopper and Yongdae Kim}
 }
-@inproceedings {2009_13,
+@conference {2009_13,
 	title = {Security and Privacy Challenges in the Internet of Things},
 	booktitle = {Proceedings of KiVS Workshop on Global Sensor Networks (GSN09)},
 	year = {2009},
@@ -3062,7 +3063,7 @@ Unlike previous proposals for P2P anonymity schemes, Torsk does not require all 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fulltext3.pdf},
 	author = {Yaser Houri and Manfred Jobmann and Thomas Fuhrmann}
 }
-@inproceedings {2009_15,
+@conference {2009_15,
 	title = {ShadowWalker: Peer-to-peer Anonymous Communication Using Redundant Structured Topologies},
 	booktitle = {Proceedings of the 16th ACM Conference on Computer and Communications Security},
 	year = {2009},
@@ -3127,7 +3128,7 @@ Finally, it is argued that any future development in distributed constraint sati
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Thesis\%20-\%20P.Harvey.pdf},
 	author = {Peter Harvey}
 }
-@inproceedings {DBLP:conf/sp/DanezisG09,
+@conference {DBLP:conf/sp/DanezisG09,
 	title = {Sphinx: A Compact and Provably Secure Mix Format},
 	booktitle = {Proceedings of the 30th IEEE Symposium on Security and Privacy (S\&P 2009), 17-20 May, Oakland, California, USA},
 	year = {2009},
@@ -3142,7 +3143,7 @@ Finally, it is argued that any future development in distributed constraint sati
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/DanezisG09.pdf},
 	author = {George Danezis and Ian Goldberg}
 }
-@inproceedings {2009_18,
+@conference {2009_18,
 	title = {SPINE : Adaptive Publish/Subscribe for Wireless Mesh Networks},
 	booktitle = {Proc of the 8th IEEE International Conference on Innovative Internet Community Systems (I2CS 2008)},
 	year = {2009},
@@ -3163,7 +3164,7 @@ Finally, it is argued that any future development in distributed constraint sati
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/TM-2009-3.pdf},
 	author = {Ralph Holz and Mayer, Christoph P. and Sebastian Mies and Heiko Niedermayer and Tariq, Muhammad Adnan}
 }
-@inproceedings {DBLP:conf/infocom/LandaGCMR09,
+@conference {DBLP:conf/infocom/LandaGCMR09,
 	title = {A Sybilproof Indirect Reciprocity Mechanism for Peer-to-Peer Networks},
 	booktitle = {INFOCOM 2009. The 28th IEEE International Conference on Computer Communications},
 	year = {2009},
@@ -3178,7 +3179,7 @@ Finally, it is argued that any future development in distributed constraint sati
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOM\%2709\%20-\%20Sybilproof\%20Indirect\%20Reprocity\%20Mechanism\%20for\%20P2P\%20Networks\%20.pdf},
 	author = {Raul Leonardo Landa Gamiochipi and David Griffin and Richard G. Clegg and Eleni Mykoniati and Miguel Rio}
 }
-@inproceedings {Resnick:2009:STT:1566374.1566423,
+@conference {Resnick:2009:STT:1566374.1566423,
 	title = {Sybilproof Transitive Trust Protocols},
 	booktitle = {EC{\textquoteright}09. Proceedings of the 10th ACM Conference on Electronic commerce},
 	series = {EC {\textquoteright}09},
@@ -3207,7 +3208,7 @@ Finally, it is argued that any future development in distributed constraint sati
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Douglas-thesis.pdf},
 	author = {Douglas Kelly}
 }
-@inproceedings {2009_20,
+@conference {2009_20,
 	title = {Towards End-to-End Connectivity for Overlays across Heterogeneous Networks},
 	booktitle = {Proc. Int. Workshop on the Network of the Future (Future-Net 2009), co-located with IEEE Int. Conf. on Communications (ICC 2009)},
 	year = {2009},
@@ -3218,7 +3219,7 @@ Finally, it is argued that any future development in distributed constraint sati
 	www_section = {http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=5207975},
 	author = {Sebastian Mies and Oliver Waldhorst and Hans Wippel}
 }
-@inproceedings {2009_21,
+@conference {2009_21,
 	title = {Traffic Engineering vs. Content Distribution: A Game Theoretic Perspective},
 	booktitle = {INFOCOM 2009. The 28th IEEE International Conference on Computer Communications},
 	year = {2009},
@@ -3234,7 +3235,7 @@ Finally, it is argued that any future development in distributed constraint sati
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOM\%2709\%20-\%20Traffic\%20Engineering\%20vs.\%20Content\%20Distribution.PDF},
 	author = {Dominic DiPalantino and Ramesh Johari}
 }
-@inproceedings {morphing09,
+@conference {morphing09,
 	title = {Traffic Morphing: An efficient defense against statistical traffic analysis},
 	booktitle = {Proceedings of the Network and Distributed Security Symposium - {NDSS} {\textquoteright}09},
 	year = {2009},
@@ -3264,7 +3265,7 @@ techniques, we show how to optimally modify packets in real-time to reduce the a
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fulltext.pdf},
 	author = {Benedikt Elser and Andreas F{\"o}rschler and Thomas Fuhrmann}
 }
-@inproceedings {1582481,
+@conference {1582481,
 	title = {Using link-layer broadcast to improve scalable source routing},
 	booktitle = {IWCMC {\textquoteright}09: Proceedings of the 2009 International Conference on Wireless Communications and Mobile Computing},
 	year = {2009},
@@ -3285,7 +3286,7 @@ We present simulation results which show the performance gain of the proposed im
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/di09broadcastssr.pdf},
 	author = {Di, Pengfei and Thomas Fuhrmann}
 }
-@inproceedings {ccsw09-fingerprinting,
+@conference {ccsw09-fingerprinting,
 	title = {Website fingerprinting: attacking popular privacy enhancing technologies with the multinomial naive-bayes classifier},
 	booktitle = {Proceedings of the 2009 ACM workshop on Cloud computing security (CCSW {\textquoteright}09)},
 	year = {2009},
@@ -3303,7 +3304,7 @@ We present a novel method that applies common text mining techniques to the norm
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ccsw09-fingerprinting.pdf},
 	author = {Dominik Herrmann and Rolf Wendolsky and Hannes Federrath}
 }
-@inproceedings {1590633,
+@conference {1590633,
 	title = {Wireless Sensor Networks: A Survey},
 	booktitle = {WAINA {\textquoteright}09: Proceedings of the 2009 International Conference on Advanced Information Networking and Applications Workshops},
 	year = {2009},
@@ -3318,7 +3319,7 @@ We present a novel method that applies common text mining techniques to the norm
 	www_section = {http://portal.acm.org/citation.cfm?id=1588304.1590633$\#$},
 	author = {Potdar, Vidyasagar and Sharif, Atif and Chang, Elizabeth}
 }
-@inproceedings {DBLP:conf/esorics/DanezisDKT09,
+@conference {DBLP:conf/esorics/DanezisDKT09,
 	title = {The Wisdom of Crowds: Attacks and Optimal Constructions},
 	booktitle = {Proceedings of the 14th European Symposium on Research in Computer Security (ESORICS 2009), Saint-Malo, France, September 21-23},
 	series = {Lecture Notes in Computer Science},
@@ -3336,7 +3337,7 @@ We present a novel method that applies common text mining techniques to the norm
 	author = {George Danezis and Claudia Diaz and Emilia K{\"a}sper and Carmela Troncoso},
 	editor = {Michael Backes and Peng Ning}
 }
-@inproceedings {wpes09-xpay,
+@conference {wpes09-xpay,
 	title = {XPay: Practical anonymous payments for Tor routing and other networked services},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2009)},
 	year = {2009},
@@ -3353,7 +3354,7 @@ The solutions are efficient, with bandwidth and latency overheads of under 4\% a
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/wpes09-xpay.pdf},
 	author = {Yao Chen and Radu Sion and Bogdan Carbunar}
 }
-@inproceedings {2008_0,
+@conference {2008_0,
 	title = {AmbiComp: A platform for distributed execution of Java programs on embedded systems by offering a single system image },
 	booktitle = {AmI-Blocks{\textquoteright}08, European Conference on Ambient Intelligence 2008 manuscript No},
 	year = {2008},
@@ -3363,7 +3364,7 @@ exible rmware including a Java Virtual Machine, and an Eclipse-based integrated
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/publ_2008_eickhold-fuhrmann-saballus-ua_ambicomp.pdf},
 	author = {Johannes Eickhold and Thomas Fuhrmann and Bjoern Saballus and Sven Schlender and Thomas Suchy}
 }
-@inproceedings {2008_1,
+@conference {2008_1,
 	title = {Analyzing Unreal Tournament 2004 Network Traffic Characteristics},
 	booktitle = {CGAT{\textquoteright}08 Singapore, 28th-30th},
 	year = {2008},
@@ -3371,7 +3372,7 @@ exible rmware including a Java Virtual Machine, and an Eclipse-based integrated
 	www_section = {http://www.tm.uka.de/itm/WebMan/view.php?view=publikationen_detail\&id=295},
 	author = {H{\"u}bsch, Christian}
 }
-@inproceedings {Zivan:2008:ALS:1402821.1402895,
+@conference {Zivan:2008:ALS:1402821.1402895,
 	title = {Anytime local search for distributed constraint optimization},
 	booktitle = {AAMAS{\textquoteright}08 - Proceedings of the 7th international joint conference on Autonomous agents and multiagent systems },
 	series = {AAMAS {\textquoteright}08},
@@ -3398,7 +3399,7 @@ A general framework for implementing distributed local search algorithms for Dis
 	keywords = {distributed hash table, p2psockets},
 	author = {Bernard Wong, Aleksandrs Slivkins and Emin G{\"u}n Sirer}
 }
-@inproceedings {Yang:2008:ABD:1403027.1403032,
+@conference {Yang:2008:ABD:1403027.1403032,
 	title = {Auction, but don{\textquoteright}t block},
 	booktitle = {NetEcon{\textquoteright}08. Proceedings of the 3rd International Workshop on Economics of Networked Systems},
 	series = {NetEcon {\textquoteright}08},
@@ -3416,7 +3417,7 @@ A general framework for implementing distributed local search algorithms for Dis
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NetEcon\%2708\%20-\%20Yang\%20-\%20Auction\%2C\%20but\%20don\%27t\%20block.pdf},
 	author = {Yang, Xiaowei}
 }
-@inproceedings {1387603,
+@conference {1387603,
 	title = {BFT protocols under fire},
 	booktitle = {NSDI{\textquoteright}08: Proceedings of the 5th USENIX Symposium on Networked Systems Design and Implementation},
 	year = {2008},
@@ -3434,7 +3435,7 @@ We use the simulator to compare representative protocols under identical conditi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/BFTSim-nsdi08.pdf},
 	author = {Singh, Atul and Das, Tathagata and Maniatis, Petros and Peter Druschel and Roscoe, Timothy}
 }
-@inproceedings {bauer:alpaca2008,
+@conference {bauer:alpaca2008,
 	title = {BitBlender: Light-Weight Anonymity for BitTorrent},
 	booktitle = {Proceedings of the Workshop on Applications of Private and Anonymous Communications (AlPACa 2008)},
 	year = {2008},
@@ -3466,7 +3467,7 @@ We use the simulator to compare representative protocols under identical conditi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGCOMM\%20Comput.\%20Commun.\%20Rev.\%20-\%20BitTorrent\%20is\%20an\%20Auction.pdf},
 	author = {Levin, Dave and LaCurts, Katrina and Spring, Neil and Bobby Bhattacharjee}
 }
-@inproceedings { bootstrap2008gauthierdickey,
+@conference { bootstrap2008gauthierdickey,
 	title = {Bootstrapping of Peer-to-Peer Networks},
 	booktitle = {Proceedings of DAS-P2P},
 	year = {2008},
@@ -3481,7 +3482,7 @@ present experimental results demonstrating that with this approach it is efficie
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/bootstrap.pdf},
 	author = {Chis GauthierDickey and Christian Grothoff}
 }
-@inproceedings {shimshock-pet2008,
+@conference {shimshock-pet2008,
 	title = {Breaking and Provably Fixing Minx},
 	booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
 	year = {2008},
@@ -3498,7 +3499,7 @@ present experimental results demonstrating that with this approach it is efficie
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/shimshock-pet2008.pdf},
 	author = {Eric Shimshock and Matt Staats and Nicholas J. Hopper}
 }
-@inproceedings {danezis-pet2008,
+@conference {danezis-pet2008,
 	title = {Bridging and Fingerprinting: Epistemic Attacks on Route Selection},
 	booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
 	year = {2008},
@@ -3533,7 +3534,7 @@ present experimental results demonstrating that with this approach it is efficie
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/stutzbach.pdf},
 	author = {Stutzbach, Daniel and Rejaie, Reza and Sen, Subhabrata}
 }
-@inproceedings {torspinISC08,
+@conference {torspinISC08,
 	title = {Compromising Anonymity Using Packet Spinning},
 	booktitle = {Proceedings of the 11th Information Security Conference (ISC 2008)},
 	year = {2008},
@@ -3550,7 +3551,7 @@ To evaluate our novel attack, we used a real-world anonymizing system, TOR. We s
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/torspinISC08.pdf},
 	author = {Vasilis Pappas and Elias Athanasopoulos and Sotiris Ioannidis and Evangelos P. Markatos}
 }
-@inproceedings {MarPi08,
+@conference {MarPi08,
 	title = {A Concept of an Anonymous Direct P2P Distribution Overlay System},
 	booktitle = {Proceedings of IEEE 22nd International Conference on Advanced Information Networking and Applications (AINA)},
 	year = {2008},
@@ -3567,7 +3568,7 @@ To evaluate our novel attack, we used a real-world anonymizing system, TOR. We s
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/MarPi08.pdf},
 	author = {Igor Margasinski and Michal Pioro}
 }
-@inproceedings {2008_2,
+@conference {2008_2,
 	title = {Consistency Management for Peer-to-Peer-based Massively Multiuser Virtual Environments},
 	booktitle = { Proc. 1st Int.Workshop on Massively Multiuser Virtual Environments (MMVE{\textquoteright}08)},
 	year = {2008},
@@ -3601,7 +3602,7 @@ Often, part of the problem is to access large files in a share way. Until now, t
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IEEE\%20Transactions\%20on\%20Systems\%20-\%20Descentralized\%20learning.pdf},
 	author = {Peter Vrancx and Katja Verbeeck and Ann Now{\'e}}
 }
-@inproceedings {ccs2008:wang,
+@conference {ccs2008:wang,
 	title = {Dependent Link Padding Algorithms for Low Latency Anonymity Systems},
 	booktitle = {Proceedings of the 15th ACM Conference on Computer and Communications Security (CCS 2008)},
 	year = {2008},
@@ -3619,7 +3620,7 @@ Often, part of the problem is to access large files in a share way. Until now, t
 	author = {Wei Wang and Mehul Motani and Vikram Srinivasan},
 	editor = {Paul Syverson and Somesh Jha and Xiaolan Zhang}
 }
-@inproceedings {Dischinger:2008:DBB:1452520.1452523,
+@conference {Dischinger:2008:DBB:1452520.1452523,
 	title = {Detecting BitTorrent Blocking},
 	booktitle = {IMC{\textquoteright}08. Proceedings of the 8th ACM SIGCOMM conference on Internet measurement},
 	series = {IMC {\textquoteright}08},
@@ -3637,7 +3638,7 @@ Often, part of the problem is to access large files in a share way. Until now, t
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IMC\%2708\%20-\%20Detecting\%20BitTorrent\%20Blocking.pdf},
 	author = {Dischinger, Marcel and Mislove, Alan and Haeberlen, Andreas and P. Krishna Gummadi}
 }
-@inproceedings {clog-the-queue,
+@conference {clog-the-queue,
 	title = {Don{\textquoteright}t Clog the Queue: Circuit Clogging and Mitigation in P2P anonymity schemes},
 	booktitle = {Proceedings of Financial Cryptography (FC {\textquoteright}08)},
 	year = {2008},
@@ -3661,7 +3662,7 @@ Often, part of the problem is to access large files in a share way. Until now, t
 	address = {Auckland, New Zealand},
 	author = {Sihem Amer-Yahia and Michael Benedikt and Laks V. S. Lakshmanan and Julia Stoyanovich}
 }
-@inproceedings {BecchiCrowley2008EfficientRegexEval,
+@conference {BecchiCrowley2008EfficientRegexEval,
 	title = {Efficient regular expression evaluation: theory to practice},
 	booktitle = {Proceedings of the 4th ACM/IEEE Symposium on Architectures for Networking and Communications Systems},
 	series = {ANCS {\textquoteright}08},
@@ -3694,7 +3695,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.74.8097.pdf},
 	author = {Spyropoulos, Thrasyvoulos and Psounis, Konstantinos and Raghavendra, Cauligi S.}
 }
-@inproceedings {CoNext2008,
+@conference {CoNext2008,
 	title = {EGOIST: Overlay Routing using Selfish Neighbor Selection},
 	booktitle = {Proceedings of ACM CoNEXT 2008},
 	year = {2008},
@@ -3730,7 +3731,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Grid\%20Computing\%20-\%20Estimating\%20The\%20Size\%20Of\%20Peer-To-Peer\%20Networks.pdf},
 	author = {Javier Bustos-Jim{\'e}nez and Nicol{\'a}s Bersano and Satu Elisa Schaeffer and Jos{\'e} Miguel Piquer and Alexandru Iosup and Augusto Ciuffoletti}
 }
-@inproceedings {Junges:2008:EPD:1402298.1402308,
+@conference {Junges:2008:EPD:1402298.1402308,
 	title = {Evaluating the performance of DCOP algorithms in a real world, dynamic problem},
 	booktitle = {AAMAS8 - Proceedings of the 7th international joint conference on Autonomous agents and multiagent systems},
 	series = {AAMAS {\textquoteright}08},
@@ -3747,7 +3748,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/AAMAS08\%20-\%20DCOP\%20algorithms\%20in\%20a\%20real\%20world\%20problem.pdf},
 	author = {Junges, Robert and Bazzan, Ana L. C.}
 }
-@inproceedings {DBLP:conf/icc/ChenCLNC08,
+@conference {DBLP:conf/icc/ChenCLNC08,
 	title = {Experimental Analysis of Super-Seeding in BitTorrent},
 	booktitle = {ICC{\textquoteright}08 - Proceedings of the 2008 IEEE International Conference on Communications},
 	year = {2008},
@@ -3763,7 +3764,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ICC\%2708\%20-\%20Super-Seeding\%20in\%20BitTorrent.PDF},
 	author = {Zhijia Chen and Yang Chen and Chuang Lin and Vaibhav Nivargi and Pei Cao}
 }
-@inproceedings {Ben-David:2008:FSS:1455770.1455804,
+@conference {Ben-David:2008:FSS:1455770.1455804,
 	title = {FairplayMP: a system for secure multi-party computation},
 	booktitle = {CCS{\textquoteright}08 - Proceedings of the 15th ACM conference on Computer and communications security},
 	series = {CCS {\textquoteright}08},
@@ -3812,7 +3813,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Computer\%20Networks\%20-\%20Wang\%2C\%20Chiu\%20\%26\%20Lui\%20-\%20Overlay\%20network\%20traffic\%20on\%20ISP\%20peering.pdf},
 	author = {Wang, Jessie Hui and Chiu, Dah Ming and Lui, John C. S.}
 }
-@inproceedings {saballus08gaos,
+@conference {saballus08gaos,
 	title = {Global Accessible Objects (GAOs) in the Ambicomp Distributed Java Virtual Machine},
 	booktitle = {Proceedings of the Second International Conference on Sensor Technologies and Applications (SENSORCOMM 2008)},
 	year = {2008},
@@ -3833,7 +3834,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/hashcash.pdf},
 	author = {Adam Back}
 }
-@inproceedings {2008_6,
+@conference {2008_6,
 	title = {Higher Confidence in Event Correlation Using Uncertainty Restrictions},
 	booktitle = {28th International Conference on In Distributed Computing Systems Workshops},
 	year = {2008},
@@ -3842,7 +3843,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/koch08confidence.pdf},
 	author = {Gerald G. Koch and Boris Koldehofe and Kurt Rothermel}
 }
-@inproceedings {sassaman-pet2008,
+@conference {sassaman-pet2008,
 	title = {How to Bypass Two Anonymity Revocation Systems},
 	booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
 	year = {2008},
@@ -3859,7 +3860,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	author = {George Danezis and Len Sassaman},
 	editor = {Borisov, Nikita and Ian Goldberg}
 }
-@inproceedings {Boldyreva:2008:IEE:1455770.1455823,
+@conference {Boldyreva:2008:IEE:1455770.1455823,
 	title = {Identity-based encryption with efficient revocation},
 	booktitle = {CCS{\textquoteright}08 - Proceedings of the 15th ACM Conference on Computer and Communications Security},
 	series = {CCS {\textquoteright}08},
@@ -3877,7 +3878,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/CCS\%2708\%20-\%20Identity-based\%20encryption\%20with\%20efficient\%20revocation.pdf},
 	author = {Boldyreva, Alexandra and Goyal, Vipul and Kumar, Virendra}
 }
-@inproceedings {DBLP:conf/p2p/AmannEHF08,
+@conference {DBLP:conf/p2p/AmannEHF08,
 	title = {IgorFs: A Distributed P2P File System},
 	booktitle = {Peer-to-Peer Computing},
 	year = {2008},
@@ -3889,7 +3890,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/amann08igorfs.pdf},
 	author = {Bernhard Amann and Benedikt Elser and Yaser Houri and Thomas Fuhrmann}
 }
-@inproceedings {diaz-pet2008,
+@conference {diaz-pet2008,
 	title = {On the Impact of Social Network Profiling on Anonymity},
 	booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
 	year = {2008},
@@ -3907,7 +3908,7 @@ To deal with such networks researchers have suggested to use flooding-based rout
 	author = {Claudia Diaz and Carmela Troncoso and Andrei Serjantov},
 	editor = {Borisov, Nikita and Ian Goldberg}
 }
-@inproceedings {improved-clockskew,
+@conference {improved-clockskew,
 	title = {An Improved Clock-skew Measurement Technique for Revealing Hidden Services},
 	booktitle = {Proceedings of the 17th USENIX Security Symposium},
 	year = {2008},
@@ -3935,7 +3936,7 @@ Additionally, the open-source software projects latency proxy and libspe, which 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/reardon-thesis.pdf},
 	author = {Reardon, Joel}
 }
-@inproceedings {2008_7,
+@conference {2008_7,
 	title = {Improving User and ISP Experience through ISP-aided P2P Locality},
 	booktitle = {GI{\textquoteright}08. Proceedings of 11th IEEE Global Internet Symposium 2008},
 	year = {2008},
@@ -3949,7 +3950,7 @@ Additionally, the open-source software projects latency proxy and libspe, which 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/isp-aidedp2p.PDF},
 	author = {Vinay Aggarwal and Obi Akonjang and Feldmann, Anja}
 }
-@inproceedings {ccs2008:mittal,
+@conference {ccs2008:mittal,
 	title = {Information Leaks in Structured Peer-to-peer Anonymous Communication Systems},
 	booktitle = {Proceedings of the 15th ACM Conference on Computer and Communications Security (CCS 2008)},
 	year = {2008},
@@ -3986,7 +3987,7 @@ We study this trade-off in two P2P anonymous systems, Salsa and AP3. In both cas
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Journal\%20of\%20Supercomputing\%20-\%20Insight\%20into\%20redundancy\%20schemes\%20in\%20DHTs.pdf},
 	author = {Chen, Guihai and Qiu, Tongqing and Wu, Fan}
 }
-@inproceedings {DBLP:conf/usenix/HiblerRSDGSWL08,
+@conference {DBLP:conf/usenix/HiblerRSDGSWL08,
 	title = {Large-scale Virtualization in the Emulab Network Testbed},
 	booktitle = {USENIX Annual Technical Conference},
 	year = {2008},
@@ -4041,7 +4042,7 @@ Experiments on data sets from bioinformatics, text processing and computer secur
 	www_section = {http://portal.acm.org/citation.cfm?id=1358302.1358311$\#$},
 	author = {Di, Pengfei and Johannes Eickhold and Thomas Fuhrmann}
 }
-@inproceedings {murdoch-pet2008,
+@conference {murdoch-pet2008,
 	title = {Metrics for Security and Performance in Low-Latency Anonymity Networks},
 	booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
 	year = {2008},
@@ -4058,7 +4059,7 @@ Experiments on data sets from bioinformatics, text processing and computer secur
 	author = {Steven J. Murdoch and Robert N. M. Watson},
 	editor = {Borisov, Nikita and Ian Goldberg}
 }
-@inproceedings {pizzonia2008netkit,
+@conference {pizzonia2008netkit,
 	title = {Netkit: easy emulation of complex networks on inexpensive hardware},
 	booktitle = {Proceedings of the 4th International Conference on Testbeds and research infrastructures for the development of networks \& communities},
 	series = {TridentCom {\textquoteright}08},
@@ -4090,7 +4091,7 @@ Experiments on data sets from bioinformatics, text processing and computer secur
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ODSBR-TISSEC.pdf},
 	author = {Awerbuch, Baruch and Curtmola, Reza and Holmer, David and Nita-Rotaru, Cristina and Rubens, Herbert}
 }
-@inproceedings {Hartline:2008:OMD:1374376.1374390,
+@conference {Hartline:2008:OMD:1374376.1374390,
 	title = {Optimal mechanism design and money burning},
 	booktitle = {STOC{\textquoteright}08. Proceedings of the 40th annual ACM Symposium on Theory of Computing},
 	series = {STOC {\textquoteright}08},
@@ -4125,7 +4126,7 @@ Experiments on data sets from bioinformatics, text processing and computer secur
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGCOMM\%20Comput.\%20Commun.\%20Rev.\%20-\%20P4P\%3A\%20Provider\%20Portal\%20for\%20Applications.pdf},
 	author = {Xie, Haiyong and Yang, Y. Richard and Krishnamurthy, Arvind and Liu, Yanbin Grace and Silberschatz, Abraham}
 }
-@inproceedings {raykova-pet2008,
+@conference {raykova-pet2008,
 	title = {PAR: Payment for Anonymous Routing},
 	booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
 	year = {2008},
@@ -4143,7 +4144,7 @@ In this paper, we demonstrate a payment scheme that can be used to compensate no
 	author = {Elli Androulaki and Mariana Raykova and Shreyas Srivatsan and Angelos Stavrou and Steven M. Bellovin},
 	editor = {Borisov, Nikita and Ian Goldberg}
 }
-@inproceedings {ccs2008:tsang,
+@conference {ccs2008:tsang,
 	title = {PEREA: Towards Practical TTP-Free Revocation in Anonymous Authentication},
 	booktitle = {Proceedings of the 15th ACM Conference on Computer and Communications Security (CCS 2008)},
 	year = {2008},
@@ -4160,7 +4161,7 @@ In this paper, we demonstrate a payment scheme that can be used to compensate no
 	author = {Patrick P. Tsang and Man Ho Au and Apu Kapadia and Sean Smith},
 	editor = {Paul Syverson and Somesh Jha and Xiaolan Zhang}
 }
-@inproceedings {troncoso-pet2008,
+@conference {troncoso-pet2008,
 	title = {Perfect Matching Statistical Disclosure Attacks},
 	booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
 	year = {2008},
@@ -4176,7 +4177,7 @@ In this paper, we demonstrate a payment scheme that can be used to compensate no
 	author = {Carmela Troncoso and Benedikt Gierlichs and Bart Preneel and Ingrid Verbauwhede},
 	editor = {Borisov, Nikita and Ian Goldberg}
 }
-@inproceedings {loesing2008performance,
+@conference {loesing2008performance,
 	title = {Performance Measurements and Statistics of Tor Hidden Services},
 	booktitle = {Proceedings of the 2008 International Symposium on Applications and the Internet (SAINT)},
 	year = {2008},
@@ -4192,7 +4193,7 @@ In this paper, we demonstrate a payment scheme that can be used to compensate no
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/loesing2008performance.pdf},
 	author = {Karsten Loesing and Werner Sandmann and Christian Wilms and Guido Wirtz}
 }
-@inproceedings {Shafaat:2008:PAN:1485753.1485763,
+@conference {Shafaat:2008:PAN:1485753.1485763,
 	title = {A Practical Approach to Network Size Estimation for Structured Overlays},
 	booktitle = {IWSOS{\textquoteright}08 - Proceedings of the 3rd International Workshop on Self-Organizing Systems},
 	series = {Lecture Notes in Computer Science},
@@ -4246,7 +4247,7 @@ In this paper, we demonstrate a payment scheme that can be used to compensate no
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NMNC\%20-\%20Progressive\%20strategies\%20for\%20MCTS.pdf},
 	author = {Guillaume M. J-B. Chaslot and Mark H. M. Winands and H. Jaap van den Herik and Jos W. H. M. Uiterwijk and Bruno Bouzy}
 }
-@inproceedings {di08iptps,
+@conference {di08iptps,
 	title = {Providing KBR Service for Multiple Applications},
 	booktitle = {The 7th International Workshop on Peer-to-Peer Systems (IPTPS {\textquoteright}08)},
 	year = {2008},
@@ -4258,7 +4259,7 @@ In this paper, we demonstrate a payment scheme that can be used to compensate no
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/di08iptps.pdf},
 	author = {Di, Pengfei and Kendy Kutzner and Thomas Fuhrmann}
 }
-@inproceedings {quant-adhoc,
+@conference {quant-adhoc,
 	title = {Quantification of Anonymity for Mobile Ad Hoc Networks},
 	booktitle = {Proceedings of the 4th International Workshop on Security and Trust Management (STM 08)},
 	year = {2008},
@@ -4274,7 +4275,7 @@ In this paper, we demonstrate a payment scheme that can be used to compensate no
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/quant-adhoc.pdf},
 	author = {Marie Elisabeth Gaup Moe}
 }
-@inproceedings {Goldberg:2008:RTA:1402958.1402989,
+@conference {Goldberg:2008:RTA:1402958.1402989,
 	title = {Rationality and Traffic Attraction: Incentives for Honest Path Announcements in BGP},
 	booktitle = {SIGCOMM{\textquoteright}08. Proceedings of the ACM SIGCOMM 2008 Conference on Data Communication},
 	series = {SIGCOMM Computer Communication Review},
@@ -4292,7 +4293,7 @@ In this paper, we demonstrate a payment scheme that can be used to compensate no
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGCOMM\%2708\%20-\%20Rationality\%20and\%20traffic\%20attraction.pdf},
 	author = {Goldberg, Sharon and Halevi, Shai and Jaggard, Aaron D. and Ramachandran, Vijay and Wright, Rebecca N.}
 }
-@inproceedings {androulaki-pet2008,
+@conference {androulaki-pet2008,
 	title = {Reputation Systems for Anonymous Networks},
 	booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
 	year = {2008},
@@ -4310,7 +4311,7 @@ In this paper, we demonstrate a payment scheme that can be used to compensate no
 	author = {Elli Androulaki and Seung Geol Choi and Steven M. Bellovin and Tal Malkin},
 	editor = {Borisov, Nikita and Ian Goldberg}
 }
-@inproceedings {2008_10,
+@conference {2008_10,
 	title = {Robust De-anonymization of Large Sparse Datasets},
 	booktitle = {Proceedings of the 2008 IEEE Symposium on Security and Privacy},
 	year = {2008},
@@ -4325,7 +4326,7 @@ In this paper, we demonstrate a payment scheme that can be used to compensate no
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Deanonymization2008narayanan.pdf},
 	author = {Narayanan, Arvind and Shmatikov, Vitaly}
 }
-@inproceedings {mccoy-pet2008,
+@conference {mccoy-pet2008,
 	title = {Shining Light in Dark Places: Understanding the Tor Network},
 	booktitle = {Proceedings of the Eighth International Symposium on Privacy Enhancing Technologies (PETS 2008)},
 	year = {2008},
@@ -4368,7 +4369,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	publisher = {NEC, Heidelberg},
 	author = {Roland Bless and Oliver Waldhorst and Mayer, Christoph P.}
 }
-@inproceedings {conf/infocom/WangLX08,
+@conference {conf/infocom/WangLX08,
 	title = {Stable Peers: Existence, Importance, and Application in Peer-to-Peer Live Video Streaming},
 	booktitle = {INFOCOM{\textquoteright}08. Proceedings of the 27th IEEE International Conference on Computer Communications},
 	year = {2008},
@@ -4396,7 +4397,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/DD08Survey.pdf},
 	author = {George Danezis and Claudia Diaz}
 }
-@inproceedings {Infocom2008,
+@conference {Infocom2008,
 	title = {Swarming on Optimized Graphs for n-way Broadcast},
 	booktitle = {Proceedings of IEEE INFOCOM 2008},
 	year = {2008},
@@ -4407,7 +4408,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Infocom2008.pdf},
 	author = {Georgios Smaragdakis and Nikolaos Laoutaris and Pietro Michiardi and Azer Bestavros and Byers, John W. and Mema Roussopoulos}
 }
-@inproceedings {1456474,
+@conference {1456474,
 	title = {Tahoe: the least-authority filesystem},
 	booktitle = {StorageSS {\textquoteright}08: Proceedings of the 4th ACM international workshop on Storage security and survivability},
 	year = {2008},
@@ -4435,7 +4436,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/towards_comparable_network_simulations.pdf},
 	author = {Di, Pengfei and Yaser Houri and Kendy Kutzner and Thomas Fuhrmann}
 }
-@inproceedings {2008_12,
+@conference {2008_12,
 	title = {Towards Empirical Aspects of Secure Scalar Product},
 	booktitle = {Information Security and Assurance, 2008. ISA 2008. International Conference on},
 	year = {2008},
@@ -4463,7 +4464,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Concurrency\%20and\%20Computation\%20-\%20TRIBLER.pdf},
 	author = {Johan Pouwelse and Garbacki, Pawel and Jun Wang and Arno Bakker and Jie Yang and Alexandru Iosup and Epema, Dick H. J. and Marcel J. T. Reinders and van Steen, Maarten and Henk J. Sips}
 }
-@inproceedings {1424615,
+@conference {1424615,
 	title = {Trust-Rated Authentication for Domain-Structured Distributed Systems},
 	booktitle = {EuroPKI {\textquoteright}08: Proceedings of the 5th European PKI workshop on Public Key Infrastructure},
 	year = {2008},
@@ -4479,7 +4480,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/AuthenticationEuroPKI2008.pdf},
 	author = {Ralph Holz and Heiko Niedermayer and Hauck, Peter and Carle, Georg}
 }
-@inproceedings {snader08,
+@conference {snader08,
 	title = {A Tune-up for Tor: Improving Security and Performance in the Tor Network},
 	booktitle = {Proceedings of the Network and Distributed Security Symposium - NDSS {\textquoteright}08},
 	year = {2008},
@@ -4493,7 +4494,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/snader08.pdf},
 	author = {Robin Snader and Borisov, Nikita}
 }
-@inproceedings {2008_13,
+@conference {2008_13,
 	title = {The Underlay Abstraction in the Spontaneous Virtual Networks (SpoVNet) Architecture},
 	booktitle = {Proc. 4th EuroNGI Conf. on Next Generation Internet Networks (NGI 2008)},
 	year = {2008},
@@ -4522,7 +4523,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WhatCanWeLearnPrivately2008Kasiviswanthan.pdf},
 	author = {Shiva Prasad Kasiviswanathan and Homin K. Lee and Kobbi Nissim and Sofya Raskhodnikova and Adam Smith}
 }
-@inproceedings {Jian:2008:WSP:1409540.1409546,
+@conference {Jian:2008:WSP:1409540.1409546,
 	title = {Why Share in Peer-to-Peer Networks?},
 	booktitle = {EC{\textquoteright}08. Proceedings of the 10th International Conference on Electronic Commerce},
 	series = {ICEC {\textquoteright}08},
@@ -4540,7 +4541,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/EC\%2708\%20-\%20Why\%20share\%20in\%20peer-to-peer\%20networks.pdf},
 	author = {Jian, Lian and MacKie-Mason, Jeffrey K.}
 }
-@inproceedings {Garbacki:2007:ATP:1270401.1271766_0,
+@conference {Garbacki:2007:ATP:1270401.1271766_0,
 	title = {An Amortized Tit-For-Tat Protocol for Exchanging Bandwidth instead of Content in P2P Networks},
 	booktitle = {SASO 2007. Proceedings of the First International Conference on Self-Adaptive and Self-Organizing Systems},
 	series = {SASO {\textquoteright}07},
@@ -4558,7 +4559,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SASO\%2707\%20-\%20Garbacki\%2C\%20Epema\%20\%26\%20van\%20Steen.pdf},
 	author = {Garbacki, Pawel and Epema, Dick H. J. and van Steen, Maarten}
 }
-@inproceedings {Garbacki:2007:ATP:1270401.1271766,
+@conference {Garbacki:2007:ATP:1270401.1271766,
 	title = {An Amortized Tit-For-Tat Protocol for Exchanging Bandwidth instead of Content in P2P Networks},
 	booktitle = {SASO 2007. Proceedings of the First International Conference on Self-Adaptive and Self-Organizing Systems},
 	series = {SASO {\textquoteright}07},
@@ -4600,7 +4601,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/0710.4903v1.pdf},
 	author = {Parvathinathan Venkitasubramaniam and Ting He and Lang Tong}
 }
-@inproceedings {di07mass,
+@conference {di07mass,
 	title = {Application of DHT-Inspired Routing for Object Tracking},
 	booktitle = {Proceedings of 4th IEEE International Conference on Mobile Ad-hoc and Sensor Systems},
 	year = {2007},
@@ -4613,7 +4614,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/di07mass.pdf},
 	author = {Di, Pengfei and Yaser Houri and Qing Wei and J{\"o}rg Widmer and Thomas Fuhrmann}
 }
-@inproceedings {Ostrovsky:2007:AEN:1315245.1315270,
+@conference {Ostrovsky:2007:AEN:1315245.1315270,
 	title = {Attribute-based encryption with non-monotonic access structures},
 	booktitle = {CCS{\textquoteright}07 - Proceedings of the 14th ACM Conference on Computer and Communications Security},
 	series = {CCS {\textquoteright}07},
@@ -4638,7 +4639,7 @@ To sample the results, we show that web traffic makes up the majority of the con
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/batman-status.pdf},
 	author = {Axel Neumann and Corinna Elektra Aichele and Marek Lindner}
 }
-@inproceedings {ccs07-blac,
+@conference {ccs07-blac,
 	title = {Blacklistable Anonymous Credentials: Blocking Misbehaving Users without TTPs},
 	booktitle = {Proceedings of CCS 2007},
 	year = {2007},
@@ -4688,7 +4689,7 @@ For validation, we simulate a network with one million low-end peers and show Bu
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cosic-2007-001.pdf},
 	author = {Len Sassaman and Bart Preneel}
 }
-@inproceedings {1759877,
+@conference {1759877,
 	title = {CFR: a peer-to-peer collaborative file repository system},
 	booktitle = {GPC{\textquoteright}07: Proceedings of the 2nd international conference on Advances in grid and pervasive computing},
 	year = {2007},
@@ -4735,7 +4736,7 @@ We develop our solution in two parts: a cheat-proof and real-time event ordering
 	www_section = {http://dx.doi.org/10.1016/j.comnet.2006.07.005},
 	author = {Lee, Jinwon and Lee, Hyonik and Kang, Seungwoo and Kim, Su Myeon and Song, Junehwa}
 }
-@inproceedings {conf/acsac/ADC07,
+@conference {conf/acsac/ADC07,
 	title = {Closed-Circuit Unobservable Voice Over IP},
 	booktitle = {Proceedings of 23rd Annual Computer Security Applications Conference (ACSAC{\textquoteright}07), Miami, FL, USA},
 	year = {2007},
@@ -4793,7 +4794,7 @@ In this paper, we demonstrate that in view of recent results in compact routing 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/phd-thesis.fr_en.pdf},
 	author = {Ludovic Courtes}
 }
-@inproceedings {fessi-iptcomm2007,
+@conference {fessi-iptcomm2007,
 	title = {A cooperative SIP infrastructure for highly reliable telecommunication services},
 	booktitle = {IPTComm {\textquoteright}07: Proceedings of the 1st international conference on Principles, systems and applications of IP telecommunications},
 	year = {2007},
@@ -4805,7 +4806,7 @@ In this paper, we demonstrate that in view of recent results in compact routing 
 	doi = {http://doi.acm.org/10.1145/1326304.1326310},
 	author = {Fessi, Ali and Heiko Niedermayer and Kinkelin, Holger and Carle, Georg}
 }
-@inproceedings {DBLP:conf/esorics/MalleshW07,
+@conference {DBLP:conf/esorics/MalleshW07,
 	title = {Countering Statistical Disclosure with Receiver-Bound Cover Traffic},
 	booktitle = {Proceedings of ESORICS 2007, 12th European Symposium On Research In Computer Security, Dresden, Germany, September 24-26, 2007, Proceedings},
 	series = {Lecture Notes in Computer Science},
@@ -4839,7 +4840,7 @@ This thesis demonstrates how theoretical models and generic methodologies relati
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/steven-thesis.pdf},
 	author = {Steven J. Murdoch}
 }
-@inproceedings {ccs07-doa,
+@conference {ccs07-doa,
 	title = {Denial of Service or Denial of Security? How Attacks on Reliability can Compromise Anonymity},
 	booktitle = {Proceedings of CCS 2007},
 	year = {2007},
@@ -4854,7 +4855,7 @@ This thesis demonstrates how theoretical models and generic methodologies relati
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ccs07-doa.pdf},
 	author = {Borisov, Nikita and George Danezis and Prateek Mittal and Parisa Tabriz}
 }
-@inproceedings {1345798,
+@conference {1345798,
 	title = {Dependability Evaluation of Cooperative Backup Strategies for Mobile Devices},
 	booktitle = {PRDC {\textquoteright}07: Proceedings of the 13th Pacific Rim International Symposium on Dependable Computing},
 	year = {2007},
@@ -4869,7 +4870,7 @@ This thesis demonstrates how theoretical models and generic methodologies relati
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.65.8269_0.pdf},
 	author = {Ludovic Courtes and Hamouda, Ossama and Kaaniche, Mohamed and Killijian, Marc-Olivier and Powell, David}
 }
-@inproceedings {wiangsripanawan-acsw07,
+@conference {wiangsripanawan-acsw07,
 	title = {Design principles for low latency anonymous network systems secure against timing attacks},
 	booktitle = {Proceedings of the fifth Australasian symposium on ACSW frontiers (ACSW {\textquoteright}07)},
 	year = {2007},
@@ -4886,7 +4887,7 @@ In this paper, we investigate this claim against other low latency anonymous net
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/wiangsripanawan-acsw07.pdf},
 	author = {Rungrat Wiangsripanawan and Willy Susilo and Rei Safavi-Naini}
 }
-@inproceedings {Piatek:2007:IBR:1973430.1973431_0,
+@conference {Piatek:2007:IBR:1973430.1973431_0,
 	title = {Do incentives build robustness in BitTorrent?},
 	booktitle = {NSDI{\textquoteright}07. Proceedings of the 4th USENIX Conference on Networked Systems Design Implementation},
 	series = {NSDI{\textquoteright}07},
@@ -4902,7 +4903,7 @@ In this paper, we investigate this claim against other low latency anonymous net
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NSDI\%2707\%20-\%20Do\%20incentives\%20build\%20robustness\%20in\%20BitTorrent.pdf},
 	author = {Piatek, Michael and Isdal, Tomas and Anderson, Thomas and Krishnamurthy, Arvind and Venkataramani, Arun}
 }
-@inproceedings {Piatek:2007:IBR:1973430.1973431,
+@conference {Piatek:2007:IBR:1973430.1973431,
 	title = {Do incentives build robustness in BitTorrent?},
 	booktitle = {NSDI{\textquoteright}07. Proceedings of the 4th USENIX Conference on Networked Systems Design Implementation},
 	series = {NSDI{\textquoteright}07},
@@ -4917,7 +4918,7 @@ In this paper, we investigate this claim against other low latency anonymous net
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NSDI\%2707\%20-\%20Do\%20incentives\%20build\%20robustness\%20in\%20BitTorrent.pdf},
 	author = {Piatek, Michael and Isdal, Tomas and Anderson, Thomas and Krishnamurthy, Arvind and Venkataramani, Arun}
 }
-@inproceedings {diaz-wpes2007,
+@conference {diaz-wpes2007,
 	title = {Does additional information always reduce anonymity?},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society 2007},
 	year = {2007},
@@ -4944,7 +4945,7 @@ In this paper, we investigate this claim against other low latency anonymous net
 	www_section = {http://ieeexplore.ieee.org/Xplore/login.jsp?url=http\%3A\%2F\%2Fieeexplore.ieee.org\%2Fiel5\%2F4410909\%2F4410910\%2F04410930.pdf\%3Farnumber\%3D4410930\&authDecision=-203},
 	author = {Olaf Landsiedel and Alexis Pimenidis and Klaus Wehrle}
 }
-@inproceedings {Coulom:2006:ESB:1777826.1777833,
+@conference {Coulom:2006:ESB:1777826.1777833,
 	title = {Efficient selectivity and backup operators in Monte-Carlo tree search},
 	booktitle = {CG{\textquoteright}06 - Proceedings of the 5th international conference on Computers and games},
 	series = {CG{\textquoteright}06},
@@ -4968,7 +4969,7 @@ In this paper, we investigate this claim against other low latency anonymous net
 	year = {2007},
 	author = {Ashwin Machanavajjhala and Daniel Kifer and Johannes Gehrke and Muthuramakrishnan Venkitasubramaniam}
 }
-@inproceedings {Tang:2007:ESE:1260204.1260647,
+@conference {Tang:2007:ESE:1260204.1260647,
 	title = {Empirical Study on the Evolution of PlanetLab},
 	booktitle = {ICN{\textquoteright}07 - Proceedings of the 6th International Conference on Networking},
 	year = {2007},
@@ -4998,7 +4999,7 @@ In this paper, we investigate this claim against other low latency anonymous net
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IEEE\%20Communications\%20Magazine\%20-\%20Video\%20Streaming\%20in\%20P2P\%20Systems.pdf},
 	author = {Dan Jurca and Jacob Chakareski and Jean-Paul Wagner and Pascal Frossard}
 }
-@inproceedings {Stathopoulos07end-to-endrouting,
+@conference {Stathopoulos07end-to-endrouting,
 	title = {End-to-end routing for dualradio sensor networks},
 	booktitle = {In INFOCOM},
 	year = {2007},
@@ -5009,7 +5010,7 @@ In this paper, we investigate this claim against other low latency anonymous net
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Stathopoulos07a.pdf},
 	author = {Thanos Stathopoulos and Heidemann, John and Martin Lukac and Deborah Estrin and William J. Kaiser}
 }
-@inproceedings {Binzenhofer:2007:ECS:1769187.1769257,
+@conference {Binzenhofer:2007:ECS:1769187.1769257,
 	title = {Estimating churn in structured P2P networks},
 	booktitle = {ITC-20{\textquoteright}07 - Proceedings of the 20th International Teletraffic Conference on Managing Traffic Performance in Converged Networks},
 	series = {ITC20{\textquoteright}07},
@@ -5041,7 +5042,7 @@ In this paper, we investigate this claim against other low latency anonymous net
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/oualno-070618.pdf},
 	author = {Nouha Oualha and Pietro Michiardi and Yves Roudier}
 }
-@inproceedings {AthanRAM07,
+@conference {AthanRAM07,
 	title = {GAS: Overloading a File Sharing Network as an Anonymizing System},
 	booktitle = {Proceedings of Second International Workshop on Security, (IWSEC 2007)},
 	year = {2007},
@@ -5055,7 +5056,7 @@ In this paper, we investigate this claim against other low latency anonymous net
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/AthanRAM07.pdf},
 	author = {Elias Athanasopoulos and Mema Roussopoulos and Kostas G. Anagnostakis and Evangelos P. Markatos}
 }
-@inproceedings {Steiner:2007:GVK:1298306.1298323,
+@conference {Steiner:2007:GVK:1298306.1298323,
 	title = {A global view of KAD},
 	booktitle = {IMC{\textquoteright}07 - Proceedings of the 7th ACM SIGCOMM Conference on Internet Measurement},
 	series = {IMC {\textquoteright}07},
@@ -5132,7 +5133,7 @@ Peers are identified by the so called KAD ID, which was up to now assumed to rem
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/robustgossip-final.pdf},
 	author = {Lorenzo Alvisi and Jeroen Doumen and Rachid Guerraoui and Boris Koldehofe and Harry Li and Robbert Van Renesse and Gilles Tredan}
 }
-@inproceedings {adida07,
+@conference {adida07,
 	title = {How to Shuffle in Public},
 	booktitle = {Proceedings of the Theory of Cryptography 2007},
 	year = {2007},
@@ -5149,7 +5150,7 @@ Finally, we give a distributed protocol for sampling and obfuscating each of the
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/adida07.pdf},
 	author = {Ben Adida and Douglas Wikstr{\"o}m}
 }
-@inproceedings {Delerablee:2007:IBE:1781454.1781471,
+@conference {Delerablee:2007:IBE:1781454.1781471,
 	title = {Identity-based broadcast encryption with constant size ciphertexts and private keys},
 	booktitle = {ASIACRYPT 2007 - Proceedings of the Advances in Cryptology 13th International Conference on Theory and Application of Cryptology and Information Security},
 	series = {ASIACRYPT{\textquoteright}07},
@@ -5183,7 +5184,7 @@ Finally, we give a distributed protocol for sampling and obfuscating each of the
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/KongHG07.pdf},
 	author = {Jiejun Kong and Xiaoyan Hong and Mario Gerla}
 }
-@inproceedings {Infocom2007-SNS,
+@conference {Infocom2007-SNS,
 	title = {Implications of Selfish Neighbor Selection in Overlay Networks},
 	booktitle = {Proceedings of IEEE INFOCOM 2007},
 	year = {2007},
@@ -5194,7 +5195,7 @@ Finally, we give a distributed protocol for sampling and obfuscating each of the
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Infocom2007-sns.pdf},
 	author = {Nikolaos Laoutaris and Georgios Smaragdakis and Azer Bestavros and Byers, John W.}
 }
-@inproceedings {overlier-pet2007,
+@conference {overlier-pet2007,
 	title = {Improving Efficiency and Simplicity of Tor circuit establishment and hidden services},
 	booktitle = {Proceedings of the Seventh Workshop on Privacy Enhancing Technologies (PET 2007)},
 	year = {2007},
@@ -5226,7 +5227,7 @@ Finally, we give a distributed protocol for sampling and obfuscating each of the
 	www_section = {http://portal.acm.org/citation.cfm?id=1290327$\#$},
 	author = {Wang, Yongwei and Singhal, Mukesh}
 }
-@inproceedings {goldberg-2007,
+@conference {goldberg-2007,
 	title = {Improving the Robustness of Private Information Retrieval},
 	booktitle = {Proceedings of the 2007 IEEE Symposium on Security and Privacy},
 	year = {2007},
@@ -5241,7 +5242,7 @@ Finally, we give a distributed protocol for sampling and obfuscating each of the
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/goldberg-2007.pdf},
 	author = {Ian Goldberg}
 }
-@inproceedings {slicing07,
+@conference {slicing07,
 	title = {Information Slicing: Anonymity Using Unreliable Overlays},
 	booktitle = {Proceedings of the 4th USENIX Symposium on Network Systems Design and Implementation (NSDI)},
 	year = {2007},
@@ -5276,7 +5277,7 @@ Finally, we give a distributed protocol for sampling and obfuscating each of the
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.91.8217.pdf},
 	author = {Leemon C. Baird and William L. Bahn and Michael D. Collins and Martin C. Carlisle and Sean C. Butler}
 }
-@inproceedings {DBLP:conf/saint/SaitoMSSM07,
+@conference {DBLP:conf/saint/SaitoMSSM07,
 	title = {Local Production, Local Consumption: Peer-to-Peer Architecture for a Dependable and Sustainable Social Infrastructure},
 	booktitle = {SAINT{\textquoteright}07. Proceedings of the 2007 Symposium on Applications and the Internet},
 	year = {2007},
@@ -5294,7 +5295,7 @@ This paper attempts to put existing works of P2P designs into the perspective of
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SAINT\%2707\%20-\%20Local\%20production\%2C\%20local\%20consumption\%20p2p\%20architecture.pdf},
 	author = {Saito, Kenji and Morino, Eiichi and Yoshihiko Suko and Takaaki Suzuki and Murai, Jun}
 }
-@inproceedings {bauer:wpes2007,
+@conference {bauer:wpes2007,
 	title = {Low-Resource Routing Attacks Against Tor},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2007)},
 	year = {2007},
@@ -5337,7 +5338,7 @@ message to an elliptic curve},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ijns-2009-v8-n2-p169-176.pdf},
 	author = {Brian King}
 }
-@inproceedings {DBLP:conf/infocom/ZhangCY07,
+@conference {DBLP:conf/infocom/ZhangCY07,
 	title = {MARCH: A Distributed Incentive Scheme for Peer-to-Peer Networks},
 	booktitle = {INFOCOM 2007. 26th IEEE International Conference on Computer Communications},
 	year = {2007},
@@ -5353,7 +5354,7 @@ message to an elliptic curve},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOM\%2707\%20-\%20MARCH.pdf},
 	author = {Zhan Zhang and Shigang Chen and MyungKeun Yoon}
 }
-@inproceedings {Magharei07meshor,
+@conference {Magharei07meshor,
 	title = {Mesh or Multiple-Tree: A Comparative Study of Live P2P Streaming Approaches},
 	booktitle = {INFOCOM 2007. 26th IEEE International Conference on Computer Communications},
 	year = {2007},
@@ -5406,7 +5407,7 @@ The realized protocols as well as the original protocol are constant-round and r
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IEEE\%E2\%81\%84ACM\%20Banner\%20\%26\%20Orda.pdf},
 	author = {Banner, Ron and Orda, Ariel}
 }
-@inproceedings {Dimakis:2010:NCD:1861840.1861868,
+@conference {Dimakis:2010:NCD:1861840.1861868,
 	title = {Network coding for distributed storage systems},
 	booktitle = {INFOCOM 2007. 26th IEEE International Conference on Computer Communications},
 	volume = {56},
@@ -5424,7 +5425,7 @@ The realized protocols as well as the original protocol are constant-round and r
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOM\%2707\%20-\%20Network\%20coding\%20for\%20distributed\%20storage\%20systems.pdf},
 	author = {Dimakis, Alexandros G. and Godfrey, Brighten and Wu, Yunnan and Wainwright, Martin J. and Ramchandran, Kannan}
 }
-@inproceedings {2007_8,
+@conference {2007_8,
 	title = {A New Efficient Privacy-preserving Scalar Product Protocol},
 	booktitle = {Proceedings of the Sixth Australasian Conference on Data Mining and Analytics - Volume 70},
 	year = {2007},
@@ -5442,7 +5443,7 @@ Although several solutions exist in the relevant literature for this problem, th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/PrivacyPreserving2007Ambirbekyan.pdf},
 	author = {Amirbekyan, Artak and Estivill-Castro, Vladimir}
 }
-@inproceedings {2007_9,
+@conference {2007_9,
 	title = {ParaNets: A Parallel Network Architecture for Challenged Networks},
 	year = {2007},
 	month = {March 2007 },
@@ -5452,7 +5453,7 @@ Although several solutions exist in the relevant literature for this problem, th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/hotmobile07.pdf},
 	author = {Khaled A. Harras and Mike P. Wittie and Kevin C. Almeroth and Elizabeth M. Belding}
 }
-@inproceedings {Petcu:2007:PNP:1625275.1625301,
+@conference {Petcu:2007:PNP:1625275.1625301,
 	title = {PC-DPOP: a new partial centralization algorithm for distributed optimization},
 	booktitle = {IJCAI{\textquoteright}07 - Proceedings of the 20th international joint conference on Artifical intelligence},
 	series = {IJCAI{\textquoteright}07},
@@ -5474,7 +5475,7 @@ We also report strong efficiency gains over OptAPO in experiments on three probl
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IJCAI\%2707\%20-\%20PC-DPOP.pdf},
 	author = {Adrian Petcu and Boi Faltings and Mailler, Roger}
 }
-@inproceedings {fuhrmann07wons,
+@conference {fuhrmann07wons,
 	title = {Performance of Scalable Source Routing in Hybrid MANETs},
 	booktitle = {Proceedings of the Fourth Annual Conference on Wireless On demand Network Systems and Services},
 	year = {2007},
@@ -5507,13 +5508,13 @@ In this paper, our focus is on the two-party case, although most of our results 
 	author = {Garay, Juan and Schoenmakers, Berry and Villegas, Jos{\'e}},
 	editor = {Okamoto, Tatsuaki and Wang, Xiaoyun}
 }
-@inproceedings {Dwork2007,
+@conference {Dwork2007,
 	title = {The Price of Privacy and the Limits of LP Decoding},
 	year = {2007},
 	pages = {85{\textendash}94},
 	author = {Cynthia Dwork and Frank D. McSherry and Kunal Talwar}
 }
-@inproceedings {Magharei:2009:PPR:1618562.1618566,
+@conference {Magharei:2009:PPR:1618562.1618566,
 	title = {PRIME: Peer-to-Peer Receiver-drIven MEsh-based Streaming},
 	booktitle = {INFOCOM 2007. 26th IEEE International Conference on Computer Communications},
 	volume = {17},
@@ -5589,7 +5590,7 @@ Finally we study a problem that arises when we combine probabilities with nondet
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/kostas-thesis.pdf},
 	author = {Konstantinos Chatzikokolakis}
 }
-@inproceedings {ChatziPP07,
+@conference {ChatziPP07,
 	title = {Probability of Error in Information-Hiding Protocols},
 	booktitle = {Proceedings of the 20th IEEE Computer Security Foundations Symposium (CSF20)},
 	year = {2007},
@@ -5628,7 +5629,7 @@ Exemplary analysis show that Merivaldi means only a modest burden for the networ
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Kising\%20-\%20Proximity\%20Neighbor\%20Selection\%20for\%20IGOR.pdf},
 	author = {Yves Philippe Kising}
 }
-@inproceedings {1361410,
+@conference {1361410,
 	title = {Purely functional system configuration management},
 	booktitle = {HOTOS{\textquoteright}07: Proceedings of the 11th USENIX workshop on Hot topics in operating systems},
 	year = {2007},
@@ -5641,7 +5642,7 @@ Exemplary analysis show that Merivaldi means only a modest burden for the networ
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/dolstra.pdf},
 	author = {Dolstra, Eelco and Hemel, Armijn}
 }
-@inproceedings { pitchblack,
+@conference { pitchblack,
 	title = {Routing in the Dark: Pitch Black},
 	booktitle = {23rd Annual Computer Security Applications Conference (ACSAC 2007)},
 	year = {2007},
@@ -5660,7 +5661,7 @@ We also discuss various proposed countermeasures designed to detect, thwart or l
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/pitchblack.pdf},
 	author = {Nathan S Evans and Chis GauthierDickey and Christian Grothoff}
 }
-@inproceedings {murdoch-pet2007,
+@conference {murdoch-pet2007,
 	title = {Sampled Traffic Analysis by Internet-Exchange-Level Adversaries},
 	booktitle = {Proceedings of the Seventh Workshop on Privacy Enhancing Technologies (PET 2007)},
 	year = {2007},
@@ -5691,7 +5692,7 @@ Usually the strategy to solve this type of problem is an encrypted multicast. Th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Amann\%20-\%20Secure\%20asynchronous\%20change\%20notifications.pdf},
 	author = {Bernhard Amann}
 }
-@inproceedings {saballus07secure,
+@conference {saballus07secure,
 	title = {Secure Group Communication in Ad-Hoc Networks using Tree Parity Machines},
 	booktitle = {KiVS 2007},
 	year = {2007},
@@ -5724,7 +5725,7 @@ Usually the strategy to solve this type of problem is an encrypted multicast. Th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGCOMM\%20Comput.\%20Commun.\%20Rev.\%20-\%20Securing\%20Internet\%20Coordinate\%20Embedding\%20Systems.pdf},
 	author = {Kaafar, Mohamed Ali and Laurent Mathy and Barakat, Chadi and Salamatian, Kave and Turletti, Thierry and Dabbous, Walid}
 }
-@inproceedings {Conner:2007:SPM:1377934.1377937,
+@conference {Conner:2007:SPM:1377934.1377937,
 	title = {Securing peer-to-peer media streaming systems from selfish and malicious behavior},
 	booktitle = {MDS{\textquoteright}07. Proceedings of the 4th on Middleware Doctoral Symposium},
 	series = {MDS {\textquoteright}07},
@@ -5743,7 +5744,7 @@ Usually the strategy to solve this type of problem is an encrypted multicast. Th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/MDS\%2707\%20-\%20Conner\%20\%26\%20Nahrstedt\%20-\%20Securing\%20peer-to-peer\%20media\%20streaming\%20systems.pdf},
 	author = {Conner, William and Nahrstedt, Klara}
 }
-@inproceedings {DBLP:conf/ladc/CourtesKP07,
+@conference {DBLP:conf/ladc/CourtesKP07,
 	title = {Security Rationale for a Cooperative Backup Service for Mobile Devices},
 	booktitle = {LADC},
 	year = {2007},
@@ -5755,7 +5756,7 @@ Usually the strategy to solve this type of problem is an encrypted multicast. Th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.106.5673.pdf},
 	author = {Ludovic Courtes and Killijian, Marc-Olivier and Powell, David}
 }
-@inproceedings {1396915,
+@conference {1396915,
 	title = {S/Kademlia: A practicable approach towards secure key-based routing},
 	booktitle = {ICPADS {\textquoteright}07: Proceedings of the 13th International Conference on Parallel and Distributed Systems},
 	year = {2007},
@@ -5770,7 +5771,7 @@ Usually the strategy to solve this type of problem is an encrypted multicast. Th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SKademlia2007.pdf},
 	author = {Baumgart, Ingmar and Sebastian Mies}
 }
-@inproceedings {1326260,
+@conference {1326260,
 	title = {Skype4Games},
 	booktitle = {NetGames {\textquoteright}07: Proceedings of the 6th ACM SIGCOMM workshop on Network and system support for games},
 	year = {2007},
@@ -5786,7 +5787,7 @@ Usually the strategy to solve this type of problem is an encrypted multicast. Th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Triebel2007a.pdf},
 	author = {Triebel, Tonio and Guthier, Benjamin and Effelsberg, Wolfgang}
 }
-@inproceedings {space-efficient,
+@conference {space-efficient,
 	title = {Space-Efficient Private Search},
 	booktitle = {Proceedings of Financial Cryptography (FC2007)},
 	series = {Lecture Notes in Computer Science},
@@ -5800,7 +5801,7 @@ Usually the strategy to solve this type of problem is an encrypted multicast. Th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/privsearch-aeolus.pdf},
 	author = {George Danezis and Claudia Diaz}
 }
-@inproceedings {2007_12,
+@conference {2007_12,
 	title = {SpoVNet: An Architecture for Supporting Future Internet Applications},
 	booktitle = {Proc. 7th W{\"u}rzburg Workshop on IP: Joint EuroFGI and ITG Workshop on Visions of Future Generation Networks{\textquoteright}},
 	year = {2007},
@@ -5810,7 +5811,7 @@ Usually the strategy to solve this type of problem is an encrypted multicast. Th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SpoVNet.pdf , https://gnunet.org/git/bibliography.git/tree/docs/Mies\%20-\%20SpoVNet.pdf},
 	author = {Sebastian Mies}
 }
-@inproceedings {ringstwice07,
+@conference {ringstwice07,
 	title = {Subliminal Channels in the Private Information Retrieval Protocols},
 	booktitle = {Proceedings of the 28th Symposium on Information Theory in the Benelux},
 	year = {2007},
@@ -5823,13 +5824,13 @@ Usually the strategy to solve this type of problem is an encrypted multicast. Th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ringstwice07.pdf},
 	author = {Meredith L. Patterson and Len Sassaman}
 }
-@inproceedings {Li2007-tcloseness,
+@conference {Li2007-tcloseness,
 	title = {t-Closeness: Privacy Beyond k-Anonymity and $\ell$-Diversity},
 	year = {2007},
 	pages = {106{\textendash}115},
 	author = {Ninghui Li and Tiancheng Li and Suresh Venkatasubramanian}
 }
-@inproceedings { saballus07distributed,
+@conference { saballus07distributed,
 	title = {Towards a Distributed Java VM in Sensor Networks using Scalable Source Routing},
 	booktitle = {6. Fachgespraech Sensornetzwerke der GI/ITG Fachgruppe {\textquoteright}{\textquoteright}Kommunikation und Verteilte Systeme{\textquoteright}{\textquoteright},
 	year = {2007},
@@ -5841,7 +5842,7 @@ Usually the strategy to solve this type of problem is an encrypted multicast. Th
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/saballus07distributed.pdf},
 	author = {Bjoern Saballus and Johannes Eickhold and Thomas Fuhrmann}
 }
-@inproceedings {Sherr07towardsapplication-aware,
+@conference {Sherr07towardsapplication-aware,
 	title = {Towards application-aware anonymous routing},
 	booktitle = {In Second USENIX Workshop on Hot Topics in Security (HotSec},
 	year = {2007},
@@ -5855,7 +5856,7 @@ We pose a grand challenge for anonymity: the development of a network architectu
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/a3.pdf},
 	author = {Micah Sherr and Boon Thau and Matt Blaze}
 }
-@inproceedings {1270971,
+@conference {1270971,
 	title = {Towards Fair Event Dissemination},
 	booktitle = {ICDCSW {\textquoteright}07: Proceedings of the 27th International Conference on Distributed Computing Systems Workshops},
 	year = {2007},
@@ -5870,7 +5871,7 @@ We pose a grand challenge for anonymity: the development of a network architectu
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.90.9758.pdf},
 	author = {Baehni, Sebastien and Rachid Guerraoui and Boris Koldehofe and Monod, Maxime}
 }
-@inproceedings {troncoso-ih2007,
+@conference {troncoso-ih2007,
 	title = {Traffic Analysis Attacks on a Continuously-Observable Steganographic File System},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2007)},
 	series = {Lecture Notes in Computer Science},
@@ -5889,7 +5890,7 @@ We pose a grand challenge for anonymity: the development of a network architectu
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/troncoso-ih2007.pdf},
 	author = {Carmela Troncoso and Claudia Diaz and Orr Dunkelman and Bart Preneel}
 }
-@inproceedings {danezis-pet2007,
+@conference {danezis-pet2007,
 	title = {Two-Sided Statistical Disclosure Attack},
 	booktitle = {Proceedings of the Seventh Workshop on Privacy Enhancing Technologies (PET 2007)},
 	year = {2007},
@@ -5904,7 +5905,7 @@ We pose a grand challenge for anonymity: the development of a network architectu
 	author = {George Danezis and Claudia Diaz and Carmela Troncoso},
 	editor = {Borisov, Nikita and Philippe Golle}
 }
-@inproceedings {2007_13,
+@conference {2007_13,
 	title = {An Unconditionally Secure Protocol for Multi-Party Set Intersection},
 	booktitle = {Proceedings of the 5th International Conference on Applied Cryptography and Network Security},
 	year = {2007},
@@ -5919,7 +5920,7 @@ We pose a grand challenge for anonymity: the development of a network architectu
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/UnconditionallySecureProtocol2007Li.pdf},
 	author = {Li, Ronghua and Wu, Chuankun}
 }
-@inproceedings {tor-soups07,
+@conference {tor-soups07,
 	title = {Usability of anonymous web browsing: an examination of Tor interfaces and deployability},
 	booktitle = {Proceedings of the 3rd Symposium on Usable Privacy and Security (SOUPS {\textquoteright}07)},
 	year = {2007},
@@ -5936,7 +5937,7 @@ We pose a grand challenge for anonymity: the development of a network architectu
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/tor-soups07.pdf},
 	author = {Jeremy Clark and Paul C. van Oorschot and Carlisle Adams}
 }
-@inproceedings {kutzner07linearization,
+@conference {kutzner07linearization,
 	title = {Using Linearization for Global Consistency in SSR},
 	booktitle = {Proceedings of the 4th Int. IEEE Workshop on Hot Topics in P2P Systems},
 	year = {2007},
@@ -5976,7 +5977,7 @@ In this paper we describe Valgrind, a DBI framework designed for building heavyw
 	www_section = {http://www.heise.de/kiosk/archiv/ct/2007/21/218_Die-Enttarnung-von-StealthNet-Nutzern},
 	author = {Nils Durner and Nathan S Evans and Christian Grothoff}
 }
-@inproceedings {garbacki062fast,
+@conference {garbacki062fast,
 	title = {2Fast: Collaborative Downloads in P2P Networks},
 	booktitle = {P2P 2006. 6th IEEE International Conference on Peer-to-Peer Computing},
 	year = {2006},
@@ -6035,7 +6036,7 @@ In this paper we describe Valgrind, a DBI framework designed for building heavyw
 	www_section = {http://doi.acm.org/10.1145/1151659.1159952},
 	author = {Kumar, Sailesh and Dharmapurikar, Sarang and Yu, Fang and Crowley, Patrick and Turner, Jonathan}
 }
-@inproceedings {usability:weis2006,
+@conference {usability:weis2006,
 	title = {Anonymity Loves Company: Usability and the Network Effect},
 	booktitle = {Proceedings of the Fifth Workshop on the Economics of Information Security (WEIS 2006)},
 	year = {2006},
@@ -6065,7 +6066,7 @@ This work has been partially supported by the INRIA DREI {\'E}quipe Associ{\'e}e
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.79.4460.pdf},
 	author = {Konstantinos Chatzikokolakis and Catuscia Palamidessi and Prakash Panangaden}
 }
-@inproceedings {Goyal:2006:AEF:1180405.1180418,
+@conference {Goyal:2006:AEF:1180405.1180418,
 	title = {Attribute-based encryption for fine-grained access control of encrypted data},
 	booktitle = {CCS{\textquoteright}06 - Proceedings of the 13th ACM Conference on Computer and Communications Security},
 	series = {CCS {\textquoteright}06},
@@ -6083,7 +6084,7 @@ This work has been partially supported by the INRIA DREI {\'E}quipe Associ{\'e}e
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/CCS\%2706\%20-\%20Attributed-based\%20encryption\%20for\%20fine-grained\%20access\%20control\%20of\%20encrypted\%20data.pdf},
 	author = {Goyal, Vipul and Pandey, Omkant and Amit Sahai and Waters, Brent}
 }
-@inproceedings {alpha-mixing:pet2006,
+@conference {alpha-mixing:pet2006,
 	title = {Blending Different Latency Traffic with Alpha-Mixing},
 	booktitle = {Proceedings of the Sixth Workshop on Privacy Enhancing Technologies (PET 2006)},
 	year = {2006},
@@ -6102,7 +6103,7 @@ Alpha-mixing is an approach that can be added to traditional batching strategies
 	author = {Roger Dingledine and Andrei Serjantov and Paul Syverson},
 	editor = {George Danezis and Philippe Golle}
 }
-@inproceedings {cramer06bootstrapping,
+@conference {cramer06bootstrapping,
 	title = {Bootstrapping Chord in Ad hoc Networks: Not Going Anywhere for a While},
 	booktitle = {Proceedings of the 3rd IEEE International Workshop on Mobile Peer-to-Peer Computing},
 	year = {2006},
@@ -6115,7 +6116,7 @@ Alpha-mixing is an approach that can be added to traditional batching strategies
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cramer06bootstrapping.pdf},
 	author = {Cramer, Curt and Thomas Fuhrmann}
 }
-@inproceedings {UREbreak06,
+@conference {UREbreak06,
 	title = {Breaking Four Mix-related Schemes Based on Universal Re-encryption},
 	booktitle = {Proceedings of Information Security Conference 2006},
 	year = {2006},
@@ -6129,7 +6130,7 @@ Alpha-mixing is an approach that can be added to traditional batching strategies
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/UREbreak06.pdf},
 	author = {George Danezis}
 }
-@inproceedings {morphmix:pet2006,
+@conference {morphmix:pet2006,
 	title = {Breaking the Collusion Detection Mechanism of MorphMix},
 	booktitle = {Proceedings of the Sixth Workshop on Privacy Enhancing Technologies (PET 2006)},
 	year = {2006},
@@ -6164,7 +6165,7 @@ Alpha-mixing is an approach that can be added to traditional batching strategies
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/BuildingAnASTopologyModel.pdf},
 	author = {M{\"u}hlbauer, Wolfgang and Feldmann, Anja and Maennel, Olaf and Roughan, Matthew and Uhlig, Steve}
 }
-@inproceedings {thiele06debruijn,
+@conference {thiele06debruijn,
 	title = {Churn Resistant de Bruijn Networks for Wireless on Demand Systems},
 	booktitle = {Proceedings of the Third Annual Conference on Wireless On demand Network Systems and Services},
 	year = {2006},
@@ -6188,7 +6189,7 @@ Alpha-mixing is an approach that can be added to traditional batching strategies
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/adams06.pdf},
 	author = {Carlisle Adams}
 }
-@inproceedings {2006_1,
+@conference {2006_1,
 	title = {Combating Hidden Action in Unstructured Peer-to-Peer Systems},
 	booktitle = {ChinaCom {\textquoteright}06. First International Conference on Communications and Networking in China},
 	year = {2006},
@@ -6241,7 +6242,7 @@ In this paper we review SSR{\textquoteright}s self-organizing features and demon
 	www_section = {http://www3.interscience.wiley.com/journal/109858517/abstract},
 	author = {Cramer Curt and Thomas Fuhrmann}
 }
-@inproceedings {1267366,
+@conference {1267366,
 	title = {Compare-by-hash: a reasoned analysis},
 	booktitle = {ATEC {\textquoteright}06: Proceedings of the annual conference on USENIX {\textquoteright}06 Annual Technical Conference},
 	year = {2006},
@@ -6282,7 +6283,7 @@ In this paper we review SSR{\textquoteright}s self-organizing features and demon
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ishai2006ca.pdf},
 	author = {Yuval Ishai and Eyal Kushilevitz and Rafail Ostrovsky and Amit Sahai}
 }
-@inproceedings {Grolimund:2006:CFT:1173705.1174355,
+@conference {Grolimund:2006:CFT:1173705.1174355,
 	title = {Cryptree: A Folder Tree Structure for Cryptographic File Systems},
 	booktitle = {SRDS{\textquoteright}06 - Proceedings of the 25th IEEE Symposium on Reliable Distributed Systems},
 	year = {2006},
@@ -6299,7 +6300,7 @@ In this paper we review SSR{\textquoteright}s self-organizing features and demon
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SRDS\%2706\%20-\%20Cryptree.pdf},
 	author = {Dominik Grolimund and Luzius Meisser and Stefan Schmid and Roger Wattenhofer}
 }
-@inproceedings {2006_6,
+@conference {2006_6,
 	title = {Curve25519: new Diffie-Hellman speed records},
 	booktitle = {PKC},
 	year = {2006},
@@ -6332,7 +6333,7 @@ In this paper we review SSR{\textquoteright}s self-organizing features and demon
 	doi = {http://dx.doi.org/10.1017/CBO9780511754258},
 	author = {Leonid Hurwicz and Stanley Reiter}
 }
-@inproceedings {Golle:sp2006,
+@conference {Golle:sp2006,
 	title = {Deterring Voluntary Trace Disclosure in Re-encryption Mix Networks},
 	booktitle = {Proceedings of the 2006 IEEE Symposium on Security and Privacy},
 	year = {2006},
@@ -6365,7 +6366,7 @@ In this paper we review SSR{\textquoteright}s self-organizing features and demon
 	author = {Dwork, Cynthia},
 	editor = {Bugliesi, Michele and Preneel, Bart and Sassone, Vladimiro and Wegener, Ingo}
 }
-@inproceedings {1143821,
+@conference {1143821,
 	title = {A distributed data caching framework for mobile ad hoc networks},
 	booktitle = {IWCMC {\textquoteright}06: Proceedings of the 2006 international conference on Wireless communications and mobile computing},
 	year = {2006},
@@ -6405,7 +6406,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Ghodsi\%20-\%20Distributed\%20k-ary\%20System.pdf},
 	author = {Ali Ghodsi}
 }
-@inproceedings {AhmedBoutaba2006DistributedPatternMatching,
+@conference {AhmedBoutaba2006DistributedPatternMatching,
 	title = {Distributed Pattern Matching: A Key to Flexible and Efficient P2P Search},
 	booktitle = {2006 IEEE/IFIP Network Operations and Management Symposium NOMS 2006},
 	year = {2006},
@@ -6419,7 +6420,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_section = {http://dx.doi.org/10.1109/NOMS.2006.1687551},
 	author = {Ahmed, R. and Boutaba, R.}
 }
-@inproceedings {sandberg06distrouting,
+@conference {sandberg06distrouting,
 	title = {Distributed Routing in Small-World Networks},
 	booktitle = {Algorithm Engineering and Experiments},
 	year = {2006},
@@ -6444,7 +6445,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_section = {http://www.springerlink.com/content/m8322m1006416270/},
 	author = {Celeste Campo and Carlos Garc{\'\i}a-Rubio}
 }
-@inproceedings {Md06e.:anonymous,
+@conference {Md06e.:anonymous,
 	title = {E.: Anonymous Secure Communication in Wireless Mobile Ad-hoc Networks},
 	booktitle = {In: Proceedings of the First International Conference on Ubiquitous Convergence Technology},
 	year = {2006},
@@ -6458,7 +6459,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.74.1585.pdf},
 	author = {Sk. Md. Mizanur Rahman and Atsuo Inomata and Takeshi Okamoto and Masahiro Mambo}
 }
-@inproceedings {danezis:weis2006,
+@conference {danezis:weis2006,
 	title = {The Economics of Mass Surveillance and the Questionable Value of Anonymous Communications},
 	booktitle = {Proceedings of the Fifth Workshop on the Economics of Information Security (WEIS 2006)},
 	year = {2006},
@@ -6487,7 +6488,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_section = {http://portal.acm.org/citation.cfm?id=1151692$\#$},
 	author = {Kenneth Barr and Asanovi{\'c}, Krste}
 }
-@inproceedings {1143660,
+@conference {1143660,
 	title = {Estimation based erasure-coding routing in delay tolerant networks},
 	booktitle = {IWCMC {\textquoteright}06: Proceedings of the 2006 international conference on Wireless communications and mobile computing},
 	year = {2006},
@@ -6520,7 +6521,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/epost-eurosys2006.pdf},
 	author = {Mislove, Alan and Post, Ansley and Haeberlen, Andreas and Peter Druschel}
 }
-@inproceedings {guha6ess,
+@conference {guha6ess,
 	title = {An Experimental Study of the Skype Peer-to-Peer VoIP System},
 	booktitle = {IPTPS{\textquoteright}06 - Proceedings of The 5th International Workshop on Peer-to-Peer Systems },
 	year = {2006},
@@ -6533,7 +6534,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IPTPS\%2706\%20-\%20Skype\%20p2p\%20VoIP\%20System.pdf},
 	author = {Saikat Guha and Daswani, Neil and Jain, Ravi}
 }
-@inproceedings {Saito:2006:FTI:1130897.1131000,
+@conference {Saito:2006:FTI:1130897.1131000,
 	title = {Fair Trading of Information: A Proposal for the Economics of Peer-to-Peer Systems},
 	booktitle = {ARES{\textquoteright}06. Proceedings of the First International Conference on Availability, Reliability and Security},
 	year = {2006},
@@ -6550,7 +6551,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ARES\%2706\%20-\%20Fair\%20Trading\%20of\%20Information.pdf},
 	author = {Saito, Kenji and Morino, Eiichi and Murai, Jun}
 }
-@inproceedings {Saito:2006:FTI:1130897.1131000,
+@conference {Saito:2006:FTI:1130897.1131000,
 	title = {Fair Trading of Information: A Proposal for the Economics of Peer-to-Peer Systems},
 	booktitle = {ARES{\textquoteright}06. Proceedings of the First International Conference on Availability, Reliability and Security},
 	year = {2006},
@@ -6582,7 +6583,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Fireflies.pdf},
 	author = {H{\r a}vard Johansen and Allavena, Andr{\'e} and Robbert Van Renesse}
 }
-@inproceedings {Locher06freeriding,
+@conference {Locher06freeriding,
 	title = {Free Riding in BitTorrent is Cheap},
 	booktitle = {In HotNets},
 	year = {2006},
@@ -6592,7 +6593,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.67.9307.pdf},
 	author = {Thomas Locher and Patrick Moor and Stefan Schmid and Roger Wattenhofer}
 }
-@inproceedings {Grolimund06havelaar:a,
+@conference {Grolimund06havelaar:a,
 	title = {Havelaar: A Robust and Efficient Reputation System for Active Peer-to-Peer Systems},
 	booktitle = {NetEcon{\textquoteright}06. 1st Workshop on the Economics of Networked Systems Ann Arbor},
 	year = {2006},
@@ -6603,7 +6604,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NetEcon\%2706\%20-\%20Harvelaar.pdf},
 	author = {Dominik Grolimund and Luzius Meisser and Stefan Schmid and Roger Wattenhofer}
 }
-@inproceedings {HotOrNot,
+@conference {HotOrNot,
 	title = {Hot or Not: Revealing Hidden Services by their Clock Skew},
 	booktitle = {Proceedings of CCS 2006},
 	year = {2006},
@@ -6618,7 +6619,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/HotOrNot.pdf},
 	author = {Steven J. Murdoch}
 }
-@inproceedings {clonewars,
+@conference {clonewars,
 	title = {How to win the clonewars: efficient periodic n-times anonymous authentication},
 	booktitle = {Proceedings of the 13th ACM conference on Computer and communications security (CCS 2006)},
 	year = {2006},
@@ -6634,7 +6635,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/clonewars.pdf},
 	author = {Jan Camenisch and Susan Hohenberger and Markulf Kohlweiss and Anna Lysyanskaya and Mira Meyerovich}
 }
-@inproceedings {1157518,
+@conference {1157518,
 	title = {iDIBS: An Improved Distributed Backup System},
 	booktitle = {ICPADS {\textquoteright}06: Proceedings of the 12th International Conference on Parallel and Distributed Systems},
 	year = {2006},
@@ -6650,7 +6651,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.94.4826.pdf},
 	author = {Morcos, Faruck and Chantem, Thidapat and Little, Philip and Gasiba, Tiago and Thain, Douglas}
 }
-@inproceedings {clayton:pet2006,
+@conference {clayton:pet2006,
 	title = {Ignoring the Great Firewall of China},
 	booktitle = {Proceedings of the Sixth Workshop on Privacy Enhancing Technologies (PET 2006)},
 	year = {2006},
@@ -6667,7 +6668,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	author = {Richard Clayton and Steven J. Murdoch and Robert N. M. Watson},
 	editor = {George Danezis and Philippe Golle}
 }
-@inproceedings { kutzner06igor,
+@conference { kutzner06igor,
 	title = {The IGOR File System for Efficient Data Distribution in the GRID},
 	booktitle = {Proceedings of the Cracow Grid Workshop CGW 2006},
 	year = {2006},
@@ -6679,7 +6680,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/kutzner06igor.pdf},
 	author = {Kendy Kutzner and Thomas Fuhrmann}
 }
-@inproceedings {conf/infocom/StutzbachR06,
+@conference {conf/infocom/StutzbachR06,
 	title = {Improving Lookup Performance Over a Widely-Deployed DHT},
 	booktitle = {INFOCOM},
 	year = {2006},
@@ -6691,7 +6692,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/infocom06-kad.pdf},
 	author = {Stutzbach, Daniel and Rejaie, Reza}
 }
-@inproceedings {Pai06improvingrobustness,
+@conference {Pai06improvingrobustness,
 	title = {Improving Robustness of Peer-to-Peer Streaming with Incentives},
 	booktitle = {NetEcon{\textquoteright}06. 1st Workshop on the Economics of Networked Systems},
 	year = {2006},
@@ -6704,7 +6705,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NetEcon\%2706\%20-\%20Improving\%20robustness\%20of\%20p2p\%20streaming.pdf},
 	author = {Vinay Pai and Alexander E. Mohr}
 }
-@inproceedings {ciaccio:pet2006,
+@conference {ciaccio:pet2006,
 	title = {Improving Sender Anonymity in a Structured Overlay with Imprecise Routing},
 	booktitle = {Proceedings of the Sixth Workshop on Privacy Enhancing Technologies (PET 2006)},
 	year = {2006},
@@ -6722,7 +6723,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	author = {Giuseppe Ciaccio},
 	editor = {George Danezis and Philippe Golle}
 }
-@inproceedings {2006_11,
+@conference {2006_11,
 	title = {Improving traffic locality in BitTorrent via biased neighbor selection},
 	booktitle = {Proceedings of the 26th IEEE International Conference on Distributed Computing Systems},
 	year = {2006},
@@ -6739,7 +6740,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ICDCS\%2706\%20-\%20Improving\%20traffic\%20locality\%20in\%20BitTorrent.pdf},
 	author = {Ruchir Bindal and Pei Cao and William Chan and Jan Medved and George Suwala and Tony Bates and Amy Zhang}
 }
-@inproceedings {Feigenbaum:2006:IIR:1134707.1134722,
+@conference {Feigenbaum:2006:IIR:1134707.1134722,
 	title = {Incentive-compatible interdomain routing},
 	booktitle = {EC{\textquoteright}06. Proceedings of the 7th ACM Conference on Electronic Commerce},
 	series = {EC {\textquoteright}06},
@@ -6782,7 +6783,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WrightMM06.pdf},
 	author = {Charles Wright and Fabian Monrose and Gerald M. Masson}
 }
-@inproceedings {Liberatore:2006,
+@conference {Liberatore:2006,
 	title = {Inferring the Source of Encrypted HTTP Connections},
 	booktitle = {Proceedings of the 13th ACM conference on Computer and Communications Security (CCS 2006)},
 	year = {2006},
@@ -6828,7 +6829,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	author = {Kirsch, Adam and Mitzenmacher, Michael},
 	editor = {Azar, Yossi and Erlebach, Thomas}
 }
-@inproceedings {cview:pet2006,
+@conference {cview:pet2006,
 	title = {Linking Anonymous Transactions: The Consistent View Attack},
 	booktitle = {Proceedings of the Sixth Workshop on Privacy Enhancing Technologies (PET 2006)},
 	year = {2006},
@@ -6846,7 +6847,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	author = {Andreas Pashalidis and Bernd Meyer},
 	editor = {George Danezis and Philippe Golle}
 }
-@inproceedings {di06linyphi,
+@conference {di06linyphi,
 	title = {Linyphi: An IPv6-Compatible Implementation of SSR},
 	booktitle = {Proceedings of the Third International Workshop on Hot Topics in Peer-to-Peer Systems},
 	year = {2006},
@@ -6859,7 +6860,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/di06linyphi.pdf},
 	author = {Di, Pengfei and Massimiliano Marcon and Thomas Fuhrmann}
 }
-@inproceedings {hs-attack06,
+@conference {hs-attack06,
 	title = {Locating Hidden Servers},
 	booktitle = {Proceedings of the 2006 IEEE Symposium on Security and Privacy},
 	year = {2006},
@@ -6874,7 +6875,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/hs-attack06.pdf},
 	author = {Lasse {\O}verlier and Paul Syverson}
 }
-@inproceedings {icdcs2006:m2,
+@conference {icdcs2006:m2,
 	title = {M2: Multicasting Mixes for Efficient and Anonymous Communication},
 	booktitle = {Proceedings of the 26th IEEE Conference on Distributed Computing Systems},
 	year = {2006},
@@ -6887,7 +6888,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/icdcs2006-m2.pdf},
 	author = {Ginger Perng and Michael K. Reiter and Chenxi Wang}
 }
-@inproceedings {ShWa-Relationship,
+@conference {ShWa-Relationship,
 	title = {Measuring Relationship Anonymity in Mix Networks},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2006)},
 	year = {2006},
@@ -6945,7 +6946,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGCOMM\%20Comput.\%20Commun.\%20Rev\%20-\%20Network\%20Coding\%3A\%20an\%20Instant\%20Primer.pdf},
 	author = {Fragouli, Christina and Jean-Yves Le Boudec and J{\"o}rg Widmer}
 }
-@inproceedings {wpes06:heydt-benjamin,
+@conference {wpes06:heydt-benjamin,
 	title = {Nonesuch: a mix network with sender unobservability},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2006)},
 	year = {2006},
@@ -6961,7 +6962,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/wpes06-heydt-benjamin.pdf},
 	author = {Andrei Serjantov and Benessa Defend}
 }
-@inproceedings {Tati06onobject,
+@conference {Tati06onobject,
 	title = {On Object Maintenance in Peer-to-Peer Systems},
 	booktitle = {IPTPS{\textquoteright}06 - Proceedings of the 5th International Workshop on Peer-to-Peer Systems},
 	year = {2006},
@@ -6972,7 +6973,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IPTPS\%2706\%20-\%20On\%20object\%20maintenance\%20in\%20p2p\%20systems.pdf},
 	author = {Kiran Tati and Geoffrey M. Voelker}
 }
-@inproceedings {1128335,
+@conference {1128335,
 	title = {OmniStore: A system for ubiquitous personal storage management},
 	booktitle = {PERCOM {\textquoteright}06: Proceedings of the Fourth Annual IEEE International Conference on Pervasive Computing and Communications},
 	year = {2006},
@@ -6987,7 +6988,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.96.4283.pdf},
 	author = {Alexandros Karypidis and Spyros Lalis}
 }
-@inproceedings {Fitzi:2006:OEM:1146381.1146407,
+@conference {Fitzi:2006:OEM:1146381.1146407,
 	title = {Optimally efficient multi-valued byzantine agreement},
 	booktitle = {Proceedings of the twenty-fifth annual ACM symposium on Principles of distributed computing},
 	series = {PODC {\textquoteright}06},
@@ -7003,7 +7004,7 @@ The algorithms have been implemented in a middleware called the Distributed k-ar
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/FitHir06.pdf},
 	author = {Fitzi, Matthias and Hirt, Martin}
 }
-@inproceedings {2006_13,
+@conference {2006_13,
 	title = {Our Data, Ourselves: Privacy via Distributed Noise Generation},
 	booktitle = {Proceedings of the 24th Annual International Conference on The Theory and Applications of Cryptographic Techniques},
 	year = {2006},
@@ -7047,7 +7048,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Marx\%20-\%20Parameterized\%20graph\%20separation\%20problems.pdf},
 	author = {Marx, D{\'a}niel}
 }
-@inproceedings {Aekaterinidis2006PastryStrings,
+@conference {Aekaterinidis2006PastryStrings,
 	title = {PastryStrings: A Comprehensive Content-Based Publish/Subscribe DHT Network},
 	booktitle = {Proceedings of the 26th IEEE International Conference on Distributed Computing Systems},
 	series = {ICDCS {\textquoteright}06},
@@ -7061,7 +7062,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	www_section = {http://dx.doi.org/10.1109/ICDCS.2006.63},
 	author = {Aekaterinidis, Ioannis and Triantafillou, Peter}
 }
-@inproceedings {Massoulie:2006:PCS:1146381.1146402,
+@conference {Massoulie:2006:PCS:1146381.1146402,
 	title = {Peer counting and sampling in overlay networks: random walk methods},
 	booktitle = {PODC {\textquoteright}06 - Proceedings of the 25th Annual ACM Symposium on Principles of Distributed Computing},
 	series = {PODC {\textquoteright}06},
@@ -7079,7 +7080,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/PODC\%2706\%20-\%20Peer\%20counting\%20and\%20sampling\%20in\%20overlay\%20networks.pdf},
 	author = {Massouli{\'e}, Laurent and Erwan Le Merrer and Anne-Marie Kermarrec and Ganesh, Ayalvadi}
 }
-@inproceedings {2006_14,
+@conference {2006_14,
 	title = {Peer to peer size estimation in large and dynamic networks: A comparative study},
 	booktitle = {HPDC{\textquoteright}06 - 15th IEEE International Symposium on High Performance Distributed Computing},
 	year = {2006},
@@ -7094,7 +7095,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/HPDC\%2706\%20-\%20Peer\%20to\%20peer\%20size\%20estimation\%20in\%20large\%20and\%20dynamic\%20networks.pdf},
 	author = {Erwan Le Merrer and Anne-Marie Kermarrec and Massouli{\'e}, Laurent}
 }
-@inproceedings {1161264,
+@conference {1161264,
 	title = {Performance evaluation of chord in mobile ad hoc networks},
 	booktitle = {MobiShare {\textquoteright}06: Proceedings of the 1st international workshop on Decentralized resource sharing in mobile computing and networking},
 	year = {2006},
@@ -7122,7 +7123,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/plush.pdf},
 	author = {Albrecht, J. and Tuttle, C. and Snoeren, A.C. and Vahdat, A.}
 }
-@inproceedings {heydt-benjamin:pet2006,
+@conference {heydt-benjamin:pet2006,
 	title = {Privacy for Public Transportation},
 	booktitle = {Proceedings of the Sixth Workshop on Privacy Enhancing Technologies (PET 2006)},
 	year = {2006},
@@ -7140,7 +7141,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	author = {Thomas S. Heydt-Benjamin and Hee-Jin Chae and Benessa Defend and Kevin Fu},
 	editor = {George Danezis and Philippe Golle}
 }
-@inproceedings {2006_15,
+@conference {2006_15,
 	title = {Privacy Preserving Nearest Neighbor Search},
 	booktitle = {Data Mining Workshops, 2006. ICDM Workshops 2006. Sixth IEEE International Conference on},
 	year = {2006},
@@ -7151,7 +7152,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/PrivacyPreserving2006Shaneck.pdf},
 	author = {Shaneck, M. and Yongdae Kim and Kumar, V.}
 }
-@inproceedings { pianese:pulse,
+@conference { pianese:pulse,
 	title = {PULSE, a Flexible P2P Live Streaming System},
 	booktitle = {INFOCOM{\textquoteright}06. Proceedings of the 25th IEEE International Conference on Computer Communications},
 	year = {2006},
@@ -7178,7 +7179,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann06pushing.pdf},
 	author = {Thomas Fuhrmann and Di, Pengfei and Kendy Kutzner and Cramer, Curt}
 }
-@inproceedings {1109601,
+@conference {1109601,
 	title = {The rainbow skip graph: a fault-tolerant constant-degree distributed data structure},
 	booktitle = {SODA {\textquoteright}06: Proceedings of the seventeenth annual ACM-SIAM symposium on Discrete algorithm},
 	year = {2006},
@@ -7256,7 +7257,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.101.4674.pdf},
 	author = {Mark Samuel Miller}
 }
-@inproceedings {Salsa,
+@conference {Salsa,
 	title = {Salsa: A Structured Approach to Large-Scale Anonymity},
 	booktitle = {Proceedings of CCS 2006},
 	year = {2006},
@@ -7271,7 +7272,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Salsa.pdf},
 	author = {Arjun Nambiar}
 }
-@inproceedings {2006_18,
+@conference {2006_18,
 	title = {Scalable Routing in Sensor Actuator Networks with Churn},
 	booktitle = {Sensor and Ad Hoc Communications and Networks, 2006. SECON {\textquoteright}06. 2006 3rd Annual IEEE Communications Society on },
 	year = {2006},
@@ -7282,7 +7283,7 @@ two shallow circuits: one for generating many arbitrarily but identically biased
 	doi = {10.1109/SAHCN.2006.288406 },
 	www_section = {http://ieeexplore.ieee.org/Xplore/login.jsp?url=http\%3A\%2F\%2Fieeexplore.ieee.org\%2Fiel5\%2F4068086\%2F4068087\%2F04068105.pdf\%3Farnumber\%3D4068105\&authDecision=-203}
 }
-@inproceedings {Atallah2006,
+@conference {Atallah2006,
 	title = {Secure Collaborative Planning, Forecasting, and Replenishment},
 	booktitle = {Proceedings of Multi-Echelon/Public Applications of Supply Chain Management Conference},
 	year = {2006},
@@ -7307,7 +7308,7 @@ collaborative forecasting; (3) we demonstrate that our protocols are not only se
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/brands06.pdf},
 	author = {Stefan Brands}
 }
-@inproceedings {kutzner06securessr,
+@conference {kutzner06securessr,
 	title = {Securing the Scalable Source Routing Protocol},
 	booktitle = {Proceedings of the World Telecommunications Congress 2006},
 	year = {2006},
@@ -7319,7 +7320,7 @@ collaborative forecasting; (3) we demonstrate that our protocols are not only se
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/kutzner06securessr.pdf},
 	author = {Kendy Kutzner and Christian Wallenta and Thomas Fuhrmann}
 }
-@inproceedings {1158641,
+@conference {1158641,
 	title = {Security Considerations in Space and Delay Tolerant Networks},
 	booktitle = {SMC-IT {\textquoteright}06: Proceedings of the 2nd IEEE International Conference on Space Mission Challenges for Information Technology},
 	year = {2006},
@@ -7333,7 +7334,7 @@ collaborative forecasting; (3) we demonstrate that our protocols are not only se
 	www_section = {http://portal.acm.org/citation.cfm?id=1158336.1158641$\#$},
 	author = {Farrell, Stephen and Cahill, Vinny}
 }
-@inproceedings {tap:pet2006,
+@conference {tap:pet2006,
 	title = {On the Security of the Tor Authentication Protocol},
 	booktitle = {Proceedings of the Sixth Workshop on Privacy Enhancing Technologies (PET 2006)},
 	year = {2006},
@@ -7351,7 +7352,7 @@ collaborative forecasting; (3) we demonstrate that our protocols are not only se
 	author = {Ian Goldberg},
 	editor = {George Danezis and Philippe Golle}
 }
-@inproceedings {Karnstedt2006SimilarityQueries,
+@conference {Karnstedt2006SimilarityQueries,
 	title = {Similarity Queries on Structured Data in Structured Overlays},
 	booktitle = {Proceedings of the 22nd International Conference on Data Engineering Workshops},
 	series = {ICDEW {\textquoteright}06},
@@ -7373,7 +7374,7 @@ collaborative forecasting; (3) we demonstrate that our protocols are not only se
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/meis-paper04.pdf},
 	author = {Thomas Fuhrmann}
 }
-@inproceedings {1170307,
+@conference {1170307,
 	title = {Storage Tradeoffs in a Collaborative Backup Service for Mobile Devices},
 	booktitle = {EDCC {\textquoteright}06: Proceedings of the Sixth European Dependable Computing Conference},
 	year = {2006},
@@ -7416,7 +7417,7 @@ collaborative forecasting; (3) we demonstrate that our protocols are not only se
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/netgames.pdf},
 	author = {Eitan Altman and Thomas Boulogne and Rachid El-Azouzi and Tania Jim{\'e}nez and Laura Wynter}
 }
-@inproceedings {Yu:2006:SDA:1159913.1159945,
+@conference {Yu:2006:SDA:1159913.1159945,
 	title = {SybilGuard: defending against sybil attacks via social networks},
 	booktitle = {SIGCOMM{\textquoteright}06. Proceedings of the 2006 conference on Applications, Technologies, Architectures, and Protocols for Computer Communications},
 	series = {SIGCOMM {\textquoteright}06},
@@ -7449,7 +7450,7 @@ collaborative forecasting; (3) we demonstrate that our protocols are not only se
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Marti-ElsevierScienceSubmitted05_0.pdf},
 	author = {Marti, Sergio and Hector Garcia-Molina}
 }
-@inproceedings {ShWa-Timing06,
+@conference {ShWa-Timing06,
 	title = {Timing Analysis in Low-Latency Mix Networks: Attacks and Defenses},
 	booktitle = {Proceedings of ESORICS 2006},
 	year = {2006},
@@ -7464,7 +7465,7 @@ collaborative forecasting; (3) we demonstrate that our protocols are not only se
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ShWa-Timing06.pdf},
 	author = {Vitaly Shmatikov and Ming-Hsui Wang}
 }
-@inproceedings {conf/infocom/SunHYL06,
+@conference {conf/infocom/SunHYL06,
 	title = {A Trust Evaluation Framework in Distributed Networks: Vulnerability Analysis and Defense Against Attacks},
 	booktitle = {INFOCOM},
 	year = {2006},
@@ -7496,7 +7497,7 @@ This result immediately implies solutions to other long-standing open problems s
 	author = {Damg{\'a}rd, Ivan and Fitzi, Matthias and Kiltz, Eike and Nielsen, JesperBuus and Toft, Tomas},
 	editor = {Halevi, Shai and Rabin, Tal}
 }
-@inproceedings {Stutzbach:2006:UCP:1177080.1177105,
+@conference {Stutzbach:2006:UCP:1177080.1177105,
 	title = {Understanding churn in peer-to-peer networks},
 	booktitle = {IMC{\textquoteright}06. Proceedings of the 6th ACM SIGCOMM Conference on Internet Measurement},
 	series = {IMC {\textquoteright}06},
@@ -7514,7 +7515,7 @@ This result immediately implies solutions to other long-standing open problems s
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IMC\%2706\%20-\%20Understanding\%20churn\%20in\%20p2p\%20networks.pdf},
 	author = {Stutzbach, Daniel and Rejaie, Reza}
 }
-@inproceedings {valet:pet2006,
+@conference {valet:pet2006,
 	title = {Valet Services: Improving Hidden Servers with a Personal Touch},
 	booktitle = {Proceedings of the Sixth Workshop on Privacy Enhancing Technologies (PET 2006)},
 	year = {2006},
@@ -7558,7 +7559,7 @@ This result immediately implies solutions to other long-standing open problems s
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.102.5368.pdf},
 	author = {J{\"o}rg Widmer}
 }
-@inproceedings {pet05-borisov,
+@conference {pet05-borisov,
 	title = {An Analysis of Parallel Mixing with Attacker-Controlled Inputs},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2005)},
 	year = {2005},
@@ -7595,7 +7596,7 @@ This result immediately implies solutions to other long-standing open problems s
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/CSD-05-1390.pdf},
 	author = {Borisov, Nikita and Waddle, Jason}
 }
-@inproceedings {sofem05-Klonowski,
+@conference {sofem05-Klonowski,
 	title = {Anonymous Communication with On-line and Off-line Onion Encoding},
 	booktitle = {Proceedings of Conference on Current Trends in Theory and Practice of Informatics (SOFSEM 2005)},
 	year = {2005},
@@ -7611,7 +7612,7 @@ We show that applying encoding based on universal re-encryption can solve many o
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/sofem05-Klonowski.pdf},
 	author = {Marek Klonowski and Miroslaw Kutylowski and Filip Zagorski}
 }
-@inproceedings {1080833,
+@conference {1080833,
 	title = {Architecture and evaluation of an unplanned 802.11b mesh network},
 	booktitle = {MobiCom {\textquoteright}05: Proceedings of the 11th annual international conference on Mobile computing and networking},
 	year = {2005},
@@ -7644,7 +7645,7 @@ We show that applying encoding based on universal re-encryption can solve many o
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.80.713.pdf},
 	author = {Aiyer, Amitanand S. and Lorenzo Alvisi and Clement, Allen and Dahlin, Mike and Martin, Jean-Philippe and Porth, Carl}
 }
-@inproceedings {Pouwelse05thebittorrent,
+@conference {Pouwelse05thebittorrent,
 	title = {The BiTtorrent P2P File-sharing System: Measurements and Analysis},
 	booktitle = {IPTPS{\textquoteright}05. Proceedings of the 4th International Workshop on Peer-To-Peer Systems},
 	series = {Lecture Notes in Computer Science},
@@ -7661,7 +7662,7 @@ We show that applying encoding based on universal re-encryption can solve many o
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IPTPS\%2705\%20-\%20The\%20BitTorrent\%3A\%20measurements\%20and\%20analysis.pdf},
 	author = {Johan Pouwelse and Garbacki, Pawel and Epema, Dick H. J. and Henk J. Sips}
 }
-@inproceedings {ih05-Luke,
+@conference {ih05-Luke,
 	title = {On Blending Attacks For Mixes with Memory},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2005)},
 	year = {2005},
@@ -7677,7 +7678,7 @@ We show that applying encoding based on universal re-encryption can solve many o
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ih05-Luke.pdf},
 	author = {Luke O{\textquoteright}Connor}
 }
-@inproceedings {1108067,
+@conference {1108067,
 	title = {Boundary Chord: A Novel Peer-to-Peer Algorithm for Replica Location Mechanism in Grid Environment},
 	booktitle = {ISPAN {\textquoteright}05: Proceedings of the 8th International Symposium on Parallel Architectures,Algorithms and Networks},
 	year = {2005},
@@ -7706,7 +7707,7 @@ We show that applying encoding based on universal re-encryption can solve many o
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/0409026v1.pdf},
 	author = {Henry D. Pfister and Igal Sason and R{\"u}diger L. Urbanke}
 }
-@inproceedings {Zhuang05cashmere:resilient,
+@conference {Zhuang05cashmere:resilient,
 	title = {Cashmere: Resilient anonymous routing},
 	booktitle = {In Proc. of NSDI},
 	year = {2005},
@@ -7717,7 +7718,7 @@ We show that applying encoding based on universal re-encryption can solve many o
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cashmere.pdf},
 	author = {Li Zhuang and Feng Zhou and Ben Y. Zhao and Antony Rowstron}
 }
-@inproceedings {ih05-csispir,
+@conference {ih05-csispir,
 	title = {Censorship Resistance Revisited},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2005)},
 	year = {2005},
@@ -7733,7 +7734,7 @@ We show that applying encoding based on universal re-encryption can solve many o
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ih05-csispir.pdf},
 	author = {Ginger Perng and Michael K. Reiter and Chenxi Wang}
 }
-@inproceedings {2005_0,
+@conference {2005_0,
 	title = {Chainsaw: Eliminating Trees from Overlay Multicast},
 	booktitle = {4th International Workshop},
 	series = {Lecture Notes in Computer Science (Peer-to-peer Systems IV)},
@@ -7763,7 +7764,7 @@ We show that applying encoding based on universal re-encryption can solve many o
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/imc05-tcpnat.pdf},
 	author = {Saikat Guha and Paul Francis}
 }
-@inproceedings {chl05-full:eurocrypt2005,
+@conference {chl05-full:eurocrypt2005,
 	title = {Compact E-Cash},
 	booktitle = {Proceedings of EUROCRYPT 2005},
 	series = {Lecture Notes in Computer Science},
@@ -7782,7 +7783,7 @@ We then extend our scheme to our second result, the first e-cash scheme that pro
 	author = {Jan Camenisch and Susan Hohenberger and Anna Lysyanskaya},
 	editor = {Ronald Cramer}
 }
-@inproceedings {ih05-danezisclulow,
+@conference {ih05-danezisclulow,
 	title = {Compulsion Resistant Anonymous Communications},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2005)},
 	year = {2005},
@@ -7812,7 +7813,7 @@ We then extend our scheme to our second result, the first e-cash scheme that pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Journal\%20of\%20Public\%20Economics\%20-\%20Bolton\%2C\%20Katok\%20\%26\%20Ockenfels.pdf},
 	author = {Gary E. Bolton and Elena Katok and Axel Ockenfels}
 }
-@inproceedings {2005_2,
+@conference {2005_2,
 	title = {Correctness of a gossip based membership protocol},
 	booktitle = {PDOC{\textquoteright}05},
 	year = {2005},
@@ -7821,7 +7822,7 @@ We then extend our scheme to our second result, the first e-cash scheme that pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/gossip-podc05.pdf},
 	author = {Andre Allavena and Alan Demers and John E. Hopcroft}
 }
-@inproceedings {Moore05counteringhidden-action,
+@conference {Moore05counteringhidden-action,
 	title = {Countering Hidden-action Attacks on Networked Systems},
 	booktitle = {WEIS{\textquoteright}05. Fourth Workshop on the Economics of Information Security},
 	year = {2005},
@@ -7833,7 +7834,7 @@ We then extend our scheme to our second result, the first e-cash scheme that pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WEIS\%2705\%20-\%20Moore\%20-\%20Counterin\%20hidden-action\%20attacks.pdf},
 	author = {Tyler Moore}
 }
-@inproceedings {Massoulie:2005:CRS:1064212.1064215,
+@conference {Massoulie:2005:CRS:1064212.1064215,
 	title = {Coupon replication systems},
 	booktitle = {SIGMETRICS{\textquoteright}05. Proceedings of the 2005 ACM SIGMETRICS International Conference on Measurement and Modeling of Computer Systems},
 	series = {SIGMETRICS {\textquoteright}05},
@@ -7851,7 +7852,7 @@ We then extend our scheme to our second result, the first e-cash scheme that pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGMETRICS\%2705\%20-\%20Coupon\%20replication\%20systems.pdf},
 	author = {Massouli{\'e}, Laurent and Vojnovi{\'c}, Milan}
 }
-@inproceedings {Kostoulas:2005:DSS:1097873.1098292,
+@conference {Kostoulas:2005:DSS:1097873.1098292,
 	title = {Decentralized Schemes for Size Estimation in Large and Dynamic Groups},
 	booktitle = {NCA{\textquoteright}05 - Proceedings of the 4th IEEE International Symposium on Network Computing and Applications},
 	year = {2005},
@@ -7868,7 +7869,7 @@ We then extend our scheme to our second result, the first e-cash scheme that pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NCA\%2705\%20-\%20Decentralized\%20Schemes\%20for\%20Size\%20Estimation\%20in\%20Large\%20and\%20Dynamic\%20Groups.pdf},
 	author = {Kostoulas, Dionysios and Psaltoulis, Dimitrios and Indranil Gupta and Kenneth P. Birman and Alan Demers}
 }
-@inproceedings {You05deepstore:,
+@conference {You05deepstore:,
 	title = {Deep Store: An archival storage system architecture},
 	booktitle = {In Proceedings of the 21st International Conference on Data Engineering (ICDE{\textquoteright}05)},
   year = {2005},
@@ -7883,7 +7884,7 @@ We then extend our scheme to our second result, the first e-cash scheme that pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.76.5241.pdf},
 	author = {Lawrence L. You and Kristal T. Pollack and Darrell D. E. Long}
 }
-@inproceedings {Electrical04designingincentives,
+@conference {Electrical04designingincentives,
 	title = {Designing Incentives for Peer-to-Peer Routing},
 	booktitle = {INFOCOM 2005, 24th Annual Joint Conference of the IEEE Computer and Communications Societies},
 	volume = {1},
@@ -7901,7 +7902,7 @@ We then extend our scheme to our second result, the first e-cash scheme that pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOM\%2705\%20-\%20Designing\%20incentives\%20for\%20peer-to-peer\%20routing.pdf},
 	author = {Alberto Blanc and Yi-Kai Liu and Vahdat, Amin}
 }
-@inproceedings {1251207,
+@conference {1251207,
 	title = {Detecting BGP configuration faults with static analysis},
 	booktitle = {NSDI{\textquoteright}05: Proceedings of the 2nd conference on Symposium on Networked Systems Design \& Implementation},
 	year = {2005},
@@ -7917,7 +7918,7 @@ This paper describes the design and implementation of rcc, the router configurat
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.113.5668.pdf},
 	author = {Nick Feamster and Hari Balakrishnan}
 }
-@inproceedings {Khorshadi:2005:DPR:1090948.1091369,
+@conference {Khorshadi:2005:DPR:1090948.1091369,
 	title = {Determining the Peer Resource Contributions in a P2P Contract},
 	booktitle = {HOT-P2P 2005. Proceedings of the Second International Workshop on Hot Topics in Peer-to-Peer Systems},
 	year = {2005},
@@ -7949,7 +7950,7 @@ This paper describes the design and implementation of rcc, the router configurat
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/LNCS\%20-\%20Distributed\%20Hash\%20Tables.pdf},
 	author = {Klaus Wehrle and G{\"o}tz, Stefan and Rieche, Simon}
 }
-@inproceedings {2005_4,
+@conference {2005_4,
 	title = {An empirical study of free-riding behavior in the maze p2p file-sharing system},
 	booktitle = {Proceedings of the 4th international conference on Peer-to-Peer Systems},
 	year = {2005},
@@ -7976,7 +7977,7 @@ This paper describes the design and implementation of rcc, the router configurat
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.60.7750_0.pdf},
 	author = {Yoram Kulbak and Danny Bickson}
 }
-@inproceedings {Wang05erasure-codingbased,
+@conference {Wang05erasure-codingbased,
 	title = {Erasure-coding based routing for opportunistic networks},
 	year = {2005},
 	pages = {229{\textendash}236},
@@ -7989,7 +7990,7 @@ This paper describes the design and implementation of rcc, the router configurat
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.79.364.pdf},
 	author = {Wang, Yong and Sushant Jain and Martonosi, Margaret and Fall, Kevin}
 }
-@inproceedings {2005_5,
+@conference {2005_5,
 	title = {Exchange-based incentive mechanisms for peer-to-peer file sharing},
 	booktitle = {Proceedings of International Conference on Distributed Computing Systems 2004},
 	year = {2005},
@@ -8005,7 +8006,7 @@ This paper describes the design and implementation of rcc, the router configurat
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ICDCS\%2704.pdf},
 	author = {Kostas G. Anagnostakis and Michael B. Greenwald}
 }
-@inproceedings {conf/infocom/GollapudiSZ05,
+@conference {conf/infocom/GollapudiSZ05,
 	title = {Exploiting anarchy in networks: a game-theoretic approach to combining fairness and throughput},
 	booktitle = {INFOCOM 2005. Proceedings of the 24th Annual Joint Conference of the IEEE Computer and Communications Societies},
 	year = {2005},
@@ -8047,7 +8048,7 @@ This paper describes the design and implementation of rcc, the router configurat
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SBirrer-dhtBasedMulticast_0.pdf},
 	author = {Stefan Birrer and Fabian E. Bustamante}
 }
-@inproceedings {Wang05findingcollisions,
+@conference {Wang05findingcollisions,
 	title = {Finding Collisions in the Full SHA-1},
 	booktitle = {In Proceedings of Crypto},
 	year = {2005},
@@ -8075,7 +8076,7 @@ This paper describes the design and implementation of rcc, the router configurat
 	keywords = {generation, P2P, peer-to-peer networking},
 	author = {J{\"o}rg Ebersp{\"a}cher and R{\"u}diger Schollmeier}
 }
-@inproceedings {rhea2005fixing,
+@conference {rhea2005fixing,
 	title = {Fixing the embarrassing slowness of OpenDHT on PlanetLab},
 	booktitle = {Proc. of the Second USENIX Workshop on Real, Large Distributed Systems},
 	year = {2005},
@@ -8084,7 +8085,7 @@ This paper describes the design and implementation of rcc, the router configurat
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/opendht-fixing.pdf},
 	author = {Rhea, S. and Chun, B.G. and Kubiatowicz, J. and S Shenker}
 }
-@inproceedings {Fu::FlowMarking::2005,
+@conference {Fu::FlowMarking::2005,
 	title = {On Flow Marking Attacks in Wireless Anonymous Communication Networks},
 	booktitle = {Proceedings of the IEEE International Conference on Distributed Computing Systems (ICDCS)},
 	year = {2005},
@@ -8098,7 +8099,7 @@ This paper describes the design and implementation of rcc, the router configurat
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Fu--FlowMarking--2005.pdf},
 	author = {Xinwen Fu and Ye Zhu and Bryan Graham and Riccardo Bettati and Wei Zhao}
 }
-@inproceedings {camlys05,
+@conference {camlys05,
 	title = {A Formal Treatment of Onion Routing},
 	booktitle = {Proceedings of CRYPTO 2005},
 	year = {2005},
@@ -8132,7 +8133,7 @@ We provide a formal definition of onion-routing in the universally composable fr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IEEE\%20DSO\%20-\%20Free\%20riding\%20on\%20Gnutella\%20revisited.pdf},
 	author = {Daniel Hughes and Geoff Coulson and James Walkerdine}
 }
-@inproceedings {2005_6,
+@conference {2005_6,
 	title = {Fuzzy Identity-Based Encryption},
 	booktitle = {EUROCRYPT{\textquoteright}05 Workshop on the Theory and Application of of Cryptographic Techniques},
 	series = {Lecture Notes in Computer Science},
@@ -8166,7 +8167,7 @@ In this paper we present two constructions of Fuzzy IBE schemes. Our constructio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Jelasity\%2C\%20Montresor\%20\%26\%20Babaoglu\%20-\%20Gossip-based\%20aggregation.pdf},
 	author = {M{\'a}rk Jelasity and Alberto Montresor and Babaoglu, Ozalp}
 }
-@inproceedings {Godfrey05heterogeneityand,
+@conference {Godfrey05heterogeneityand,
 	title = {Heterogeneity and Load Balance in Distributed Hash Tables},
 	booktitle = {IN PROC. OF IEEE INFOCOM},
 	year = {2005},
@@ -8176,7 +8177,7 @@ In this paper we present two constructions of Fuzzy IBE schemes. Our constructio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/paper.pdf},
 	author = {Godfrey, Brighten and Ion Stoica}
 }
-@inproceedings {Feldman:2005:HMR:1064009.1064022,
+@conference {Feldman:2005:HMR:1064009.1064022,
 	title = {Hidden-action in multi-hop routing},
 	booktitle = {EC{\textquoteright}05. Proceedings of the 6th ACM Conference on Electronic Commerce},
 	series = {EC {\textquoteright}05},
@@ -8194,7 +8195,7 @@ In this paper we present two constructions of Fuzzy IBE schemes. Our constructio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/EC\%2705\%20-\%20Hidden-action\%20in\%20multi-hop\%20routing.pdf},
 	author = {Michal Feldman and John Chuang and Ion Stoica and S Shenker}
 }
-@inproceedings {IPTPS05,
+@conference {IPTPS05,
 	title = {High Availability in DHTs: Erasure Coding vs. Replication},
 	booktitle = {IPTPS{\textquoteright}05 - Proceedings of the 4th International Workshop in Peer-to-Peer Systems},
 	series = {Lecture Notes in Computer Science},
@@ -8210,7 +8211,7 @@ In this paper we present two constructions of Fuzzy IBE schemes. Our constructio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IPTPS\%2705\%20-\%20High\%20availability\%20in\%20DHTs\%3A\%20erasure\%20coding\%20vs.\%20replication.pdf},
 	author = {Rodrigues, Rodrigo and Barbara Liskov}
 }
-@inproceedings {Acedanski05howgood,
+@conference {Acedanski05howgood,
 	title = {How good is random linear coding based distributed networked storage?},
 	booktitle = {NetCod{\textquoteright}05 - First Workshop on Network Coding, Theory, and Applications},
 	year = {2005},
@@ -8236,7 +8237,7 @@ In this paper we present two constructions of Fuzzy IBE schemes. Our constructio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.68.7579.pdf},
 	author = {Stefan Z{\"o}ls and R{\"u}diger Schollmeier and Wolfgang Kellerer and Anthony Tarlano}
 }
-@inproceedings {1103797,
+@conference {1103797,
 	title = {Hydra: a platform for survivable and secure data storage systems},
 	booktitle = {StorageSS {\textquoteright}05: Proceedings of the 2005 ACM workshop on Storage security and survivability},
 	year = {2005},
@@ -8252,7 +8253,7 @@ In this paper we present two constructions of Fuzzy IBE schemes. Our constructio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/w8paper13.pdf},
 	author = {Lihao Xu}
 }
-@inproceedings {1095944,
+@conference {1095944,
 	title = {Impacts of packet scheduling and packet loss distribution on FEC Performances: observations and recommendations},
 	booktitle = {CoNEXT{\textquoteright}05: Proceedings of the 2005 ACM conference on Emerging network experiment and technology},
 	year = {2005},
@@ -8285,7 +8286,7 @@ In this paper we present two constructions of Fuzzy IBE schemes. Our constructio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.68.5832.pdf},
 	author = {Baumung, Peter and Martina Zitterbart and Kendy Kutzner}
 }
-@inproceedings {Jun:2005:IBI:1080192.1080199,
+@conference {Jun:2005:IBI:1080192.1080199,
 	title = {Incentives in BitTorrent Induce Free Riding},
 	booktitle = {P2PECON{\textquoteright}05. Proceedings of the 2005 ACM SIGCOMM Workshop on Economics of Peer-to-Peer Systems},
 	series = {P2PECON {\textquoteright}05},
@@ -8303,7 +8304,7 @@ In this paper we present two constructions of Fuzzy IBE schemes. Our constructio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/P2PECON\%2705\%20-\%20Incentives\%20in\%20BitTorrent\%20induce\%20free\%20riding.pdf},
 	author = {Jun, Seung and Ahamad, Mustaque}
 }
-@inproceedings {Andrade:2005:ICB:1080192.1080198,
+@conference {Andrade:2005:ICB:1080192.1080198,
 	title = {Influences on cooperation in BitTorrent communities},
 	booktitle = {P2PEcon{\textquoteright}05. Proceedings of the 2005 ACM SIGCOMM workshop on Economics of peer-to-peer systems},
 	series = {P2PECON {\textquoteright}05},
@@ -8328,7 +8329,7 @@ In this paper we present two constructions of Fuzzy IBE schemes. Our constructio
 	pages = {2543--2553},
 	author = {Yong Liu and Honggang Zhang and Weibo Gong and Don Towsley}
 }
-@inproceedings {cramer05isprp,
+@conference {cramer05isprp,
 	title = {ISPRP: A Message-Efficient Protocol for Initializing Structured P2P Networks},
 	booktitle = {Proceedings of the 24th IEEE International Performance, Computing, and Communications Conference (IPCCC)},
 	year = {2005},
@@ -8358,7 +8359,7 @@ In this paper we present two constructions of Fuzzy IBE schemes. Our constructio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.83.5920.pdf},
 	author = {Leonard, Derek and Rai, Vivek and Loguinov, Dmitri}
 }
-@inproceedings {esorics05-Klonowski,
+@conference {esorics05-Klonowski,
 	title = {Local View Attack on Anonymous Communication},
 	booktitle = {Proceedings of ESORICS 2005},
 	year = {2005},
@@ -8391,7 +8392,7 @@ Our results contradict some beliefs that the protocols mentioned guarantee anony
 	www_section = {http://portal.acm.org/citation.cfm?id=1042380$\#$},
 	author = {Yunhao Liu and Xiao, Li and Liu, Xiaomei and Ni, Lionel M. and Zhang, Xiaodong}
 }
-@inproceedings {torta05,
+@conference {torta05,
 	title = {Low-Cost Traffic Analysis of Tor},
 	booktitle = {Proceedings of the 2005 IEEE Symposium on Security and Privacy},
 	year = {2005},
@@ -8405,7 +8406,7 @@ Our results contradict some beliefs that the protocols mentioned guarantee anony
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/torta05.pdf},
 	author = {Steven J. Murdoch and George Danezis}
 }
-@inproceedings {Fiat05makingchord,
+@conference {Fiat05makingchord,
 	title = {Making chord robust to byzantine attacks},
 	booktitle = {In Proc. of the European Symposium on Algorithms (ESA)},
 	year = {2005},
@@ -8419,7 +8420,7 @@ Our results contradict some beliefs that the protocols mentioned guarantee anony
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/swarm.pdf},
 	author = {Amos Fiat and Jared Saia and Maxwell Young}
 }
-@inproceedings { wang:market-driven,
+@conference { wang:market-driven,
 	title = {Market-driven bandwidth allocation in selfish overlay networks},
 	booktitle = {INFOCOM{\textquoteright}05. Proceedings of the 24th IEEE International Conference on Computer Communications},
 	year = {2005},
@@ -8435,7 +8436,7 @@ Our results contradict some beliefs that the protocols mentioned guarantee anony
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOM\%2705\%20-\%20Market-driven\%20bandwidth\%20allocation.pdf},
 	author = {Weihong Wang and Baochun Li}
 }
-@inproceedings {Guo:2005:MAM:1251086.1251090,
+@conference {Guo:2005:MAM:1251086.1251090,
 	title = {Measurements, analysis, and modeling of BitTorrent-like systems},
 	booktitle = {IMC{\textquoteright}05. Proceedings of the 5th ACM SIGCOMM Conference on Internet Measurement},
 	series = {IMC {\textquoteright}05},
@@ -8451,7 +8452,7 @@ Our results contradict some beliefs that the protocols mentioned guarantee anony
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IMC\%2705\%20-\%20Measurement\%2C\%20analysis\%20and\%20modeling\%20of\%20BitTorrent-like\%20systems.pdf},
 	author = {Guo, Lei and Chen, Songqing and Xiao, Zhen and Tan, Enhua and Ding, Xiaoning and Zhang, Xiaodong}
 }
-@inproceedings {kutzner05overnet,
+@conference {kutzner05overnet,
 	title = {Measuring Large Overlay Networks - The Overnet Example},
 	booktitle = {Konferenzband der 14. Fachtagung Kommunikation in Verteilten Systemen (KiVS 2005)},
 	year = {2005},
@@ -8466,7 +8467,7 @@ This paper reports the results from a two week measurement of the entire Overnet
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/kutzner05overnet.pdf},
 	author = {Kendy Kutzner and Thomas Fuhrmann}
 }
-@inproceedings {pet05-serjantov,
+@conference {pet05-serjantov,
 	title = {Message Splitting Against the Partial Adversary},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2005)},
 	year = {2005},
@@ -8482,7 +8483,7 @@ This paper reports the results from a two week measurement of the entire Overnet
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/pet05-serjantov.pdf},
 	author = {Andrei Serjantov and Steven J. Murdoch}
 }
-@inproceedings {pet05-camenisch,
+@conference {pet05-camenisch,
 	title = {Mix-network with Stronger Security},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2005)},
 	year = {2005},
@@ -8497,7 +8498,7 @@ This paper reports the results from a two week measurement of the entire Overnet
 	www_section = {http://www.springerlink.com/content/v32m5122127m78v0/},
 	author = {Jan Camenisch and Anton Mityagin}
 }
-@inproceedings { gkantsidis:network,
+@conference { gkantsidis:network,
 	title = {Network coding for large scale content distribution},
 	booktitle = {INFOCOM{\textquoteright}05. Proceedings of the 24th IEEE International Conference on Computer Communications},
 	year = {2005},
@@ -8513,7 +8514,7 @@ This paper reports the results from a two week measurement of the entire Overnet
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOM\%2705\%20-\%20Network\%20coding\%20for\%20large\%20scale\%20content\%20distribution.pdf},
 	author = {Christos Gkantsidis and Pablo Rodriguez}
 }
-@inproceedings {Sanghavi:2005:NMF:1080192.1080200,
+@conference {Sanghavi:2005:NMF:1080192.1080200,
 	title = {A new mechanism for the free-rider problem},
 	booktitle = {P2PEcon{\textquoteright}05. Proceedings of the 2005 ACM SIGCOMM Workshop on Economics of Peer-to-Peer Systems},
 	series = {P2PECON {\textquoteright}05},
@@ -8531,7 +8532,7 @@ This paper reports the results from a two week measurement of the entire Overnet
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/P2PEcon\%2705\%20-\%20A\%20new\%20mechanism\%20for\%20the\%20free-rider\%20problem.pdf},
 	author = {Sanghavi, Sujay and Hajek, Bruce}
 }
-@inproceedings {1251532,
+@conference {1251532,
 	title = {Non-transitive connectivity and DHTs},
 	booktitle = {WORLDS{\textquoteright}05: Proceedings of the 2nd conference on Real, Large Distributed Systems},
 	year = {2005},
@@ -8557,7 +8558,7 @@ We introduce and implement Obfuscated Ciphertext Mixing, the obfuscation of a mi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cryptoeprint-2005-394.pdf},
 	author = {Ben Adida and Douglas Wikstr{\"o}m}
 }
-@inproceedings {Garcia05off-linekarma:,
+@conference {Garcia05off-linekarma:,
 	title = {Off-line Karma: A Decentralized Currency for Peer-to-peer and Grid Applications},
 	booktitle = {ACNS{\textquoteright}05. 3rd Applied Cryptography and Network Security Conference},
 	series = {Lecture Notes in Computer Science},
@@ -8574,7 +8575,7 @@ We introduce and implement Obfuscated Ciphertext Mixing, the obfuscation of a mi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ACNS\%2705\%20-\%20Garcia\%20\%26\%20Hoepman\%20-\%20Off-line\%20Karma.pdf},
 	author = {Flavio D. Garcia and Jaap-Henk Hoepman}
 }
-@inproceedings {2005_8,
+@conference {2005_8,
 	title = {OpenDHT: a public DHT service and its uses},
 	booktitle = {Proceedings of the 2005 conference on Applications, technologies, architectures, and protocols for computer communications},
 	series = {SIGCOMM {\textquoteright}05},
@@ -8620,7 +8621,7 @@ We introduce and implement Obfuscated Ciphertext Mixing, the obfuscation of a mi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/FGCS\%20-\%20P2P\%20Contracts\%3A\%20a\%20Framework\%20for\%20Resource\%20and\%20Service\%20Exchange.pdf},
 	author = {Dipak Ghosal and Benjamin K. Poon and Keith Kong}
 }
-@inproceedings { busca:pastis:,
+@conference { busca:pastis:,
 	title = {Pastis: A Highly-Scalable Multi-user Peer-to-Peer File System},
 	booktitle = {Euro-Par{\textquoteright}05 Parallel Processing},
 	year = {2005},
@@ -8637,7 +8638,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Euro-Par\%2705\%20-\%20Pastis.pdf},
 	author = {Jean-Michel Busca and Fabio Picconi and Pierre Sens}
 }
-@inproceedings {Massachusetts05peer-to-peercommunication,
+@conference {Massachusetts05peer-to-peercommunication,
 	title = {Peer-to-Peer Communication Across Network Address Translators},
 	booktitle = {ATEC05. Proceedings of the USENIX Annual Technical Conference},
 	year = {2005},
@@ -8661,7 +8662,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.72.8036.pdf},
 	author = {Thomas Fuhrmann and Till Harbaum}
 }
-@inproceedings {Ali:2005:PTA:1082473.1082631,
+@conference {Ali:2005:PTA:1082473.1082631,
 	title = {Preprocessing techniques for accelerating the DCOP algorithm ADOPT},
 	booktitle = {AAMAS{\textquoteright}05 - Proceedings of the fourth international joint conference on Autonomous agents and multiagent systems},
 	series = {AAMAS {\textquoteright}05},
@@ -8693,7 +8694,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/PrivacyPractices2005Jensen.pdf},
 	author = {Jensen, Carlos and Potts, Colin and Jensen, Christian}
 }
-@inproceedings {pet05-bissias,
+@conference {pet05-bissias,
 	title = {Privacy Vulnerabilities in Encrypted HTTP Streams},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2005)},
 	year = {2005},
@@ -8744,7 +8745,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	author = {Goethals, Bart and Laur, Sven and Lipmaa, Helger and Mielik{\"a}inen, Taneli},
 	editor = {Park, Choon-sik and Chee, Seongtaek}
 }
-@inproceedings {GHPvR05,
+@conference {GHPvR05,
 	title = {Provable Anonymity},
 	booktitle = {Proceedings of the 3rd ACM Workshop on Formal Methods in Security Engineering (FMSE05)},
 	year = {2005},
@@ -8758,7 +8759,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/GHPvR05.pdf},
 	author = {Flavio D. Garcia and Ichiro Hasuo and Wolter Pieters and Peter van Rossum}
 }
-@inproceedings {ih05-Klonowski,
+@conference {ih05-Klonowski,
 	title = {Provable Anonymity for Networks of Mixes},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2005)},
 	year = {2005},
@@ -8774,7 +8775,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ih05-Klonowski.pdf},
 	author = {Marek Klonowski and Miroslaw Kutylowski}
 }
-@inproceedings {cramer05pns,
+@conference {cramer05pns,
 	title = {Proximity Neighbor Selection for a DHT in Wireless Multi-Hop Networks},
 	booktitle = {Proceedings of the 5th IEEE International Conference on Peer-to-Peer Computing},
 	year = {2005},
@@ -8791,7 +8792,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cramer05pns.pdf},
 	author = {Cramer, Curt and Thomas Fuhrmann}
 }
-@inproceedings {sassaman:wpes2005,
+@conference {sassaman:wpes2005,
 	title = {The Pynchon Gate: A Secure Method of Pseudonymous Mail Retrieval},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2005)},
 	year = {2005},
@@ -8807,7 +8808,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/sassaman-wpes2005.pdf},
 	author = {Len Sassaman and Bram Cohen and Nick Mathewson}
 }
-@inproceedings {1524297,
+@conference {1524297,
 	title = {Query Forwarding Algorithm Supporting Initiator Anonymity in GNUnet},
 	booktitle = {Parallel and Distributed Systems, 2005. Proceedings. 11th International Conference on},
 	volume = {2},
@@ -8830,7 +8831,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/bloomfilter.pdf},
 	author = {Christian Grothoff}
 }
-@inproceedings {HanLLHP05,
+@conference {HanLLHP05,
 	title = {A Random Walk Based Anonymous Peer-to-Peer Protocol Design},
 	booktitle = {Proceedings of ICCNMC},
 	year = {2005},
@@ -8878,7 +8879,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/smli_tr-2005-146.pdf},
 	author = {Perlman, Radia}
 }
-@inproceedings {XuFZBCZ05,
+@conference {XuFZBCZ05,
 	title = {SAS: A Scalar Anonymous Communication System},
 	booktitle = {Proceedings of ICCNMC},
 	year = {2005},
@@ -8893,7 +8894,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.66.7970.pdf},
 	author = {Hongyun Xu and Xinwen Fu and Ye Zhu and Riccardo Bettati and Jianer Chen and Wei Zhao}
 }
-@inproceedings {Fuhrmann05scalablerouting,
+@conference {Fuhrmann05scalablerouting,
 	title = {Scalable routing for networked sensors and actuators},
 	booktitle = {In Proceedings of the Second Annual IEEE Communications Society Conference on Sensor and Ad Hoc Communications and Networks},
 	year = {2005},
@@ -8903,7 +8904,7 @@ We have developed a prototype based on the FreePastry open-source implementation
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.67.6509.pdf},
 	author = {Thomas Fuhrmann}
 }
-@inproceedings {1049775,
+@conference {1049775,
 	title = {Scalable Service Discovery for MANET},
 	booktitle = {PERCOM {\textquoteright}05: Proceedings of the Third IEEE International Conference on Pervasive Computing and Communications},
 	year = {2005},
@@ -8946,7 +8947,7 @@ This overview focuses on the three DHT systems that have received the most atten
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Lecture\%20Notes\%20in\%20Computer\%20Science\%20-\%20Selected\%20DHT\%20Algorithms\%20.pdf},
 	author = {G{\"o}tz, Stefan and Rieche, Simon and Klaus Wehrle}
 }
-@inproceedings {Gairing:2005:SRI:1073970.1074000,
+@conference {Gairing:2005:SRI:1073970.1074000,
 	title = {Selfish Routing with Incomplete Information},
 	booktitle = {SPAA{\textquoteright}05. Proceedings of the 17th Annual ACM Symposium on Parallelism in Algorithms and Architectures},
 	series = {SPAA {\textquoteright}05},
@@ -8964,7 +8965,7 @@ This overview focuses on the three DHT systems that have received the most atten
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SPAA\%2705\%20-\%20Selfish\%20routing\%20with\%20incomplete\%20information.pdf},
 	author = {Gairing, Martin and Monien, Burkhard and Tiemann, Karsten}
 }
-@inproceedings {kutzner05dvdr,
+@conference {kutzner05dvdr,
 	title = {A Self-Organizing Job Scheduling Algorithm for a Distributed VDR},
 	booktitle = {Workshop "Peer-to-Peer-Systeme und -Anwendungen", 14. Fachtagung Kommunikation in Verteilten Systemen (KiVS 2005)},
 	year = {2005},
@@ -8976,7 +8977,7 @@ This overview focuses on the three DHT systems that have received the most atten
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/kutzner05dvdr.pdf},
 	author = {Kendy Kutzner and Cramer, Curt and Thomas Fuhrmann}
 }
-@inproceedings {fuhrmann05networking,
+@conference {fuhrmann05networking,
 	title = {A Self-Organizing Routing Scheme for Random Networks},
 	booktitle = {Proceedings of the 4th IFIP-TC6 Networking Conference},
 	year = {2005},
@@ -8994,7 +8995,7 @@ In this paper, we present a fully self-organizing routing scheme that is able to
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann05networking.pdf},
 	author = {Thomas Fuhrmann}
 }
-@inproceedings {Irwin:2005:SVC:1080192.1080194,
+@conference {Irwin:2005:SVC:1080192.1080194,
 	title = {Self-recharging virtual currency},
 	booktitle = {P2PECON{\textquoteright}05. Proceedings of the 2005 ACM SIGCOMM Workshop on Economics of Peer-to-Peer Systems},
 	series = {P2PECON {\textquoteright}05},
@@ -9012,7 +9013,7 @@ In this paper, we present a fully self-organizing routing scheme that is able to
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/P2PECON\%2705\%20-\%20Self-recharging\%20virtual\%20currency.pdf},
 	author = {Irwin, David and Chase, Jeff and Grit, Laura and Yumerefendi, Aydan}
 }
-@inproceedings {cramer05selfstabilizing,
+@conference {cramer05selfstabilizing,
 	title = {Self-Stabilizing Ring Networks on Connected Graphs},
 	year = {2005},
 	type = {Technical Report},
@@ -9056,7 +9057,7 @@ In this paper, we present a fully self-organizing routing scheme that is able to
 	author = {Bartolini, Claudio and Preist, Chris and Nicholas R Jennings},
 	editor = {Choren, Ricardo and Garcia, Alessandro and Lucena, Carlos and Romanovsky, Alexander}
 }
-@inproceedings {Bharambe:2005:OBP:1064212.1064273,
+@conference {Bharambe:2005:OBP:1064212.1064273,
 	title = {Some observations on BitTorrent performance},
 	booktitle = {Proceedings of the 2005 ACM SIGMETRICS International Conference on Measurement and Modeling of Computer Systems},
 	series = {SIGMETRICS {\textquoteright}05},
@@ -9074,7 +9075,7 @@ In this paper, we present a fully self-organizing routing scheme that is able to
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGMETRICS\%2705\%20-\%20Bharambe\%2C\%20Herley\%20\%26\%20Padmanabhan.pdf},
 	author = {Bharambe, Ashwin R. and Herley, Cormac and Venkata N. Padmanabhan}
 }
-@inproceedings {LuFSG05,
+@conference {LuFSG05,
 	title = {Some Remarks on Universal Re-encryption and A Novel Practical Anonymous Tunnel},
 	booktitle = {Proceedings of ICCNMC},
 	year = {2005},
@@ -9099,7 +9100,7 @@ In this paper, we present a fully self-organizing routing scheme that is able to
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IEEE\%20CST\%20-\%20A\%20Survey\%20and\%20Comparison\%20of\%20Peer-to-Peer\%20Overlay.pdf},
 	author = {Eng Keong Lua and Jon Crowcroft and Marcelo Pias and Ravi Sharma and Steven Lim}
 }
-@inproceedings {Cheng:2005:SRM:1080192.1080202,
+@conference {Cheng:2005:SRM:1080192.1080202,
 	title = {Sybilproof reputation mechanisms},
 	booktitle = {Proceedings of the 2005 ACM SIGCOMM Workshop on Economics of Peer-to-Peer Systems},
 	series = {P2PECON {\textquoteright}05},
@@ -9117,7 +9118,7 @@ In this paper, we present a fully self-organizing routing scheme that is able to
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ACM\%20SIGCOMM\%2705\%20-\%20Cheng\%20\%26\%20Friedman\%20-\%20Sybilproof\%20reputation\%20mechanisms.pdf},
 	author = {Cheng, Alice and Eric Friedman}
 }
-@inproceedings {Danezis05sybil-resistantdht,
+@conference {Danezis05sybil-resistantdht,
 	title = {Sybil-resistant DHT routing},
 	booktitle = {In ESORICS},
 	year = {2005},
@@ -9130,7 +9131,7 @@ In this paper, we present a fully self-organizing routing scheme that is able to
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/sybildht.pdf},
 	author = {George Danezis and Chris Lesniewski-laas and Frans M. Kaashoek and Ross Anderson}
 }
-@inproceedings {Nielson05ataxonomy,
+@conference {Nielson05ataxonomy,
 	title = {A Taxonomy of Rational Attacks},
 	booktitle = {Proceedings of the 4th International Workshop on Peer-to-Peer Systems (IPTPS {\textquoteright}05},
 	year = {2005},
@@ -9157,7 +9158,7 @@ Modern conflicts often turn on connectivity: consider, for instance, anything fr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/UCAM-CL-TR-637.pdf},
 	author = {Shishir Nagaraja and Ross Anderson}
 }
-@inproceedings {kutzner05autonomic,
+@conference {kutzner05autonomic,
 	title = {Towards Autonomic Networking using Overlay Routing Techniques},
 	booktitle = {Proceedings of the 18th International Conference on Architecture of Computing Systems (ARCS {\textquoteright}05) - System Aspects in Organic and Pervasive Computing},
 	year = {2005},
@@ -9175,7 +9176,7 @@ In this paper we present a novel routing approach that is capable of handling co
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/kutzner05autonomic.pdf},
 	author = {Kendy Kutzner and Thomas Fuhrmann}
 }
-@inproceedings {WangCJ05,
+@conference {WangCJ05,
 	title = {Tracking anonymous peer-to-peer VoIP calls on the internet},
 	booktitle = {Proceedings of the ACM Conference on Computer and Communications Security},
 	year = {2005},
@@ -9191,7 +9192,7 @@ In this paper we present a novel routing approach that is capable of handling co
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WangCJ05.pdf},
 	author = {Xinyuan Wang and Shiping Chen and Sushil Jajodia}
 }
-@inproceedings {pet05-zhu,
+@conference {pet05-zhu,
 	title = {Unmixing Mix Traffic},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2005)},
 	year = {2005},
@@ -9207,7 +9208,7 @@ In this paper we present a novel routing approach that is capable of handling co
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/pet05-zhu.pdf},
 	author = {Ye Zhu and Riccardo Bettati}
 }
-@inproceedings {fuhrmann05emnets,
+@conference {fuhrmann05emnets,
 	title = {The Use of Scalable Source Routing for Networked Sensors},
 	booktitle = {Proceedings of the 2nd IEEE Workshop on Embedded Networked Sensors},
 	year = {2005},
@@ -9223,7 +9224,7 @@ In this paper we present a novel routing approach that is capable of handling co
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann05emnets.pdf},
 	author = {Thomas Fuhrmann}
 }
-@inproceedings {DBLP:conf/sigcomm/JainDPF05,
+@conference {DBLP:conf/sigcomm/JainDPF05,
 	title = {Using redundancy to cope with failures in a delay tolerant network},
 	booktitle = {SIGCOMM},
 	year = {2005},
@@ -9248,7 +9249,7 @@ In this paper we present a novel routing approach that is capable of handling co
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.120.6858.pdf},
 	author = {Joe Cooley and Chris Taylor and Alen Peacock}
 }
-@inproceedings {Baset04ananalysis,
+@conference {Baset04ananalysis,
 	title = {An Analysis of the Skype Peer-to-Peer Internet Telephony Protocol},
 	booktitle = {INFOCOM 2006. Proceedings of the 25th Annual Joint Conference of the IEEE Computer and Communications Societies},
 	year = {2004},
@@ -9260,7 +9261,7 @@ In this paper we present a novel routing approach that is capable of handling co
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cucs-039-04.pdf},
 	author = {Salman A. Baset and Henning G. Schulzrinne}
 }
-@inproceedings {newman:pet2004,
+@conference {newman:pet2004,
 	title = {Anonymity and Covert Channels in Simple Timed Mix-firewalls},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2004)},
 	series = {LNCS},
@@ -9300,7 +9301,7 @@ Initial work considered a simple model, with an observer (Eve) restricted to cou
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/andrei-thesis.pdf},
 	author = {Andrei Serjantov}
 }
-@inproceedings {wisa04-Klonowski,
+@conference {wisa04-Klonowski,
 	title = {Anonymous Communication with On-line and Off-line Onion Encoding},
 	booktitle = {Proceedings of Workshop on Information Security Applications (WISA 2004)},
 	year = {2004},
@@ -9314,7 +9315,7 @@ In this paper we propose an {\textquotedblleft}onion-like{\textquotedblright} en
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/wisa04-Klonowski.pdf},
 	author = {Marcin Gomulkiewicz and Marek Klonowski and Miroslaw Kutylowski}
 }
-@inproceedings {Mislove04ap3:cooperative,
+@conference {Mislove04ap3:cooperative,
 	title = {AP3: Cooperative, decentralized anonymous communication},
 	booktitle = {IN PROC. OF SIGOPS EUROPEAN WORKSHOP},
   author = {Mislove, Alan and Oberoi, Gaurav and Post, Ansley and Reis, Charles and Druschel, Peter and Wallach, Dan S},
@@ -9333,7 +9334,7 @@ In this paper we propose an {\textquotedblleft}onion-like{\textquotedblright} en
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/apres.pdf},
 	author = {Laurie, Ben}
 }
-@inproceedings {Antoniadis04anasymptotically,
+@conference {Antoniadis04anasymptotically,
 	title = {An Asymptotically Optimal Scheme for P2P File Sharing},
 	booktitle = {2nd Workshop on the Economics of Peer-to-Peer Systems},
 	year = {2004},
@@ -9353,7 +9354,7 @@ In this paper we propose an {\textquotedblleft}onion-like{\textquotedblright} en
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/compact.pdf},
 	author = {Raph Levien}
 }
-@inproceedings {2004.Pang.imc.dns,
+@conference {2004.Pang.imc.dns,
 	title = {Availability, Usage, and Deployment Characteristics of the Domain Name System},
 	booktitle = {IMC{\textquoteright}04 - Proceedings of the 4th ACM SIGCOMM Conference on Internet Measurement},
 	year = {2004},
@@ -9396,7 +9397,7 @@ In this paper we propose an {\textquotedblleft}onion-like{\textquotedblright} en
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/george-thesis.pdf},
 	author = {George Danezis}
 }
-@inproceedings {Cramer04Bootstrapping,
+@conference {Cramer04Bootstrapping,
 	title = {Bootstrapping Locality-Aware P2P Networks},
 	booktitle = {Proceedings of the IEEE International Conference on Networks (ICON 2004)}
   address = {Singapore},
@@ -9412,7 +9413,7 @@ In this paper we propose an {\textquotedblleft}onion-like{\textquotedblright} en
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cramer04bootstrapping.pdf},
 	author = {Cramer, Curt and Kendy Kutzner and Thomas Fuhrmann}
 }
-@inproceedings {mixmaster-reliable,
+@conference {mixmaster-reliable,
 	title = {Comparison between two practical mix designs},
 	booktitle = {Proceedings of ESORICS 2004},
 	series = {LNCS},
@@ -9440,7 +9441,7 @@ We identify flaws in the software in Reliable that further compromise its abilit
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/6-914.ppt},
 	author = {Xin Yan Zhang and Qian Zhang and Zhang, Zhensheng and Gang Song and Wenwu Zhu}
 }
-@inproceedings {1111777,
+@conference {1111777,
 	title = {Data durability in peer to peer storage systems},
 	booktitle = {CCGRID {\textquoteright}04: Proceedings of the 2004 IEEE International Symposium on Cluster Computing and the Grid},
 	year = {2004},
@@ -9455,7 +9456,7 @@ We identify flaws in the software in Reliable that further compromise its abilit
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.102.9992.pdf},
 	author = {Gil Utard and Antoine Vernois}
 }
-@inproceedings {Garces-Erice2004DataIndexing,
+@conference {Garces-Erice2004DataIndexing,
 	title = {Data Indexing in Peer-to-Peer DHT Networks},
 	booktitle = {Proceedings of the 24th International Conference on Distributed Computing Systems (ICDCS{\textquoteright}04)},
 	series = {ICDCS {\textquoteright}04},
@@ -9480,7 +9481,7 @@ We identify flaws in the software in Reliable that further compromise its abilit
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Thesis\%20-\%20Autonomic\%20distributed\%20systems.pdf},
 	author = {Jim Dowling}
 }
-@inproceedings {1133613,
+@conference {1133613,
 	title = {Defending against eclipse attacks on overlay networks},
 	booktitle = {EW 11: Proceedings of the 11th workshop on ACM SIGOPS European workshop},
 	year = {2004},
@@ -9495,7 +9496,7 @@ We identify flaws in the software in Reliable that further compromise its abilit
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.61.5727.pdf},
 	author = {Singh, Atul and Miguel Castro and Peter Druschel and Antony Rowstron}
 }
-@inproceedings {Cramer04DemandDrivenClustering,
+@conference {Cramer04DemandDrivenClustering,
 	title = {Demand-Driven Clustering in MANETs},
 	booktitle = {Proceedings of the 2004 International Conference on Wireless Networks (ICWN {\textquoteright}04)},
 	volume = {1},
@@ -9509,7 +9510,7 @@ We identify flaws in the software in Reliable that further compromise its abilit
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cramer04odgmbc.pdf},
 	author = {Cramer, Curt and Oliver Stanze and Kilian Weniger and Martina Zitterbart}
 }
-@inproceedings {Hof04SecureDistributedServiceDirectory,
+@conference {Hof04SecureDistributedServiceDirectory,
 	title = {Design of a Secure Distributed Service Directory for Wireless Sensornetworks},
 	booktitle = {Proceedings of the First European Workshop on Wireless Sensor Networks},
 	year = {2004},
@@ -9523,7 +9524,7 @@ We identify flaws in the software in Reliable that further compromise its abilit
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/scan.pdf},
 	author = {Hans-Joachim Hof and Erik-Oliver Blass and Thomas Fuhrmann and Martina Zitterbart}
 }
-@inproceedings {Dabek:2004:DDL:1251175.1251182,
+@conference {Dabek:2004:DDL:1251175.1251182,
 	title = {Designing a DHT for Low Latency and High Throughput},
 	booktitle = {NSDI{\textquoteright}04 - Proceedings of the 1st conference on Symposium on Networked Systems Design and Implementation },
 	year = {2004},
@@ -9542,7 +9543,7 @@ Measurements with 425 server instances running on 150 PlanetLab and RON hosts sh
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NSDI\%2704\%20-\%20Designing\%20a\%20DHT\%20for\%20low\%20latency\%20and\%20high\%20throughput.pdf},
 	author = {Dabek, Frank and Li, Jinyang and Emil Sit and Robertson, James and Frans M. Kaashoek and Robert Morris}
 }
-@inproceedings {2004_3,
+@conference {2004_3,
 	title = {Designing Incentive mechanisms for peer-to-peer systems},
 	booktitle = {GECON 2004. 1st IEEE International Workshop on Grid Economics and Business Models},
 	year = {2004},
@@ -9566,7 +9567,7 @@ Measurements with 425 server instances running on 150 PlanetLab and RON hosts sh
 	www_section = {http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.114.2282},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.114.2282.pdf}
 }
-@inproceedings {golle:eurocrypt2004,
+@conference {golle:eurocrypt2004,
 	title = {Dining Cryptographers Revisited},
 	booktitle = {Proceedings of Eurocrypt 2004},
 	year = {2004},
@@ -9583,7 +9584,7 @@ We present new DC-net constructions that simultaneously achieve non-interactivit
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/golle-eurocrypt2004.pdf},
 	author = {Philippe Golle and Ari Juels}
 }
-@inproceedings { izal:dissecting,
+@conference { izal:dissecting,
 	title = {Dissecting BitTorrent: Five Months in a Torrent{\textquoteright}s Lifetime},
 	booktitle = {PAM {\textquoteright}04. Proceedings of Passive and Active Measurements},
 	series = {Lecture Notes in Computer Science},
@@ -9600,7 +9601,7 @@ We present new DC-net constructions that simultaneously achieve non-interactivit
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/PAM\%2704\%20-\%20Dissecting\%20bittorrent.pdf},
 	author = {Mikel Izal and Guillaume Urvoy-Keller and E W Biersack and Pascal Felber and Anwar Al Hamra and L Garc{\'e}s-Erice}
 }
-@inproceedings {Cramer04Scheduling,
+@conference {Cramer04Scheduling,
 	title = {Distributed Job Scheduling in a Peer-to-Peer Video Recording System},
 	booktitle = {Proceedings of the Workshop on Algorithms and Protocols for Efficient Peer-to-Peer Applications (PEPPA) at Informatik 2004},
 	year = {2004},
@@ -9613,7 +9614,7 @@ We present new DC-net constructions that simultaneously achieve non-interactivit
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cramer04scheduling.pdf},
 	author = {Cramer, Curt and Kendy Kutzner and Thomas Fuhrmann}
 }
-@inproceedings {mmsec04-Klonowski,
+@conference {mmsec04-Klonowski,
 	title = {DUO{\textendash}Onions and Hydra{\textendash}Onions {\textendash} Failure and Adversary Resistant Onion Protocols},
 	booktitle = {Proceedings of the IFIP TC-6 TC-11 Conference on Communications and Multimedia Security 2004},
 	year = {2004},
@@ -9628,7 +9629,7 @@ The simplest solution to this problem would be to send many onions with the same
 	www_section = {http://www.springerlink.com/content/019lu6xp5b9fctn8/},
 	author = {Jan Iwanik and Marek Klonowski and Miroslaw Kutylowski}
 }
-@inproceedings {Danezis04theeconomics,
+@conference {Danezis04theeconomics,
 	title = {The Economics of Censorship Resistance},
 	booktitle = {In The Third Annual Workshop on Economics and Information Security (WEIS04},
 	year = {2004},
@@ -9655,7 +9656,7 @@ ict theory to analyse these systems. Under our assumptions, resource distributio
 	author = {Freedman, MichaelJ. and Nissim, Kobbi and Pinkas, Benny},
 	editor = {Cachin, Christian and Camenisch, JanL.}
 }
-@inproceedings {Helmy04efficientresource,
+@conference {Helmy04efficientresource,
 	title = {Efficient Resource Discovery in Wireless AdHoc Networks: Contacts Do Help},
 	booktitle = {Chapter in: Resource Management in Wireless Networking},
 	year = {2004},
@@ -9666,7 +9667,7 @@ ict theory to analyse these systems. Under our assumptions, resource distributio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.76.9310.pdf},
 	author = {Ahmed Helmy}
 }
-@inproceedings {mrkoot:sirer04,
+@conference {mrkoot:sirer04,
 	title = {Eluding carnivores: file sharing with strong anonymity},
 	booktitle = {Proceedings of the 11th Workshop on ACM SIGOPS European Workshop: Beyond the PC (EW11)},
 	year = {2004},
@@ -9679,7 +9680,7 @@ ict theory to analyse these systems. Under our assumptions, resource distributio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/herbivore-esigops.pdf},
 	author = {Emin G{\"u}n Sirer and Goel, Sharad and Mark Robson and Engin, Dogan}
 }
-@inproceedings {1013317,
+@conference {1013317,
 	title = {Energy-aware demand paging on NAND flash-based embedded storages},
 	booktitle = {ISLPED {\textquoteright}04: Proceedings of the 2004 international symposium on Low power electronics and design},
 	year = {2004},
@@ -9694,7 +9695,7 @@ ict theory to analyse these systems. Under our assumptions, resource distributio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/2004-ISLPED-Energy-aware\%20demand\%20paging\%20on\%20NAND\%20flash-based\%20embedded\%20storages.pdf},
 	author = {Chanik Park and Kang, Jeong-Uk and Park, Seon-Yeong and Kim, Jin-Soo}
 }
-@inproceedings {1251279,
+@conference {1251279,
 	title = {Energy-efficiency and storage flexibility in the blue file system},
 	booktitle = {OSDI{\textquoteright}04: Proceedings of the 6th conference on Symposium on Opearting Systems Design \& Implementation},
 	year = {2004},
@@ -9721,7 +9722,7 @@ ict theory to analyse these systems. Under our assumptions, resource distributio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/p255.pdf},
 	author = {Stefanos Gritzalis}
 }
-@inproceedings {1021938,
+@conference {1021938,
 	title = {Erasure Code Replication Revisited},
 	booktitle = {P2P {\textquoteright}04: Proceedings of the Fourth International Conference on Peer-to-Peer Computing},
 	year = {2004},
@@ -9745,7 +9746,7 @@ ict theory to analyse these systems. Under our assumptions, resource distributio
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.11.1341.pdf},
 	author = {Lawrence L. You and Christos Karamanolis}
 }
-@inproceedings {Karp2004/ALGO,
+@conference {Karp2004/ALGO,
 	title = {Finite length analysis of LT codes},
 	booktitle = {Proceedings of the IEEE International Symposium on Information Theory, ISIT 2004},
 	year = {2004},
@@ -9758,7 +9759,7 @@ ict theory to analyse these systems. Under our assumptions, resource distributio
 	www_section = {http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=1181950},
 	author = {Richard Karp and Luby, Michael and M. Amin Shokrollahi}
 }
-@inproceedings {flow-correlation04,
+@conference {flow-correlation04,
 	title = {On Flow Correlation Attacks and Countermeasures in Mix Networks},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2004)},
 	series = {LNCS},
@@ -9777,7 +9778,7 @@ This work was supported in part by the National Science Foundation under Contrac
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/flow-correlation04.pdf},
 	author = {Ye Zhu and Xinwen Fu and Bryan Graham and Riccardo Bettati and Wei Zhao}
 }
-@inproceedings {esorics04-mauw,
+@conference {esorics04-mauw,
 	title = {A formalization of anonymity and onion routing},
 	booktitle = {Proceedings of ESORICS 2004},
 	year = {2004},
@@ -9791,7 +9792,7 @@ This work was supported in part by the National Science Foundation under Contrac
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/esorics04-mauw.pdf},
 	author = {Sjouke Mauw and Jan Verschuren and Erik P. de Vink}
 }
-@inproceedings {reiter:ccs2004,
+@conference {reiter:ccs2004,
 	title = {Fragile Mixing},
 	booktitle = {Proceedings of the 11th ACM Conference on Computer and Communications Security (CCS 2004)},
 	year = {2004},
@@ -9807,7 +9808,7 @@ This work was supported in part by the National Science Foundation under Contrac
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/reiter-ccs2004.pdf},
 	author = {Michael K. Reiter and XiaoFeng Wang}
 }
-@inproceedings {Feldman:2004:FWP:1016527.1016539,
+@conference {Feldman:2004:FWP:1016527.1016539,
 	title = {Free-riding and whitewashing in peer-to-peer systems},
 	booktitle = {PINS{\textquoteright}04. Proceedings of the ACM SIGCOMM Workshop on Practice and Theory of Incentives in Networked Systems},
 	series = {PINS {\textquoteright}04},
@@ -9841,7 +9842,7 @@ This work was supported in part by the National Science Foundation under Contrac
 	author = {Awerbuch, Baruch and Scheideler, Christian},
 	editor = {D{\'\i}az, Josep and Karhum{\"a}ki, Juhani and Lepist{\"o}, Arto and Sannella, Donald}
 }
-@inproceedings {hitting-set04,
+@conference {hitting-set04,
 	title = {The Hitting Set Attack on Anonymity Protocols},
 	booktitle = {Proceedings of 6th Information Hiding Workshop (IH 2004)},
 	series = {LNCS},
@@ -9857,7 +9858,7 @@ However, the statistical hitting set attack is prone to wrong solutions with a g
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/hitting-set04.pdf},
 	author = {Dogan Kesdogan and Lexi Pimenidis}
 }
-@inproceedings {koepsell:wpes2004,
+@conference {koepsell:wpes2004,
 	title = {How to Achieve Blocking Resistance for Existing Systems Enabling Anonymous Web Surfing},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2004)},
 	year = {2004},
@@ -9873,7 +9874,7 @@ However, the statistical hitting set attack is prone to wrong solutions with a g
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/koepsell-wpes2004_0.pdf},
 	author = {Stefan K{\"o}psell and Ulf Hilling}
 }
-@inproceedings {fairbrother:pet2004,
+@conference {fairbrother:pet2004,
 	title = {An Improved Construction for Universal Re-encryption},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2004)},
 	series = {LNCS},
@@ -9908,7 +9909,7 @@ The key feature of our approach is its modularity. It yields precise, formal spe
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/shmat_anon.pdf},
 	author = {Dominic Hughes and Vitaly Shmatikov}
 }
-@inproceedings {1096703,
+@conference {1096703,
 	title = {Integrating Portable and Distributed Storage},
 	booktitle = {FAST {\textquoteright}04: Proceedings of the 3rd USENIX Conference on File and Storage Technologies},
 	year = {2004},
@@ -9985,7 +9986,7 @@ By basing Keso on peer-to-peer techniques it becomes highly scalable, fault tole
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOM05_Poster.pdf},
 	author = {Yinzhe Yu and Sanghwan Lee and Zhi-li Zhang}
 }
-@inproceedings {feamster:wpes2004,
+@conference {feamster:wpes2004,
 	title = {Location Diversity in Anonymity Networks},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2004)},
 	year = {2004},
@@ -10000,7 +10001,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.10.6119.pdf},
 	author = {Nick Feamster and Roger Dingledine}
 }
-@inproceedings {1251195,
+@conference {1251195,
 	title = {MACEDON: methodology for automatically creating, evaluating, and designing overlay networks},
 	booktitle = {NSDI{\textquoteright}04: Proceedings of the 1st conference on Symposium on Networked Systems Design and Implementation},
 	year = {2004},
@@ -10013,7 +10014,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.2.8796.pdf},
 	author = {Rodriguez, Adolfo and Killian, Charles and Bhat, Sooraj and Kosti{\'c}, Dejan and Vahdat, Amin}
 }
-@inproceedings {TH04,
+@conference {TH04,
 	title = {Measuring Anonymity in a Non-adaptive, Real-time System},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2004)},
 	series = {Springer-Verlag, LNCS},
@@ -10026,7 +10027,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/TH04.pdf},
 	author = {Gergely T{\'o}th and Zolt{\'a}n Horn{\'a}k}
 }
-@inproceedings {THV04,
+@conference {THV04,
 	title = {Measuring Anonymity Revisited},
 	booktitle = {Proceedings of the Ninth Nordic Workshop on Secure IT Systems},
 	year = {2004},
@@ -10057,7 +10058,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/p625-bharambe1.pdf},
 	author = {Bharambe, Ashwin R. and Agrawal, Mukesh and Seshan, Srinivasan}
 }
-@inproceedings {danezis:wpes2004,
+@conference {danezis:wpes2004,
 	title = {Minx: A simple and efficient anonymous packet format},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2004)},
 	year = {2004},
@@ -10073,7 +10074,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/danezis-wpes2004.pdf},
 	author = {George Danezis and Ben Laurie}
 }
-@inproceedings {Qiu:2004:MPA:1015467.1015508,
+@conference {Qiu:2004:MPA:1015467.1015508,
 	title = {Modeling and performance analysis of BitTorrent-like peer-to-peer networks},
 	booktitle = {SIGCOMM{\textquoteright}04. Proceedings of the 2004 Conference on Applications, Technologies, Architectures, and Protocols for Computer Communications},
 	series = {SIGCOMM {\textquoteright}04},
@@ -10091,7 +10092,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGCOMM\%2704\%20-\%20Qui\%20\%26\%20Srikant\%20-\%20Modeling\%20and\%20performance\%20analysis.pdf},
 	author = {Qiu, Dongyu and Rayadurgam Srikant}
 }
-@inproceedings {Aberer04multifacetedsimultaneous,
+@conference {Aberer04multifacetedsimultaneous,
 	title = {Multifaceted Simultaneous Load Balancing in DHT-based P2P systems: A new game with old balls and bins},
 	booktitle = {Self-* Properties in Complex Information Systems, {\textquotedblleft}Hot Topics{\textquotedblright} series, LNCS},
 	year = {2004},
@@ -10103,7 +10104,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/self-star-load-balance.pdf},
 	author = {Karl Aberer and Anwitaman Datta and Manfred Hauswirth}
 }
-@inproceedings {DBLP:conf/infocom/ChandraBB04,
+@conference {DBLP:conf/infocom/ChandraBB04,
 	title = {MultiNet: Connecting to Multiple IEEE 802.11 Networks Using a Single Wireless Card},
 	booktitle = {INFOCOM},
 	year = {2004},
@@ -10112,7 +10113,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/18_3.PDF},
 	author = {Ranveer Chandra and Victor Bahl and Pradeep Bahl}
 }
-@inproceedings {Kleinberg:2004:NFD:982792.982803,
+@conference {Kleinberg:2004:NFD:982792.982803,
 	title = {Network failure detection and graph connectivity},
 	booktitle = {SODA{\textquoteright}04 - Proceedings of the Fifteenth Annual ACM-SIAM Symposium on Discrete Algorithms},
 	series = {SODA {\textquoteright}04},
@@ -10129,7 +10130,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SODA\%2704\%20-\%20Network\%20failure\%20detection\%20and\%20graph\%20connectivity\%250A.pdf},
 	author = {Kleinberg, Jon and Sandler, Mark and Slivkins, Aleksandrs}
 }
-@inproceedings {Ng:2004:NPS:1247415.1247426,
+@conference {Ng:2004:NPS:1247415.1247426,
 	title = {A Network Positioning System for the Internet},
 	booktitle = {ATEC{\textquoteright}04. Proceedings of the Annual Conference on USENIX Annual Technical Conference},
 	series = {ATEC {\textquoteright}04},
@@ -10145,7 +10146,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ATEC\%2704\%20-\%20A\%20network\%20positioning\%20system.pdf},
 	author = {Ng, T. S. Eugene and Zhang, Hui}
 }
-@inproceedings {1251194,
+@conference {1251194,
 	title = {Operating system support for planetary-scale network services},
 	booktitle = {NSDI{\textquoteright}04: Proceedings of the 1st conference on Symposium on Networked Systems Design and Implementation},
 	year = {2004},
@@ -10159,7 +10160,7 @@ Specifically, we implement a variant of a recently proposed technique that passi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/plos_nsdi_04.pdf},
 	author = {Bavier, Andy and Bowman, Mic and Chun, Brent and Culler, David and Karlin, Scott and Muir, Steve and Peterson, Larry and Roscoe, Timothy and Spalink, Tammo and Wawrzoniak, Mike}
 }
-@inproceedings {golle:ccs2004,
+@conference {golle:ccs2004,
 	title = {Parallel Mixing},
 	booktitle = {Proceedings of the 11th ACM Conference on Computer and Communications Security (CCS 2004)},
 	year = {2004},
@@ -10186,7 +10187,7 @@ Parallel re-encryption mixnets offer security guarantees comparable to those of 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/peerstore-better-performance-by.pdf},
 	author = {Martin Landers and Han Zhang and Kian-Lee Tan}
 }
-@inproceedings {2004_8,
+@conference {2004_8,
 	title = {A Peer-to-Peer File Sharing System for Wireless Ad-Hoc Networks},
 	year = {2004},
 	abstract = {File sharing in wireless ad-hoc networks in a peer to peer manner imposes many challenges that make conventional peer-to-peer systems operating on wire-line networks inapplicable for this case. Information and workload distribution as well as routing are major problems for members of a wireless ad-hoc network, which are only aware of their neighborhood. In this paper we propose a system that solves peer-to-peer filesharing problem for wireless ad-hoc networks. Our system works according to peer-to-peer principles, without requiring a central server, and distributes information regarding the location of shared files among members of the network. By means of a {\textquotedblleft}hashline{\textquotedblright} and forming a tree-structure based on the topology of the network, the system is able to answer location queries, and also discover and maintain routing information that is used to transfer files from a source-peer to another peer},
@@ -10207,7 +10208,7 @@ Parallel re-encryption mixnets offer security guarantees comparable to those of 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Informatik\%20Spektrum\%20-\%20Peer-to-peer\%20networking\%20\%26\%20-computing.pdf},
 	author = {Ralf Steinmetz and Klaus Wehrle}
 }
-@inproceedings {Cramer04LifeScience,
+@conference {Cramer04LifeScience,
 	title = {Peer-to-Peer Overlays and Data Integration in a Life Science Grid},
 	booktitle = {Proceedings of the First International Workshop of the EU Network of Excellence DELOS on Digital Library Architectures},
 	year = {2004},
@@ -10243,7 +10244,7 @@ Parallel re-encryption mixnets offer security guarantees comparable to those of 
 	www_section = {http://pubs.opengroup.org/onlinepubs/009695399/},
 	author = {The Open Group and IEEE}
 }
-@inproceedings {morphmix-fc2004,
+@conference {morphmix-fc2004,
 	title = {Practical Anonymity for the Masses with MorphMix},
 	booktitle = {Proceedings of Financial Cryptography (FC {\textquoteright}04)},
 	year = {2004},
@@ -10277,7 +10278,7 @@ Parallel re-encryption mixnets offer security guarantees comparable to those of 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGCOMM\%20Comput.\%20Commun.\%20Rev.\%20-\%20Practical\%2C\%20distributed\%20network\%20coordinates.pdf},
 	author = {Russ Cox and Dabek, Frank and Frans M. Kaashoek and Li, Jinyang and Robert Morris}
 }
-@inproceedings {e2e-traffic,
+@conference {e2e-traffic,
 	title = {Practical Traffic Analysis: Extending and Resisting Statistical Disclosure},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2004)},
 	series = {LNCS},
@@ -10318,7 +10319,7 @@ Parallel re-encryption mixnets offer security guarantees comparable to those of 
 	www_section = {http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.58.3760\&rep=rep1\&type=pdf},
 	author = {Alessandro Acquisti}
 }
-@inproceedings {Atallah:2004:PCF:1029179.1029204,
+@conference {Atallah:2004:PCF:1029179.1029204,
 	title = {Private collaborative forecasting and benchmarking},
 	booktitle = {WPES{\textquoteright}04 - Proceedings of the 2004 ACM workshop on Privacy in the electronic society},
 	series = {WPES {\textquoteright}04},
@@ -10348,7 +10349,7 @@ Parallel re-encryption mixnets offer security guarantees comparable to those of 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/kissner04private.pdf},
 	author = {Lea Kissner and Alina Oprea and Michael K. Reiter and Dawn Xiaodong Song and Ke Yang}
 }
-@inproceedings {2004_12,
+@conference {2004_12,
 	title = {A Probabilistic Approach to Predict Peers{\textquoteright} Performance in P2P Networks},
 	booktitle = {CIA 2004. Cooperative Information Agents VIII, 8th International Workshop},
 	series = {Lecture Notes in Computer Science},
@@ -10378,7 +10379,7 @@ Parallel re-encryption mixnets offer security guarantees comparable to those of 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/shmat_crowds.pdf},
 	author = {Vitaly Shmatikov}
 }
-@inproceedings {berman-fc2004,
+@conference {berman-fc2004,
 	title = {Provable Unlinkability Against Traffic Analysis},
 	booktitle = {Proceedings of Financial Cryptography (FC {\textquoteright}04)},
 	year = {2004},
@@ -10397,7 +10398,7 @@ In this paper we improve these results: we show that the same level of unlinkabi
 	author = {Ron Berman and Amos Fiat and Amnon Ta-Shma},
 	editor = {Ari Juels}
 }
-@inproceedings {Perng04providingcontent-based,
+@conference {Perng04providingcontent-based,
 	title = {Providing content-based services in a peer-to-peer environment},
 	booktitle = {in Proceedings of the third International Workshop on Distributed Event-Based Systems (DEBS)},
 	year = {2004},
@@ -10407,7 +10408,7 @@ In this paper we improve these results: we show that the same level of unlinkabi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/debs04perng.pdf},
 	author = {Ginger Perng and Chenxi Wang and Michael K. Reiter}
 }
-@inproceedings { boneh04publickey,
+@conference { boneh04publickey,
 	title = {Public-key encryption with keyword search},
 	booktitle = {Eurocrypt 2004},
 	year = {2004},
@@ -10419,7 +10420,7 @@ In this paper we improve these results: we show that the same level of unlinkabi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/encsearch.pdf},
 	author = {Dan Boneh and Giovanni Di Crescenzo and Rafail Ostrovsky and Gieseppe Persiano}
 }
-@inproceedings {pool-dummy04,
+@conference {pool-dummy04,
 	title = {Reasoning about the Anonymity Provided by Pool Mixes that Generate Dummy Traffic},
 	booktitle = {Proceedings of 6th Information Hiding Workshop (IH 2004)},
 	series = {LNCS},
@@ -10431,7 +10432,7 @@ In this paper we improve these results: we show that the same level of unlinkabi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/pool-dummy04.pdf},
 	author = {Claudia Diaz and Bart Preneel}
 }
-@inproceedings {1247420,
+@conference {1247420,
 	title = {Redundancy elimination within large collections of files},
 	booktitle = {ATEC {\textquoteright}04: Proceedings of the annual conference on USENIX Annual Technical Conference},
 	year = {2004},
@@ -10444,7 +10445,7 @@ In this paper we improve these results: we show that the same level of unlinkabi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.91.8331.pdf},
 	author = {Kulkarni, Purushottam and Douglis, Fred and Jason Lavoie and Tracey, John M.}
 }
-@inproceedings {Barreto04areplicated,
+@conference {Barreto04areplicated,
 	title = {A Replicated File System for Resource Constrained Mobile Devices},
 	booktitle = {Proceedings of IADIS Applied Computing},
 	year = {2004},
@@ -10454,7 +10455,7 @@ In this paper we improve these results: we show that the same level of unlinkabi
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.144.9141.pdf},
 	author = {Jo{\~a}o Barreto and Paulo Ferreira}
 }
-@inproceedings {golle:pet2004,
+@conference {golle:pet2004,
 	title = {Reputable Mix Networks},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2004)},
 	series = {LNCS},
@@ -10471,7 +10472,7 @@ We propose three very efficient protocols for reputable mixnets, all synchronous
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/golle-pet2004.pdf},
 	author = {Philippe Golle}
 }
-@inproceedings {Gupta:2004:RMF:1018440.1021942,
+@conference {Gupta:2004:RMF:1018440.1021942,
 	title = {Reputation Management Framework and Its Use as Currency in Large-Scale Peer-to-Peer Networks},
 	booktitle = {P2P{\textquoteright}04. Proceedings of the 4th International Conference on Peer-to-Peer Computing},
 	series = {P2P {\textquoteright}04},
@@ -10489,7 +10490,7 @@ We propose three very efficient protocols for reputable mixnets, all synchronous
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/P2P\%2704\%20-\%20Reputation\%20management\%20framework.pdf},
 	author = {Gupta, Rohit and Somani, Arun K.}
 }
-@inproceedings {Awerbuch04robustdistributed,
+@conference {Awerbuch04robustdistributed,
 	title = {Robust Distributed Name Service},
 	booktitle = {In Proc. of the 3rd International Workshop on Peer-to-Peer Systems (IPTPS)},
 	year = {2004},
@@ -10498,7 +10499,7 @@ We propose three very efficient protocols for reputable mixnets, all synchronous
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/awerbuch-robust.pdf},
 	author = {Awerbuch, Baruch}
 }
-@inproceedings {Feldman:2004:RIT:988772.988788,
+@conference {Feldman:2004:RIT:988772.988788,
 	title = {Robust incentive techniques for peer-to-peer networks},
 	booktitle = {EC{\textquoteright}04. Proceedings of the 5th ACM Conference on Electronic Commerce},
 	series = {EC {\textquoteright}04},
@@ -10524,7 +10525,7 @@ We propose three very efficient protocols for reputable mixnets, all synchronous
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/sba.pdf},
 	author = {Lewis, Scott and Saia, Jared}
 }
-@inproceedings {Goh04secureindexes,
+@conference {Goh04secureindexes,
 	title = {Secure Indexes},
 	booktitle = {In submission},
 	year = {2004},
@@ -10532,7 +10533,7 @@ We propose three very efficient protocols for reputable mixnets, all synchronous
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/secureindex.pdf},
 	author = {Eu-jin Goh}
 }
-@inproceedings {Conrad04SecureServiceSignaling,
+@conference {Conrad04SecureServiceSignaling,
 	title = {Secure Service Signaling and fast Authorization in Programmable Networks},
 	booktitle = {Proceedings of the 6th International Working Conference on Active Networking (IWAN) 2004},
 	year = {2004},
@@ -10562,7 +10563,7 @@ This paper describes the design and implementation of a secure, reliable, and sc
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Schollmeier\%20-\%20Signaling\%20and\%20networking\%20in\%20unstructured\%20p2p\%20networks.pdf},
 	author = {R{\"u}diger Schollmeier}
 }
-@inproceedings {1007919,
+@conference {1007919,
 	title = {Simple efficient load balancing algorithms for peer-to-peer systems},
 	booktitle = {SPAA {\textquoteright}04: Proceedings of the sixteenth annual ACM symposium on Parallelism in algorithms and architectures},
 	year = {2004},
@@ -10578,7 +10579,7 @@ This paper describes the design and implementation of a secure, reliable, and sc
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.88.2405.pdf},
 	author = {David Karger and Ruhl, Matthias}
 }
-@inproceedings {Shnayder04simulatingthe,
+@conference {Shnayder04simulatingthe,
 	title = {Simulating the power consumption of large-scale sensor network applications},
 	booktitle = {In Sensys},
 	year = {2004},
@@ -10594,7 +10595,7 @@ In this paper, we present, a scalable simulation environment for wireless sensor
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.65.9976.pdf},
 	author = {Victor Shnayder and Mark Hempstead and Bor-rong Chen and Geoff Werner Allen and Matt Welsh}
 }
-@inproceedings {DanSer04,
+@conference {DanSer04,
 	title = {Statistical Disclosure or Intersection Attacks on Anonymity Systems},
 	booktitle = {Proceedings of 6th Information Hiding Workshop (IH 2004)},
 	series = {LNCS},
@@ -10628,7 +10629,7 @@ In this paper, we present, a scalable simulation environment for wireless sensor
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ACM\%20Computing\%20Surveys\%20-\%20A\%20survey\%20of\%20p2p\%20content\%20distribution\%20technologies.pdf},
 	author = {Androutsellis-Theotokis, Stephanos and Spinellis, Diomidis}
 }
-@inproceedings {Tamilmani04swift:a,
+@conference {Tamilmani04swift:a,
 	title = {SWIFT: A System With Incentives For Trading},
 	booktitle = {P2PECON{\textquoteright}04. Proceedings of the 2nd Workshop on Economics of Peer-to-Peer Systems},
 	year = {2004},
@@ -10639,7 +10640,7 @@ In this paper, we present, a scalable simulation environment for wireless sensor
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/P2PEcon\%2704\%20-\%20SWIFT.pdf},
 	author = {Karthik Tamilmani and Vinay Pai and Alexander E. Mohr}
 }
-@inproceedings {sync-batching,
+@conference {sync-batching,
 	title = {Synchronous Batching: From Cascades to Free Routes},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2004)},
 	series = {LNCS},
@@ -10654,7 +10655,7 @@ In this paper, we present, a scalable simulation environment for wireless sensor
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/sync-batching.pdf},
 	author = {Roger Dingledine and Vitaly Shmatikov and Paul Syverson}
 }
-@inproceedings {taxonomy-dummy,
+@conference {taxonomy-dummy,
 	title = {Taxonomy of Mixes and Dummy Traffic},
 	booktitle = {Proceedings of I-NetSec04: 3rd Working Conference on Privacy and Anonymity in Networked and Distributed Systems},
 	year = {2004},
@@ -10666,7 +10667,7 @@ In this paper, we present, a scalable simulation environment for wireless sensor
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.5.9855.pdf},
 	author = {Claudia Diaz and Bart Preneel}
 }
-@inproceedings {timing-fc2004,
+@conference {timing-fc2004,
 	title = {Timing Attacks in Low-Latency Mix-Based Systems},
 	booktitle = {Proceedings of Financial Cryptography (FC {\textquoteright}04)},
 	year = {2004},
@@ -10682,7 +10683,7 @@ In this paper, we present, a scalable simulation environment for wireless sensor
 	author = {Brian Neil Levine and Michael K. Reiter and Chenxi Wang and Matthew Wright},
 	editor = {Ari Juels}
 }
-@inproceedings {tor-design,
+@conference {tor-design,
 	title = {Tor: The Second-Generation Onion Router},
 	booktitle = {Proceedings of the 13th USENIX Security Symposium},
 	year = {2004},
@@ -10695,7 +10696,7 @@ In this paper, we present, a scalable simulation environment for wireless sensor
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/tor-design.pdf},
 	author = {Roger Dingledine and Nick Mathewson and Paul Syverson}
 }
-@inproceedings {Kiran04totalrecall:,
+@conference {Kiran04totalrecall:,
 	title = {Total Recall: System Support for Automated Availability Management},
 	booktitle = {In NSDI},
 	year = {2004},
@@ -10707,7 +10708,7 @@ This paper describes the motivation, architecture and implementation for a new p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/recall.pdf},
 	author = {Ranjita Bhagwan Kiran and Kiran Tati and Yu-chung Cheng and Stefan Savage and Geoffrey M. Voelker}
 }
-@inproceedings {danezis:pet2004,
+@conference {danezis:pet2004,
 	title = {The Traffic Analysis of Continuous-Time Mixes},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2004)},
 	series = {LNCS},
@@ -10738,7 +10739,7 @@ This paper describes the motivation, architecture and implementation for a new p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Jiang\%2C\%20Bai\%20\%26\%20Wang\%20-\%20Trust\%20and\%20Cooperation\%20in\%20Peer-to-Peer\%20Systems.pdf},
 	author = {Junjie Jiang and Haihuan Bai and Weinong Wang}
 }
-@inproceedings {GolleJakobssonJuelsSyverson:universal04,
+@conference {GolleJakobssonJuelsSyverson:universal04,
 	title = {Universal Re-Encryption for Mixnets},
 	booktitle = {Proceedings of the 2004 RSA Conference, Cryptographer{\textquoteright}s track},
 	year = {2004},
@@ -10755,7 +10756,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/GolleJakobssonJuelsSyverson-universal04.pdf},
 	author = {Philippe Golle and Jakobsson, Markus and Ari Juels and Paul Syverson}
 }
-@inproceedings {warta04-Klonowski,
+@conference {warta04-Klonowski,
 	title = {Universal Re-encryption of Signatures and Controlling Anonymous Information Flow},
 	booktitle = {Proceedings of WARTACRYPT {\textquoteright}04},
 	year = {2004},
@@ -10783,7 +10784,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGCOMM\%20Compt.\%20Commun.\%20Rev.\%20-\%20Vivaldi.pdf},
 	author = {Dabek, Frank and Russ Cox and Frans M. Kaashoek and Robert Morris}
 }
-@inproceedings {1038318,
+@conference {1038318,
 	title = {Vulnerabilities and Security Threats in Structured Overlay Networks: A Quantitative Analysis},
 	booktitle = {ACSAC {\textquoteright}04: Proceedings of the 20th Annual Computer Security Applications Conference},
 	year = {2004},
@@ -10799,7 +10800,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.3.1198.pdf},
 	author = {Srivatsa, Mudhakar and Liu, Ling}
 }
-@inproceedings {Bustamante04wayback:a,
+@conference {Bustamante04wayback:a,
 	title = {Wayback: A User-level Versioning File System for Linux},
 	booktitle = {In Proceedings of USENIX 2004 (Freenix Track)},
 	year = {2004},
@@ -10809,7 +10810,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.11.2672.pdf},
 	author = {Fabian Bustamante and Brian Cornell and Brian Cornell and Peter Dinda and Peter Dinda and Fabian Bustamante}
 }
-@inproceedings {Andrade04whencan,
+@conference {Andrade04whencan,
 	title = {When Can an Autonomous Reputation Scheme Discourage Free-riding in a Peer-to-Peer System?},
 	booktitle = {in: CCGRID {\textquoteright}04: Proceedings of the 2004 IEEE International Symposium on Cluster Computing and the Grid, IEEE Computer Society},
 	year = {2004},
@@ -10818,7 +10819,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_section = {http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.4.9659\&rep=rep1\&type=pdf},
 	author = {Nazareno Andrade and Miranda Mowbray and Walfredo Cirne and Francisco Brasileiro}
 }
-@inproceedings {fu-active,
+@conference {fu-active,
 	title = {Active Traffic Analysis Attacks and Countermeasures},
 	booktitle = {Proceedings of the 2003 International Conference on Computer Networks and Mobile Computing},
 	year = {2003},
@@ -10833,7 +10834,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fu-active.pdf},
 	author = {Xinwen Fu and Bryan Graham and Riccardo Bettati and Wei Zhao}
 }
-@inproceedings {939011,
+@conference {939011,
 	title = {Ad hoc-VCG: a truthful and cost-efficient routing protocol for mobile ad hoc networks with selfish agents},
 	booktitle = {MobiCom {\textquoteright}03: Proceedings of the 9th annual international conference on Mobile computing and networking},
 	year = {2003},
@@ -10849,7 +10850,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.103.7483.pdf},
 	author = {Anderegg, Luzi and Eidenbenz, Stephan}
 }
-@inproceedings {1251057,
+@conference {1251057,
 	title = {An analysis of compare-by-hash},
 	booktitle = {HOTOS{\textquoteright}03: Proceedings of the 9th conference on Hot Topics in Operating Systems},
 	year = {2003},
@@ -10862,7 +10863,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.100.8338.pdf},
 	author = {Henson, Val}
 }
-@inproceedings {Kuegler03ananalysis,
+@conference {Kuegler03ananalysis,
 	title = {An Analysis of GNUnet and the Implications for Anonymous, Censorship-Resistant Networks},
 	booktitle = {Proceedings of the 3rd International Workshop on Privacy Enhancing Technologies (PET 2003)},
 	year = {2003},
@@ -10874,7 +10875,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/GNUnet_pet.pdf},
 	author = {Dennis K{\"u}gler}
 }
-@inproceedings {fu-analytical,
+@conference {fu-analytical,
 	title = {Analytical and Empirical Analysis of Countermeasures to Traffic Analysis Attacks},
 	booktitle = {Proceedings of the 2003 International Conference on Parallel Processing},
 	year = {2003},
@@ -10887,7 +10888,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fu-analytical.pdf},
 	author = {Xinwen Fu and Bryan Graham and Riccardo Bettati and Wei Zhao}
 }
-@inproceedings {SN03,
+@conference {SN03,
 	title = {On the Anonymity of Timed Pool Mixes},
 	booktitle = {Proceedings of the Workshop on Privacy and Anonymity Issues in Networked and Distributed Systems},
 	year = {2003},
@@ -10902,7 +10903,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.9.5699.pdf},
 	author = {Andrei Serjantov and Richard E. Newman}
 }
-@inproceedings {Hildrum03asymptoticallyefficient,
+@conference {Hildrum03asymptoticallyefficient,
 	title = {Asymptotically Efficient Approaches to Fault-Tolerance in Peer-to-Peer},
 	booktitle = {In Proc. of DISC},
 	year = {2003},
@@ -10923,7 +10924,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/hurler03context.pdf},
 	author = {Bernhard Hurler and Leo Petrak and Thomas Fuhrmann and Oliver Brand and Martina Zitterbart}
 }
-@inproceedings {2003_0,
+@conference {2003_0,
 	title = {Bootstrapping a Distributed Computational Economy with Peer-to-Peer Bartering},
 	booktitle = {Proceedings of the 1st Worshop on Economics of Peer-to-Peer Systems},
 	year = {2003},
@@ -10933,7 +10934,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Workshop\%20on\%20Economics\%20of\%20P2P\%20Systems\%2703\%20-\%20Chun\%2C\%20Fu\%20\%26\%20Vahdat.pdf},
 	author = {Chun, Brent and Yun Fu and Vahdat, Amin}
 }
-@inproceedings {nguyen:pet2003,
+@conference {nguyen:pet2003,
 	title = {Breaking and Mending Resilient Mix-nets},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2003)},
 	year = {2003},
@@ -10962,7 +10963,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/focs01.pdf},
 	author = {Gopal Pandurangan and Prabhakar Raghavan and Eli Upfal}
 }
-@inproceedings {Kostic:2003:BHB:945445.945473,
+@conference {Kostic:2003:BHB:945445.945473,
 	title = {Bullet: High Bandwidth Data Dissemination Using an Overlay Mesh},
 	booktitle = {SOSP{\textquoteright}03. Proceedings of the 19th ACM Symposium on Operating Systems Principles},
 	series = {SOSP {\textquoteright}03},
@@ -10995,7 +10996,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.80.1566.pdf},
 	author = {Amos Beimel and Shlomi Dolev}
 }
-@inproceedings {778418,
+@conference {778418,
 	title = {A charging and rewarding scheme for packet forwarding in multi-hop cellular networks},
 	booktitle = {MobiHoc {\textquoteright}03: Proceedings of the 4th ACM international symposium on Mobile ad hoc networking \& computing},
 	year = {2003},
@@ -11011,7 +11012,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/BenSalemBHJ03mobihoc.pdf},
 	author = {Salem, Naouel Ben and Levente Butty{\'a}n and Jean-Pierre Hubaux and Jakobsson, Markus}
 }
-@inproceedings {kutzner03connecting,
+@conference {kutzner03connecting,
 	title = {Connecting Vehicle Scatternets by Internet-Connected Gateways},
 	booktitle = {Workshop on Multiradio Multimedia Communications MMC 2003},
 	year = {2003},
@@ -11022,7 +11023,7 @@ While technically and conceptually simple, universal re-encryption leads to new 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/kutzner03connecting.pdf},
 	author = {Kendy Kutzner and Jean-Jacques Tchouto and Marc Bechler and Lars Wolf and Bernd Bochow and Thomas Luckenbach}
 }
-@inproceedings {1247343,
+@conference {1247343,
 	title = {A cooperative internet backup scheme},
 	booktitle = {ATEC {\textquoteright}03: Proceedings of the annual conference on USENIX Annual Technical Conference},
 	year = {2003},
@@ -11038,7 +11039,7 @@ Because our scheme requires cooperation, it is potentially vulnerable to several
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/lillibridge.pdf},
 	author = {Mark Lillibridge and Sameh Elnikety and Andrew D. Birrell and Mike Burrows and Isard, Michael}
 }
-@inproceedings {Leibowitz:2003:DKN:832311.837393,
+@conference {Leibowitz:2003:DKN:832311.837393,
 	title = {Deconstructing the Kazaa Network},
 	booktitle = {WIAPP{\textquoteright}03 - Proceedings of the The Third IEEE Workshop on Internet Applications},
 	series = {WIAPP {\textquoteright}03},
@@ -11055,7 +11056,7 @@ Because our scheme requires cooperation, it is potentially vulnerable to several
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WIAPP\%2703\%20-\%20Deconstructing\%20the\%20Kazaa\%20network.pdf},
 	author = {Leibowitz, Nathaniel and Ripeanu, Matei and Wierzbicki, Adam}
 }
-@inproceedings {wright03,
+@conference {wright03,
 	title = {Defending Anonymous Communication Against Passive Logging Attacks},
 	booktitle = {Proceedings of the 2003 IEEE Symposium on Security and Privacy},
 	year = {2003},
@@ -11070,7 +11071,7 @@ Because our scheme requires cooperation, it is potentially vulnerable to several
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/wright-passive.pdf , https://gnunet.org/git/bibliography.git/tree/docs/wright-passive2.pdf},
 	author = {Matthew Wright and Micah Adler and Brian Neil Levine and Clay Shields}
 }
-@inproceedings {863960,
+@conference {863960,
 	title = {A delay-tolerant network architecture for challenged internets},
 	booktitle = {SIGCOMM {\textquoteright}03: Proceedings of the 2003 conference on Applications, technologies, architectures, and protocols for computer communications},
 	year = {2003},
@@ -11107,7 +11108,7 @@ This paper presents the design and implementation of a cooperative off-site back
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.104.8086.pdf},
 	author = {Emil Sit and Josh Cates and Russ Cox}
 }
-@inproceedings {Acquisti03onthe,
+@conference {Acquisti03onthe,
 	title = {On the Economics of Anonymity},
 	booktitle = {Financial Cryptography. Springer-Verlag, LNCS 2742},
 	year = {2003},
@@ -11117,7 +11118,7 @@ This paper presents the design and implementation of a cooperative off-site back
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.13.5636.pdf},
 	author = {Alessandro Acquisti and Roger Dingledine and Paul Syverson}
 }
-@inproceedings {Buchegger03theeffect,
+@conference {Buchegger03theeffect,
 	title = {The Effect of Rumor Spreading in Reputation Systems for Mobile Ad-Hoc Networks},
 	booktitle = {In Proceedings of WiOpt {\textquoteleft}03: Modeling and Optimization in Mobile, Ad Hoc and Wireless Networks{\textquotedblright}, Sophia-Antipolis},
 	year = {2003},
@@ -11127,7 +11128,7 @@ This paper presents the design and implementation of a cooperative off-site back
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.13.9006_0.pdf},
 	author = {Sonja Buchegger and Jean-Yves Le Boudec}
 }
-@inproceedings {2003_1,
+@conference {2003_1,
 	title = {The effect of rumor spreading in reputation systems for mobile ad-hoc networks},
 	booktitle = {Proceedings of WiOpt {\textquoteleft}03: Modeling and Optimization in Mobile, Ad Hoc and Wireless Networks},
 	year = {2003},
@@ -11138,7 +11139,7 @@ This paper presents the design and implementation of a cooperative off-site back
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WiOpt\%2703\%20-\%20Buchegger\%20\%26\%20Le\%20Boudec\%20-\%20Reputation\%20Systems.pdf},
 	author = {Sonja Buchegger and Jean-Yves Le Boudec}
 }
-@inproceedings {Kwon:2003:EPF:827273.829221,
+@conference {Kwon:2003:EPF:827273.829221,
 	title = {An Efficient Peer-to-Peer File Sharing Exploiting Hierarchy and Asymmetry},
 	booktitle = {SAINT{\textquoteright}03. Proceedings of the 2003 Symposium on Applications and the Internet},
 	series = {SAINT {\textquoteright}03},
@@ -11156,7 +11157,7 @@ This paper presents the design and implementation of a cooperative off-site back
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SAINT\%2703\%20-\%20Kwon\%20\%26\%20Ryu.pdf},
 	author = {Kwon, Gisik and Ryu, Kyung D.}
 }
-@inproceedings {Kamvar:2003:EAR:775152.775242,
+@conference {Kamvar:2003:EAR:775152.775242,
 	title = {The EigenTrust algorithm for reputation management in P2P networks},
 	booktitle = {WWW{\textquoteright}03. Proceedings of the 12th International Conference on World Wide Web},
 	series = {WWW {\textquoteright}03},
@@ -11174,7 +11175,7 @@ This paper presents the design and implementation of a cooperative off-site back
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/WWW\%2703\%20-\%20The\%20EigenTrust\%20algorithm.pdf},
 	author = {Kamvar, Sepandar D. and Schlosser, Mario T. and Hector Garcia-Molina}
 }
-@inproceedings {948119,
+@conference {948119,
 	title = {Establishing pairwise keys in distributed sensor networks},
 	booktitle = {CCS {\textquoteright}03: Proceedings of the 10th ACM conference on Computer and communications security},
 	year = {2003},
@@ -11243,7 +11244,7 @@ In this paper we analyze several extensions to the exponential feedback algorith
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann03feedback.pdf},
 	author = {Thomas Fuhrmann and J{\"o}rg Widmer}
 }
-@inproceedings {2003_4,
+@conference {2003_4,
 	title = {A game theoretic framework for incentives in P2P systems},
 	booktitle = {Proceedings of the 3rd International Conference on Peer-to-Peer Computing},
 	year = {2003},
@@ -11260,7 +11261,7 @@ In this paper we analyze several extensions to the exponential feedback algorith
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/P2P\%2703\%20-\%20Buragohain\%2C\%20Agrawal\%20\%26\%20Suri\%20-\%20Incentives\%20in\%20P2P\%20systems.pdf},
 	author = {Chiranjeeb Buragohain and Dvyakant Agrawal and Subhash Suri}
 }
-@inproceedings { gap,
+@conference { gap,
 	title = {gap - Practical Anonymous Networking},
 	booktitle = {Designing Privacy Enhancing Technologies},
 	year = {2003},
@@ -11276,7 +11277,7 @@ schemes, allowing individual nodes to balance anonymity with efficiency accordin
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/aff.pdf},
 	author = {Krista Bennett and Christian Grothoff}
 }
-@inproceedings {diaz:pet2003,
+@conference {diaz:pet2003,
 	title = {Generalising Mixes},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2003)},
 	year = {2003},
@@ -11294,7 +11295,7 @@ We then show how to express existing mixes in the framework, and then suggest ot
 	author = {Claudia Diaz and Andrei Serjantov},
 	editor = {Roger Dingledine}
 }
-@inproceedings {danezis:wpes2003,
+@conference {danezis:wpes2003,
 	title = {Heartbeat Traffic to Counter (n-1) Attacks},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2003)},
 	year = {2003},
@@ -11338,7 +11339,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_section = {http://www.computer.org/portal/web/csdl/doi/10.1109/ICPP.2003.1240580},
 	author = {Zhiyong Xu and Rui Min and Yiming Hu}
 }
-@inproceedings {Blake:2003:HAS:1251054.1251055,
+@conference {Blake:2003:HAS:1251054.1251055,
 	title = {High Availability, Scalable Storage, Dynamic Peer Networks: Pick Two},
 	booktitle = {HotOS IX - Proceedings of the 9th conference on Hot Topics in Operating Systems },
 	year = {2003},
@@ -11353,7 +11354,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/HotOS\%20IX\%20-\%20High\%20available\%2C\%20scalable\%20storage\%2C\%20dynamic\%20peer\%20networks.pdf},
 	author = {Blake, Charles and Rodrigues, Rodrigo}
 }
-@inproceedings {10.1109/PTP.2003.1231513,
+@conference {10.1109/PTP.2003.1231513,
 	title = {Identity Crisis: Anonymity vs. Reputation in P2P Systems},
 	booktitle = {P2P{\textquoteright}03. Proceecings of the 3rd International Conference on Peer-to-Peer Computing},
 	year = {2003},
@@ -11369,7 +11370,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/P2P\%2703\%20-\%20Identity\%20crisis\%3A\%20anonymity\%20vs\%20reputation.pdf},
 	author = {Marti, Sergio and Hector Garcia-Molina}
 }
-@inproceedings {Gummadi:2003:IDR:863955.863998,
+@conference {Gummadi:2003:IDR:863955.863998,
 	title = {The impact of DHT routing geometry on resilience and proximity},
 	booktitle = {SIGCOMM {\textquoteright}03 - Proceedings of the 2003 Conference on Applications, Technologies, Architectures, and Protocols for Computer Communications},
 	series = {SIGCOMM {\textquoteright}03},
@@ -11387,7 +11388,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGCOMM\%2703\%20-\%20The\%20impact\%20of\%20DHT\%20routing\%20geometry\%20on\%20resilience\%20and\%20proximity.pdf},
 	author = {Krishna Phani Gummadi and Gummadi, Ramakrishna and Steven D. Gribble and Sylvia Paul Ratnasamy and S Shenker and Ion Stoica}
 }
-@inproceedings {clayton:pet2003,
+@conference {clayton:pet2003,
 	title = {Improving Onion Notation},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2003)},
 	year = {2003},
@@ -11402,7 +11403,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	author = {Richard Clayton},
 	editor = {Roger Dingledine}
 }
-@inproceedings {2003_5,
+@conference {2003_5,
 	title = {Incentives build robustness in BitTorrent},
 	booktitle = {NetEcon{\textquoteright}03 - Proceedings of the Workshop on Economics of Peer-to-Peer Systems },
 	year = {2003},
@@ -11413,7 +11414,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/NetEcon\%2703\%20-\%20Cohen\%20-\%20Incentives\%20build\%20robustness\%20in\%20BitTorrent.pdf},
 	author = {Bram Cohen}
 }
-@inproceedings {Lai03incentivesfor,
+@conference {Lai03incentivesfor,
 	title = {Incentives for Cooperation in Peer-to-Peer Networks},
 	booktitle = {P2PECON. Proceedings of the First Workshop on Economics of Peer-to-Peer Systems},
 	year = {2003},
@@ -11425,7 +11426,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/incentives-for-cooperation-in_0.pdf},
 	author = {Kevin Lai and Michal Feldman and Ion Stoica and John Chuang}
 }
-@inproceedings {Ahn03k-anonymousmessage,
+@conference {Ahn03k-anonymousmessage,
 	title = {k-Anonymous Message Transmission},
 	booktitle = {Conference on Computer and Communications Security},
 	year = {2003},
@@ -11439,7 +11440,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/k-anonymous_ccs2003.pdf},
 	author = {Luis von Ahn and Andrew Bortz and Nicholas J. Hopper}
 }
-@inproceedings {2003_6,
+@conference {2003_6,
 	title = {KARMA: a Secure Economic Framework for P2P Resource Sharing},
 	booktitle = {P2PECON{\textquoteright}05. Proceedings of the 3rd Workshop on Economics of Peer-to-Peer Systems},
 	year = {2003},
@@ -11450,7 +11451,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/P2PECON\%2705\%20-\%20KARMA.pdf},
 	author = {Vivek Vishnumurthy and Sangeeth Chandrakumar and Emin G{\"u}n Sirer}
 }
-@inproceedings {Gupta03kelips:building,
+@conference {Gupta03kelips:building,
 	title = {Kelips: Building an efficient and stable P2P DHT through increased memory and background overhead},
 	booktitle = {Proceedings of the 2nd International Workshop on Peer-to-Peer Systems (IPTPS {\textquoteright}03)},
 	year = {2003},
@@ -11499,7 +11500,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/lightweight_prob_broadcast.pdf},
 	author = {Patrick Eugster and Rachid Guerraoui and Sidath B. Handurukande and Petr Kouznetsov and Anne-Marie Kermarrec}
 }
-@inproceedings {864000,
+@conference {864000,
 	title = {Making gnutella-like P2P systems scalable},
 	booktitle = {SIGCOMM {\textquoteright}03: Proceedings of the 2003 conference on Applications, technologies, architectures, and protocols for computer communications},
 	year = {2003},
@@ -11515,7 +11516,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.10.5444.pdf},
 	author = {Chawathe, Yatin and Breslau, Lee and Lanham, Nick and S Shenker}
 }
-@inproceedings {1090700,
+@conference {1090700,
 	title = {Metadata Efficiency in Versioning File Systems},
 	booktitle = {FAST {\textquoteright}03: Proceedings of the 2nd USENIX Conference on File and Storage Technologies},
 	year = {2003},
@@ -11529,7 +11530,7 @@ In this paper, we propose a new P2P routing algorithm - - HIERAS to relieve this
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fast03.pdf},
 	author = {Soules, Craig A. N. and Goodson, Garth R. and Strunk, John D. and Ganger, Gregory R.}
 }
-@inproceedings {newman:pet2003,
+@conference {newman:pet2003,
 	title = {Metrics for Traffic Analysis Prevention},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2003)},
 	year = {2003},
@@ -11556,7 +11557,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/freehaven.net-anonbib-cache-mixmaster-spec.txt.pdf},
 	author = {Ulf M{\"o}ller and Lance Cottrell and Peter Palfrader and Len Sassaman}
 }
-@inproceedings {Danezis03mixminion:design,
+@conference {Danezis03mixminion:design,
 	title = {Mixminion: Design of a Type III Anonymous Remailer Protocol},
 	booktitle = {In Proceedings of the 2003 IEEE Symposium on Security and Privacy},
 	year = {2003},
@@ -11566,7 +11567,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/minion-design.pdf},
 	author = {George Danezis and Roger Dingledine and Nick Mathewson}
 }
-@inproceedings {danezis:pet2003,
+@conference {danezis:pet2003,
 	title = {Mix-networks with Restricted Routes},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2003)},
 	year = {2003},
@@ -11581,7 +11582,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	author = {George Danezis},
 	editor = {Roger Dingledine}
 }
-@inproceedings {steinbrecher:pet2003,
+@conference {steinbrecher:pet2003,
 	title = {Modelling Unlinkability},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2003)},
 	year = {2003},
@@ -11598,7 +11599,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	author = {Sandra Steinbrecher and Stefan K{\"o}psell},
 	editor = {Roger Dingledine}
 }
-@inproceedings {Li:2003:MRQ:958491.958500,
+@conference {Li:2003:MRQ:958491.958500,
 	title = {Multi-dimensional range queries in sensor networks},
 	booktitle = {Proceedings of the 1st international conference on Embedded networked sensor systems},
 	series = {SenSys {\textquoteright}03},
@@ -11614,7 +11615,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/eScholarship\%20UC\%20item\%204x6723n2.pdf},
 	author = {Li, Xin and Kim, Young Jin and Govindan, Ramesh and Hong, Wei}
 }
-@inproceedings {Conrad03multiplelanguage,
+@conference {Conrad03multiplelanguage,
 	title = {Multiple language family support for programmable network systems},
 	booktitle = {In Proceedings of the 5th Annual International Working Conference on Active Networks (IWAN)},
 	year = {2003},
@@ -11626,7 +11627,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/scholler03language.pdf},
 	author = {Michael Conrad and Marcus Schoeller and Thomas Fuhrmann and Gerhard Bocksch and Martina Zitterbart}
 }
-@inproceedings {Gay03thenesc,
+@conference {Gay03thenesc,
 	title = {The nesC language: A holistic approach to networked embedded systems},
 	booktitle = {In Proceedings of Programming Language Design and Implementation (PLDI)},
 	year = {2003},
@@ -11646,7 +11647,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ASWN2003.pdf},
 	author = {Thomas Fuhrmann and Till Harbaum and Martina Zitterbart}
 }
-@inproceedings {Bauer03newcovert,
+@conference {Bauer03newcovert,
 	title = {New Covert Channels in HTTP: Adding Unwitting Web Browsers to Anonymity Sets},
 	booktitle = {In Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2003)},
 	year = {2003},
@@ -11657,7 +11658,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	www_section = {http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.4.6246\&rep=rep1\&type=pdf},
 	author = {Matthias Bauer}
 }
-@inproceedings {bauer:wpes2003,
+@conference {bauer:wpes2003,
 	title = {New Covert Channels in HTTP: Adding Unwitting Web Browsers to Anonymity Sets},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2003)},
 	year = {2003},
@@ -11687,7 +11688,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann03evaluation.pdf},
 	author = {Thomas Fuhrmann and Marcus Schoeller and Christina Schmidt and Martina Zitterbart}
 }
-@inproceedings {Tolia03opportunisticuse,
+@conference {Tolia03opportunisticuse,
 	title = {Opportunistic Use of Content Addressable Storage for Distributed File Systems},
 	booktitle = {In Proceedings of the 2003 USENIX Annual Technical Conference},
 	year = {2003},
@@ -11698,7 +11699,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/casper-usenix2003.pdf},
 	author = {Niraj Tolia and Michael Kozuch and Satyanarayanan, Mahadev and Brad Karp and Thomas Bressoud and Adrian Perrig}
 }
-@inproceedings {792493,
+@conference {792493,
 	title = {An Overlay-Network Approach for Distributed Access to SRS},
 	booktitle = {CCGRID {\textquoteright}03: Proceedings of the 3st International Symposium on Cluster Computing and the Grid},
 	year = {2003},
@@ -11713,7 +11714,7 @@ cryptography to hide the correlation between its inputs and outputs. Sending mes
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann03overlaySRS.pdf},
 	author = {Thomas Fuhrmann and Andrea Schafferhans and Etzold, Thure}
 }
-@inproceedings {SS03,
+@conference {SS03,
 	title = {Passive Attack Analysis for Connection-Based Anonymity Systems},
 	booktitle = {Proceedings of ESORICS 2003},
 	year = {2003},
@@ -11747,7 +11748,7 @@ We analyse the anonymity of connection-based systems against passive adversaries
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.3.5649.pdf},
 	author = {Karl Aberer and Philippe Cudre-Mauroux and Anwitaman Datta and Zoran Despotovic and Manfred Hauswirth and Magdalena Punceva and Roman Schmidt}
 }
-@inproceedings {Cuenca-Acuna03planetp:using,
+@conference {Cuenca-Acuna03planetp:using,
 	title = {PlanetP: Using Gossiping to Build Content Addressable Peer-to-Peer Information Sharing Communities},
 	booktitle = {12th IEEE International Symposium on High Performance Distributed Computing (HPDC-12 {\textquoteright}03),},
 	year = {2003},
@@ -11759,7 +11760,7 @@ We analyse the anonymity of connection-based systems against passive adversaries
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/paper.dvi_.pdf},
 	author = {Francisco Matias Cuenca-Acuna and Christopher Peery and Richard P. Martin and Thu D. Nguyen}
 }
-@inproceedings {DBLP:conf/ccs/YangG03,
+@conference {DBLP:conf/ccs/YangG03,
 	title = {PPay: micropayments for peer-to-peer systems},
 	booktitle = {CCS{\textquoteright}03. Proceedings od the 10th ACM Conference on Computer and Communications Security},
 	year = {2003},
@@ -11774,7 +11775,7 @@ We analyse the anonymity of connection-based systems against passive adversaries
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/CCS\%2703\%20-\%20Yang\%20\%26\%20Garcia-Molina\%20-\%20PPay.pdf},
 	author = {Beverly Yang and Hector Garcia-Molina}
 }
-@inproceedings {RP03-1,
+@conference {RP03-1,
 	title = {Practical Anonymity for the Masses with Mix-Networks},
 	booktitle = {Proceedings of the IEEE 8th Intl. Workshop on Enterprise Security (WET ICE 2003)},
 	year = {2003},
@@ -11801,7 +11802,7 @@ We analyse the anonymity of connection-based systems against passive adversaries
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ut-cs-03-510.pdf},
 	author = {James S. Plank and Michael G. Thomason}
 }
-@inproceedings {camenisch2003pve,
+@conference {camenisch2003pve,
 	title = {Practical Verifiable Encryption and Decryption of Discrete Logarithms},
 	booktitle = {Proceedings of CRYPTO 2003},
 	year = {2003},
@@ -11816,7 +11817,7 @@ We analyse the anonymity of connection-based systems against passive adversaries
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/camenisch2003pve.pdf},
 	author = {Jan Camenisch and Victor Shoup}
 }
-@inproceedings {agrawal03,
+@conference {agrawal03,
 	title = {Probabilistic Treatment of MIXes to Hamper Traffic Analysis},
 	booktitle = {Proceedings of the 2003 IEEE Symposium on Security and Privacy},
 	year = {2003},
@@ -11831,7 +11832,7 @@ We analyse the anonymity of connection-based systems against passive adversaries
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/agrawal03.pdf},
 	author = {Dakshi Agrawal and Dogan Kesdogan and Stefan Penz}
 }
-@inproceedings {BM:mixencrypt,
+@conference {BM:mixencrypt,
 	title = {Provably Secure Public-Key Encryption for Length-Preserving Chaumian Mixes},
 	booktitle = {Proceedings of CT-RSA 2003},
 	year = {2003},
@@ -11845,7 +11846,7 @@ for such length-preserving mixes, but it is not secure against active attacks. W
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/BM-mixencrypt.pdf},
 	author = {Bodo M{\"o}ller}
 }
-@inproceedings {Serjantov03puzzlesin,
+@conference {Serjantov03puzzlesin,
 	title = {Puzzles in P2P Systems},
 	booktitle = {8th CaberNet Radicals Workshop},
 	year = {2003},
@@ -11858,7 +11859,7 @@ for such length-preserving mixes, but it is not secure against active attacks. W
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/CaberNet\%20Radicals\%20Workshop\%20-\%20Puzzles\%20in\%20P2P\%20Systems.pdf},
 	author = {Andrei Serjantov and Stephen Lewis}
 }
-@inproceedings {Feldman03quantifyingdisincentives,
+@conference {Feldman03quantifyingdisincentives,
 	title = {Quantifying Disincentives in Peer-to-Peer Networks},
 	booktitle = {Workshop on Economics of Peer-to-Peer Systems},
 	year = {2003},
@@ -11869,7 +11870,7 @@ for such length-preserving mixes, but it is not secure against active attacks. W
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Feldman\%2C\%20Lai\%2C\%20Chuang\%20\%26\%20Stoica\%20-\%20Quantifying\%20disincentives\%20in\%20peer-to-peer\%20networks.pdf},
 	author = {Michal Feldman and Kevin Lai and John Chuang and Ion Stoica}
 }
-@inproceedings {Huebsch:2003:QIP:1315451.1315480,
+@conference {Huebsch:2003:QIP:1315451.1315480,
 	title = {Querying the internet with PIER},
 	booktitle = {Proceedings of the 29th international conference on Very large data bases - Volume 29},
 	series = {VLDB {\textquoteright}03},
@@ -11891,7 +11892,7 @@ for such length-preserving mixes, but it is not secure against active attacks. W
 	www_section = {http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.6.243},
 	author = {Ratnasamy, Sylvia and Hellerstein, Joseph M. and S Shenker}
 }
-@inproceedings {GKK03,
+@conference {GKK03,
 	title = {Rapid Mixing and Security of Chaum{\textquoteright}s Visual Electronic Voting},
 	booktitle = {Proceedings of ESORICS 2003},
 	year = {2003},
@@ -11908,7 +11909,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/GKK03.pdf},
 	author = {Marcin Gomulkiewicz and Marek Klonowski and Miroslaw Kutylowski}
 }
-@inproceedings { maymounkov:rateless,
+@conference { maymounkov:rateless,
 	title = {Rateless Codes and Big Downloads},
 	booktitle = {IPTPS{\textquoteright}03 - Proceedings in the 2th International Workshop on Peer-to-Peer Systems},
 	series = {Lecture Notes in Computer Science},
@@ -11925,7 +11926,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IPTPS\%2703\%20-\%20Rateless\%20codes\%20and\%20big\%20downloads.pdf},
 	author = {Petar Maymounkov and David Mazi{\`e}res}
 }
-@inproceedings {incomparable-pkeys,
+@conference {incomparable-pkeys,
 	title = {Receiver Anonymity via Incomparable Public Keys},
 	booktitle = {Proceedings of the 10th ACM Conference on Computer and Communications Security (CCS 2003)},
 	year = {2003},
@@ -11942,7 +11943,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	author = {Waters, Brent and Edward W. Felten and Amit Sahai},
 	editor = {Vijay Atluri and Peng Liu}
 }
-@inproceedings {rep-anon,
+@conference {rep-anon,
 	title = {Reputation in P2P Anonymity Systems},
 	booktitle = {Proceedings of Workshop on Economics of Peer-to-Peer Systems},
 	year = {2003},
@@ -11953,7 +11954,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/rep-anon.pdf},
 	author = {Roger Dingledine and Nick Mathewson and Paul Syverson}
 }
-@inproceedings {Dingledine03reputationin,
+@conference {Dingledine03reputationin,
 	title = {Reputation in P2P Anonymity Systems},
 	booktitle = {In Workshop on Economics of Peer-to-Peer Systems},
 	year = {2003},
@@ -11963,7 +11964,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.14.4740.pdf},
 	author = {Roger Dingledine and Nick Mathewson and Paul Syverson}
 }
-@inproceedings {Padmanabhan:2003:RPS:951950.952204,
+@conference {Padmanabhan:2003:RPS:951950.952204,
 	title = {Resilient Peer-to-Peer Streaming},
 	booktitle = {ICNP{\textquoteright}03. Proceedings of the 11th IEEE International Conference on Network Protocols},
 	series = {ICNP {\textquoteright}03},
@@ -11980,7 +11981,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ICNP\%2703\%20-\%20Resilient\%20peer-to-peer\%20streaming.pdf},
 	author = {Venkata N. Padmanabhan and Wang, Helen J. and Chou, Philip A.}
 }
-@inproceedings {Fuhrmann03resultson,
+@conference {Fuhrmann03resultson,
 	title = {Results on the practical feasibility of programmable network services},
 	booktitle = {In 2nd International Workshop on Active Network Technologies and Applications (ANTA)},
 	year = {2003},
@@ -11990,7 +11991,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann03performance.pdf},
 	author = {Thomas Fuhrmann and Till Harbaum and Panos Kassianidis and Marcus Schoeller and Martina Zitterbart}
 }
-@inproceedings {reusable-channels:wpes2003,
+@conference {reusable-channels:wpes2003,
 	title = {Reusable Anonymous Return Channels},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2003)},
 	year = {2003},
@@ -12006,7 +12007,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/reusable-channels-wpes2003.pdf},
 	author = {Philippe Golle and Jakobsson, Markus}
 }
-@inproceedings {2003_8,
+@conference {2003_8,
 	title = {Revealing Information While Preserving Privacy},
 	booktitle = {Proceedings of the Twenty-second ACM SIGMOD-SIGACT-SIGART Symposium on Principles of Database Systems},
 	year = {2003},
@@ -12021,7 +12022,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/RevelaingInformation2003Dinur.pdf},
 	author = {Dinur, Irit and Nissim, Kobbi}
 }
-@inproceedings {Lpcox03samsara:honor,
+@conference {Lpcox03samsara:honor,
 	title = {Samsara: Honor Among Thieves in Peer-to-Peer Storage},
 	booktitle = {SOSP{\textquoteright}03 - Proceedings of the Nineteenth ACM Symposium on Operating Systems Principles},
 	year = {2003},
@@ -12036,7 +12037,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/p135-cox.pdf},
 	author = {Landon P. Cox and Brian D. Noble}
 }
-@inproceedings {2003_9,
+@conference {2003_9,
 	title = {Scalable Application-level Anycast for Highly Dynamic Groups},
 	booktitle = {NGC{\textquoteright}03 Networked Group Communication, Fifth International COST264 Workshop},
 	series = {Lecture Notes in Computer Science, 2003},
@@ -12070,7 +12071,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IEEE-IC-SecurityPerformance-May-2003.pdf},
 	author = {Menasc{\'e}, Daniel}
 }
-@inproceedings {Qiu:2003:SRI:863955.863974,
+@conference {Qiu:2003:SRI:863955.863974,
 	title = {On selfish routing in internet-like environments},
 	booktitle = {SIGCOMM{\textquoteright}03. Proceedings of the 2003 conference on Applications, technologies, architectures, and protocols for computer communications},
 	series = {SIGCOMM {\textquoteright}03},
@@ -12105,7 +12106,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_section = {http://portal.acm.org/citation.cfm?id=766655.766661$\#$},
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.6.1545.pdf}
 }
-@inproceedings {Naor03asimple,
+@conference {Naor03asimple,
 	title = {A Simple Fault Tolerant Distributed Hash Table},
 	booktitle = {In Second International Workshop on Peer-to-Peer Systems},
 	year = {2003},
@@ -12117,7 +12118,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.12.3388.pdf},
 	author = {Moni Naor and Udi Wieder}
 }
-@inproceedings {Harvey:2003:SSO:1251460.1251469,
+@conference {Harvey:2003:SSO:1251460.1251469,
 	title = {SkipNet: a scalable overlay network with practical locality properties},
 	booktitle = {Proceedings of the 4th conference on USENIX Symposium on Internet Technologies and Systems - Volume 4},
 	series = {USITS{\textquoteright}03},
@@ -12144,7 +12145,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/coral-iptps03.pdf},
 	author = {Michael J. Freedman and David Mazi{\`e}res}
 }
-@inproceedings {Klemm03aspecial-purpose,
+@conference {Klemm03aspecial-purpose,
 	title = {A Special-Purpose Peer-to-Peer File Sharing System for Mobile Ad Hoc Networks},
 	year = {2003},
 	abstract = {Establishing peer-to-peer (P2P) file sharing for mobile ad hoc networks ANET) requires the construction of a search algorithm for transmitting queries and search results as well as the development of a transfer protocol for downloading files matching a query. In this paper, we present a special-purpose system for searching and file transfer tailored to both the characteristics of MANET and the requirements of peer-to-peer file sharing. Our approach is based on an application layer overlay networlc As innovative feature, overlay routes are set up on demand by the search algorithm, closely matching network topology and transparently aggregating redundant transfer paths on a per-file basis. The transfer protocol guarantees high data rates and low transmission overhead by utilizing overlay routes. In a detailed ns2 simulation study, we show that both the search algorithm and the transfer protocol outperform offthe -shelf approaches based on a P2P file sharing system for the wireline Internet, TCP and a MANET routing protocol},
@@ -12170,7 +12171,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGOSP\%2703\%20-\%20Spitstream\%3A\%20High-bandwidth\%20multicast.pdf},
 	author = {Miguel Castro and Peter Druschel and Anne-Marie Kermarrec and Nandi, Animesh and Antony Rowstron and Singh, Atul}
 }
-@inproceedings {statistical-disclosure,
+@conference {statistical-disclosure,
 	title = {Statistical Disclosure Attacks: Traffic Confirmation in Open Environments},
 	booktitle = {Proceedings of Security and Privacy in the Age of Uncertainty, (SEC2003)},
 	year = {2003},
@@ -12211,7 +12212,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann03strategy.pdf},
 	author = {Thomas Fuhrmann}
 }
-@inproceedings {792432,
+@conference {792432,
 	title = {Supporting Peer-to-Peer Computing with FlexiNet},
 	booktitle = {CCGRID {\textquoteright}03: Proceedings of the 3st International Symposium on Cluster Computing and the Grid},
 	year = {2003},
@@ -12226,7 +12227,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann03supportingP2P.pdf},
 	author = {Thomas Fuhrmann}
 }
-@inproceedings {1251470,
+@conference {1251470,
 	title = {Symphony: distributed hashing in a small world},
 	booktitle = {USITS{\textquoteright}03: Proceedings of the 4th conference on USENIX Symposium on Internet Technologies and Systems},
 	year = {2003},
@@ -12240,7 +12241,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/manku03symphony.pdf},
 	author = {Manku, Gurmeet Singh and Bawa, Mayank and Prabhakar Raghavan}
 }
-@inproceedings {958494,
+@conference {958494,
 	title = {Taming the underlying challenges of reliable multihop routing in sensor networks},
 	booktitle = {SenSys {\textquoteright}03: Proceedings of the 1st international conference on Embedded networked sensor systems},
 	year = {2003},
@@ -12256,7 +12257,7 @@ We provide a rigorous stochastic analysis of how much information is revealed by
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/p14-woo.pdf},
 	author = {Woo, Alec and Tong, Terence and Culler, David}
 }
-@inproceedings {feamster:pet2003,
+@conference {feamster:pet2003,
 	title = {Thwarding Web Censorship with Untrusted Messenger Delivery},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2003)},
 	year = {2003},
@@ -12277,7 +12278,7 @@ this, we propose separating the proxy into two distinct components|the messenger
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann03topology.pdf},
 	author = {Thomas Fuhrmann}
 }
-@inproceedings {DBLP:conf/iptps/DabekZDKS03,
+@conference {DBLP:conf/iptps/DabekZDKS03,
 	title = {Towards a Common API for Structured Peer-to-Peer Overlays},
 	booktitle = {IPTPS{\textquoteright}03. Proccedings of the Second International Workshop on Peer-to-Peer Systems},
 	series = {Lecture Notes in Computer Science},
@@ -12295,7 +12296,7 @@ this, we propose separating the proxy into two distinct components|the messenger
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IPTPS\%2703\%20-\%20Towards\%20a\%20common\%20API.pdf},
 	author = {Dabek, Frank and Ben Y. Zhao and Peter Druschel and John Kubiatowicz and Ion Stoica}
 }
-@inproceedings { gnunettransport,
+@conference { gnunettransport,
 	title = {A Transport Layer Abstraction for Peer-to-Peer Networks},
 	booktitle = {Proceedings of the 3rd International Symposium on Cluster Computing and the Grid (GRID 2003)},
 	year = {2003},
@@ -12308,7 +12309,7 @@ this, we propose separating the proxy into two distinct components|the messenger
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/transport.pdf},
 	author = {Ronaldo A. Ferreira and Christian Grothoff and Paul Ruth}
 }
-@inproceedings {642636,
+@conference {642636,
 	title = {Usability and privacy: a study of Kazaa P2P file-sharing},
 	booktitle = {CHI {\textquoteright}03: Proceedings of the SIGCHI conference on Human factors in computing systems},
 	year = {2003},
@@ -12371,7 +12372,7 @@ this, we propose separating the proxy into two distinct components|the messenger
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.13.9956.pdf},
 	author = {Malika Boulkenafed and Valerie Issarny}
 }
-@inproceedings {BonehGolle:psp2002,
+@conference {BonehGolle:psp2002,
 	title = {Almost Entirely Correct Mixing With Application to Voting},
 	booktitle = {Proceedings of the 9th ACM Conference on Computer and Communications Security (CCS 2002)},
 	year = {2002},
@@ -12389,7 +12390,7 @@ this, we propose separating the proxy into two distinct components|the messenger
 	author = {Dan Boneh and Philippe Golle},
 	editor = {Vijay Atluri}
 }
-@inproceedings {664025,
+@conference {664025,
 	title = {AMnet 2.0: An Improved Architecture for Programmable Networks},
 	booktitle = {IWAN {\textquoteright}02: Proceedings of the IFIP-TC6 4th International Working Conference on Active Networks},
 	year = {2002},
@@ -12405,7 +12406,7 @@ this, we propose separating the proxy into two distinct components|the messenger
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fuhrmann02architecture_0.pdf},
 	author = {Thomas Fuhrmann and Till Harbaum and Marcus Schoeller and Martina Zitterbart}
 }
-@inproceedings {RRMPH02-1,
+@conference {RRMPH02-1,
 	title = {Analysis of an Anonymity Network for Web Browsing},
 	booktitle = {Proceedings of the IEEE 7th Intl. Workshop on Enterprise Security (WET ICE 2002)},
 	year = {2002},
@@ -12421,7 +12422,7 @@ this, we propose separating the proxy into two distinct components|the messenger
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/RRMPH02-1.pdf},
 	author = {Marc Rennhard and Sandro Rafaeli and Laurent Mathy and Bernhard Plattner and David Hutchison}
 }
-@inproceedings {wright02,
+@conference {wright02,
 	title = {An Analysis of the Degradation of Anonymous Protocols},
 	booktitle = {Proceedings of the Network and Distributed Security Symposium - NDSS {\textquoteright}02},
 	year = {2002},
@@ -12446,7 +12447,7 @@ this, we propose separating the proxy into two distinct components|the messenger
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.13.5048.pdf},
 	author = {Andrei Serjantov}
 }
-@inproceedings {Serj02-iptps,
+@conference {Serj02-iptps,
 	title = {Anonymizing censorship resistant systems},
 	booktitle = {Proceedings of the 1st International Peer To Peer Systems Workshop (IPTPS 2002)},
 	year = {2002},
@@ -12462,7 +12463,7 @@ Indeed, if one server has been pressured into removal, the other server administ
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Serj02-iptps.pdf},
 	author = {Andrei Serjantov}
 }
-@inproceedings {714768,
+@conference {714768,
 	title = {Aspects of AMnet Signaling},
 	booktitle = {NETWORKING {\textquoteright}02: Proceedings of the Second International IFIP-TC6 Networking Conference on Networking Technologies, Services, and Protocols; Performance of Computer and Communication Networks; and Mobile and Wireless Communications},
 	year = {2002},
@@ -12479,7 +12480,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/speer02networking.pdf},
 	author = {Speer, Anke and Marcus Schoeller and Thomas Fuhrmann and Martina Zitterbart}
 }
-@inproceedings {beimel-barrier,
+@conference {beimel-barrier,
 	title = {Breaking the $O(n^{1/(2k-1)})$ Barrier for Information-Theoretic Private Information Retrieval},
 	booktitle = {Proceedings of the 43rd IEEE Symposium on Foundations of Computer Science (FOCS)},
 	year = {2002},
@@ -12490,7 +12491,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/beimel-barrier.pdf},
 	author = {Amos Beimel and Yuval Ishai and Eyal Kushilevitz and Jean-Fran{\c c}ois Raymond}
 }
-@inproceedings {Mazieres:2002:BSF:571825.571840,
+@conference {Mazieres:2002:BSF:571825.571840,
 	title = {Building secure file systems out of Byzantine storage},
 	booktitle = {PODC{\textquoteright}02 - Proceedings of the 21st Annual Symposium on Principles of Distributed Computing},
 	series = {PODC {\textquoteright}02},
@@ -12523,7 +12524,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.92.7281.pdf},
 	author = {Peter Oswald and M. Amin Shokrollahi}
 }
-@inproceedings {cebolla,
+@conference {cebolla,
 	title = {Cebolla: Pragmatic IP Anonymity},
 	booktitle = {Proceedings of the 2002 Ottawa Linux Symposium},
 	year = {2002},
@@ -12542,7 +12543,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.16.4761.pdf},
 	author = {Amos Fiat and Jared Saia}
 }
-@inproceedings {chaffinch,
+@conference {chaffinch,
 	title = {Chaffinch: Confidentiality in the Face of Legal Threats},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2002)},
 	year = {2002},
@@ -12557,7 +12558,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	author = {Richard Clayton and George Danezis},
 	editor = {Fabien Petitcolas}
 }
-@inproceedings {511496,
+@conference {511496,
 	title = {Choosing reputable servents in a P2P network},
 	booktitle = {WWW {\textquoteright}02: Proceedings of the 11th international conference on World Wide Web},
 	year = {2002},
@@ -12589,7 +12590,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cocaTOCS.pdf},
 	author = {Zhou, Lidong and Schneider, Fred B. and Robbert Van Renesse}
 }
-@inproceedings {Harren:2002:CQD:646334.687945,
+@conference {Harren:2002:CQD:646334.687945,
 	title = {Complex Queries in DHT-based Peer-to-Peer Networks},
   author={Harren, Matthew and Hellerstein, Joseph M and Huebsch, Ryan and Loo, Boon Thau and Shenker, Scott and Stoica, Ion},
 	booktitle = {IPTPS{\textquoteright}01 - Revised Papers from the First International Workshop on Peer-to-Peer Systems},
@@ -12607,7 +12608,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IPTPS\%2701\%20-\%20Complex\%20queries\%20in\%20DHT-based\%20p2p\%20networks.pdf},
 	author = {Harren, Matthew and Hellerstein, Joseph M. and Huebsch, Ryan and Boon Thau Loo and S Shenker and Ion Stoica}
 }
-@inproceedings {Mui:2002:CMT:820745.821158,
+@conference {Mui:2002:CMT:820745.821158,
 	title = {A Computational Model of Trust and Reputation},
 	booktitle = {HICSS{\textquoteright}02. Proceedings of the 35th Annual Hawaii International Conference on System Sciences},
 	series = {HICSS {\textquoteright}02},
@@ -12625,7 +12626,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/HICSS\%2702\%20-\%20A\%20computational\%20model\%20of\%20trust\%20and\%20reputation.pdf},
 	author = {Lik Mui and Mojdeh Mohtashemi and Ari Halberstadt}
 }
-@inproceedings {2002_0,
+@conference {2002_0,
 	title = {Cooperative Backup System},
 	booktitle = {In The USENIX Conf. on File and Storage Technologies},
 	year = {2002},
@@ -12633,7 +12634,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/elnikety.pdf},
 	author = {Sameh Elnikety and Mark Lillibridge and Mike Burrows and Willy Zwaenepoel}
 }
-@inproceedings {715916,
+@conference {715916,
 	title = {CPCMS: A Configuration Management System Based on Cryptographic Names},
 	booktitle = {Proceedings of the FREENIX Track: 2002 USENIX Annual Technical Conference},
 	year = {2002},
@@ -12647,7 +12648,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.61.3184.pdf},
 	author = {Shapiro, Jonathan S. and Vanderburgh, John}
 }
-@inproceedings {idemix,
+@conference {idemix,
 	title = {Design and implementation of the idemix anonymous credential system},
 	booktitle = {Proceedings of the 9th ACM conference on Computer and communications security (CCS 2002)},
 	year = {2002},
@@ -12663,7 +12664,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/idemix.pdf},
 	author = {Jan Camenisch and Els Van Herreweghen}
 }
-@inproceedings {713855,
+@conference {713855,
 	title = {Design Evolution of the EROS Single-Level Store},
 	booktitle = {ATEC {\textquoteright}02: Proceedings of the General Track of the annual conference on USENIX Annual Technical Conference},
 	year = {2002},
@@ -12695,7 +12696,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IEEE\%E2\%81\%84ACM\%20Transactions\%20on\%20Networking\%20-\%20Detecting\%20shared\%20congestion\%20of\%20flows.pdf},
 	author = {Rubenstein, Dan and Kurose, Jim and Don Towsley}
 }
-@inproceedings {Feigenbaum:2002:DAM:570810.570812,
+@conference {Feigenbaum:2002:DAM:570810.570812,
 	title = {Distributed algorithmic mechanism design: recent results and future directions},
 	booktitle = {DIALM{\textquoteright}06. Proceedings of the 6th international workshop on Discrete algorithms and methods for mobile computing and communications},
 	series = {DIALM {\textquoteright}02},
@@ -12736,7 +12737,7 @@ Placing application-dedicated functionality within the network requires a flexib
 	www_section = {https://litigation-essentials.lexisnexis.com/webcd/app?action=DocumentDisplay\&crawlid=1\&doctype=cite\&docid=32+N.M.L.+Rev.+99\&srctype=smi\&srcid=3B15\&key=008c465fa13eb62c9370e4baa5eea0e5},
 	author = {Robyn Wagner}
 }
-@inproceedings {langos02,
+@conference {langos02,
 	title = {Dummy Traffic Against Long Term Intersection Attacks},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2002)},
 	year = {2002},
@@ -12754,7 +12755,7 @@ For a detailed description of our method we assume a cascade of Chaumian MIXes a
 	author = {Oliver Berthold and Heinrich Langos},
 	editor = {Roger Dingledine and Paul Syverson}
 }
-@inproceedings {camenisch2002da,
+@conference {camenisch2002da,
 	title = {Dynamic Accumulators and Application to Efficient Revocation of Anonymous Credentials},
 	booktitle = {Proceedings of CRYPTO 2002},
 	year = {2002},
@@ -12779,7 +12780,7 @@ For a detailed description of our method we assume a cascade of Chaumian MIXes a
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/180.pdf},
 	author = {Jared Saia and Amos Fiat and Steven D. Gribble and Anna R. Karlin and Stefan Saroiu}
 }
-@inproceedings {esed,
+@conference {esed,
 	title = {Efficient Sharing of Encrypted Data},
 	booktitle = {Proceedings of ACSIP 2002},
 	year = {2002},
@@ -12808,7 +12809,7 @@ For a detailed description of our method we assume a cascade of Chaumian MIXes a
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/asplos-x_annot.pdf},
 	author = {Juang, Philo and Oki, Hidekazu and Wang, Yong and Martonosi, Margaret and Peh, Li Shiuan and Rubenstein, Daniel}
 }
-@inproceedings {687814,
+@conference {687814,
 	title = {Erasure Coding Vs. Replication: A Quantitative Comparison},
 	booktitle = {IPTPS {\textquoteright}01: Revised Papers from the First International Workshop on Peer-to-Peer Systems},
 	year = {2002},
@@ -12833,7 +12834,7 @@ For a detailed description of our method we assume a cascade of Chaumian MIXes a
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Experiences_Deploying_a_Large-Scale_Emergent_Network.pdf},
 	author = {O{\textquoteright}Hearn, Bryce W.}
 }
-@inproceedings {Castro02exploitingnetwork_0,
+@conference {Castro02exploitingnetwork_0,
 	title = {Exploiting network proximity in distributed hash tables},
 	booktitle = {in International Workshop on Future Directions in Distributed Computing (FuDiCo)},
 	year = {2002},
@@ -12870,7 +12871,7 @@ in the different DHT routing protocols. We conclude that proximity neighbor sele
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SIGOPS\%20-\%20FARSITE.pdf},
 	author = {Adya, Atul and Bolosky, William J. and Miguel Castro and Cermak, Gerald and Chaiken, Ronnie and John R. Douceur and Howell, Jon and Lorch, Jacob R. and Marvin Theimer and Roger Wattenhofer}
 }
-@inproceedings {Fu:2002:FSD:505452.505453,
+@conference {Fu:2002:FSD:505452.505453,
 	title = {Fast and secure distributed read-only file system},
 	booktitle = {OSDI 2000 - Proceedings of the 4th USENIX Symposium on Operating Systems Design and Implementation},
 	volume = {20},
@@ -12890,7 +12891,7 @@ The read-only file system makes the security of published content independent fr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/OSDI\%2700\%20-\%20Fast\%20and\%20Secure\%20Distributed\%20Read-Only\%20File\%20System.pdf},
 	author = {Kevin Fu and Frans M. Kaashoek and David Mazi{\`e}res}
 }
-@inproceedings {hintz02,
+@conference {hintz02,
 	title = {Fingerprinting Websites Using Traffic Analysis},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2002)},
 	year = {2002},
@@ -12906,7 +12907,7 @@ The read-only file system makes the security of published content independent fr
 	author = {Andrew Hintz},
 	editor = {Roger Dingledine and Paul Syverson}
 }
-@inproceedings {2002_1,
+@conference {2002_1,
 	title = {Finite-length analysis of low-density parity-check codes on the binary erasure channel},
 	year = {2002},
 	month = {01/2002 },
@@ -12917,7 +12918,7 @@ The read-only file system makes the security of published content independent fr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Finite-length\%20analysis\%20of\%20low-density\%20parity-check\%20codes\%20on.pdf},
 	author = {Changyan Di and David Proietti and I. Emre Telatar and Thomas J. Richardson and R{\"u}diger L. Urbanke}
 }
-@inproceedings {Dan:SFMix03,
+@conference {Dan:SFMix03,
 	title = {Forward Secure Mixes},
 	booktitle = {Proceedings of 7th Nordic Workshop on Secure IT Systems},
 	year = {2002},
@@ -12931,7 +12932,7 @@ The read-only file system makes the security of published content independent fr
 	author = {George Danezis},
 	editor = {Fisher-Hubner, Jonsson}
 }
-@inproceedings {trickle02,
+@conference {trickle02,
 	title = {From a Trickle to a Flood: Active Attacks on Several Mix Types},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2002)},
 	year = {2002},
@@ -12971,13 +12972,13 @@ The read-only file system makes the security of published content independent fr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Levine-2002.pdf},
 	author = {Brian Neil Levine and Clay Shields}
 }
-@inproceedings {DBLP:conf/eurocrypt/RussellW02,
+@conference {DBLP:conf/eurocrypt/RussellW02,
 	title = {How to Fool an Unbounded Adversary with a Short Key},
 	year = {2002},
 	pages = {133{\textendash}148},
 	author = {Alexander Russell and Hong Wang}
 }
-@inproceedings {873217,
+@conference {873217,
 	title = {Improving Data Availability through Dynamic Model-Driven Replication in Large Peer-to-Peer Communities},
 	booktitle = {CCGRID {\textquoteright}02: Proceedings of the 2nd IEEE/ACM International Symposium on Cluster Computing and the Grid},
 	year = {2002},
@@ -12992,7 +12993,7 @@ The read-only file system makes the security of published content independent fr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.16.909.pdf},
 	author = {Ranganathan, Kavitha and Iamnitchi, Adriana and Foster, Ian}
 }
-@inproceedings {Feamster02infranet:circumventing,
+@conference {Feamster02infranet:circumventing,
 	title = {Infranet: Circumventing Web Censorship and Surveillance},
 	booktitle = {In Proceedings of the 11th USENIX Security Symposium},
 	year = {2002},
@@ -13003,7 +13004,7 @@ The read-only file system makes the security of published content independent fr
 	www_section = {http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.18.5049\&rep=rep1\&type=pdf},
 	author = {Nick Feamster and Magdalena Balazinska and Greg Harfst and Hari Balakrishnan and David Karger}
 }
-@inproceedings {infranet,
+@conference {infranet,
 	title = {Infranet: Circumventing Web Censorship and Surveillance},
 	booktitle = {Proceedings of the 11th USENIX Security Symposium},
 	year = {2002},
@@ -13033,7 +13034,7 @@ The read-only file system makes the security of published content independent fr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IEEE\%E2\%81\%84ACM\%20Trans.\%20Netw.\%2702\%20\%2810\%29-\%20Internet\%20pricing.pdf},
 	author = {Cao, Xi-Ren and Shen, Hong-Xia and Milito, Rodolfo and Wirth, Patrica}
 }
-@inproceedings {stepping-stones,
+@conference {stepping-stones,
 	title = {Inter-Packet Delay Based Correlation for Tracing Encrypted Connections through Stepping Stones},
 	booktitle = {Proceedings of ESORICS 2002},
 	year = {2002},
@@ -13049,7 +13050,7 @@ The read-only file system makes the security of published content independent fr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/2002-08-esorics02-ipd-correlation.pdf},
 	author = {Xinyuan Wang and Douglas S. Reeves and S. Felix Wu}
 }
-@inproceedings {morphmix:wpes2002,
+@conference {morphmix:wpes2002,
 	title = {Introducing MorphMix: Peer-to-Peer based Anonymous Internet Usage with Collusion Detection},
 	booktitle = {Proceedings of the Workshop on Privacy in the Electronic Society (WPES 2002)},
 	year = {2002},
@@ -13087,7 +13088,7 @@ The read-only file system makes the security of published content independent fr
 	www_section = {http://portal.acm.org/citation.cfm?id=646334$\#$},
 	editor = {Peter Druschel and Frans M. Kaashoek and Antony Rowstron}
 }
-@inproceedings {Muthitacharoen02ivy:a,
+@conference {Muthitacharoen02ivy:a,
 	title = {Ivy: A Read/Write Peer-to-Peer File System},
 	year = {2002},
 	pages = {31{\textendash}44},
@@ -13097,7 +13098,7 @@ The read-only file system makes the security of published content independent fr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.20.2147.pdf},
 	author = {Muthitacharoen, Athicha and Robert Morris and Thomer M. Gil and Bengie Chen}
 }
-@inproceedings {Maymounkov02kademlia:a,
+@conference {Maymounkov02kademlia:a,
 	title = {Kademlia: A Peer-to-peer Information System Based on the XOR Metric},
 	booktitle = {IPTPS {\textquoteright}01 - Revised Papers from the First International Workshop on Peer-to-Peer System},
 	series = {Lecture Notes in Computer Science},
@@ -13125,7 +13126,7 @@ The read-only file system makes the security of published content independent fr
 	pages = {557{\textendash}570},
 	author = {Latanya Sweeney}
 }
-@inproceedings {Eschenauer02akey-management,
+@conference {Eschenauer02akey-management,
 	title = {A Key-Management Scheme for Distributed Sensor Networks},
 	booktitle = {In Proceedings of the 9th ACM Conference on Computer and Communications Security},
 	year = {2002},
@@ -13138,7 +13139,7 @@ The read-only file system makes the security of published content independent fr
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.19.9193.pdf},
 	author = {Laurent Eschenauer and Virgil D. Gligor}
 }
-@inproceedings {limits-open,
+@conference {limits-open,
 	title = {Limits of Anonymity in Open Environments},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2002)},
 	year = {2002},
@@ -13152,7 +13153,7 @@ The read-only file system makes the security of published content independent fr
 	author = {Dogan Kesdogan and Dakshi Agrawal and Stefan Penz},
 	editor = {Fabien Petitcolas}
 }
-@inproceedings {Halevy:2002:LBE:646767.704291,
+@conference {Halevy:2002:LBE:646767.704291,
 	title = {The LSD Broadcast Encryption Scheme},
 	booktitle = {CRYPTO{\textquoteright}02 - Proceedings of the 22nd Annual International Cryptology Conference on Advances in Cryptology},
 	series = {Lecture Notes in Computer Science},
@@ -13184,7 +13185,7 @@ The read-only file system makes the security of published content independent fr
 	www_section = {http://www.computer.org/portal/web/csdl/abs/proceedings/focs/2002/1822/00/18220271abs.htm},
 	author = {Luby, Michael}
 }
-@inproceedings {randomized-checking,
+@conference {randomized-checking,
 	title = {Making mix nets robust for electronic voting by randomized partial checking},
 	booktitle = {Proceedings of the 11th USENIX Security Symposium},
 	year = {2002},
@@ -13218,7 +13219,7 @@ Randomized partial checking is particularly well suited for voting systems, as i
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Oper.\%20Res.\%20-\%20Optimal\%20Resource\%20Allocation.pdf},
 	author = {Thomas, Panagiotis and Teneketzis, Demosthenis and MacKie-Mason, Jeffrey K.}
 }
-@inproceedings {Saroiu02ameasurement,
+@conference {Saroiu02ameasurement,
 	title = {A Measurement Study of Peer-to-Peer File Sharing Systems},
 	booktitle = { Multimedia Computing and Networking (MMCN),},
 	year = {2002},
@@ -13290,7 +13291,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.15.3254.pdf},
 	author = {Landon P. Cox and Christopher D. Murray and Brian D. Noble}
 }
-@inproceedings {513828,
+@conference {513828,
 	title = {Performance analysis of the CONFIDANT protocol},
 	booktitle = {MobiHoc {\textquoteright}02: Proceedings of the 3rd ACM international symposium on Mobile ad hoc networking \& computing},
 	year = {2002},
@@ -13313,7 +13314,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/practical.pdf},
 	author = {Yaron Minsky and Ari Trachtenberg}
 }
-@inproceedings {fiveyearslater,
+@conference {fiveyearslater,
 	title = {Privacy-enhancing technologies for the Internet, II: Five years later},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2002)},
 	year = {2002},
@@ -13329,7 +13330,7 @@ We further investigate this intriguing proposal. Specifically, we
 	author = {Ian Goldberg},
 	editor = {Roger Dingledine and Paul Syverson}
 }
-@inproceedings {c.rhea:probabilistic,
+@conference {c.rhea:probabilistic,
 	title = {Probabilistic Location and Routing},
 	booktitle = {INFOCOM{\textquoteright}02. Proceedings of the 21th Annual Joint Conference of the IEEE Computer and Communications Societies},
 	year = {2002},
@@ -13345,7 +13346,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/INFOCOM\%2702\%20-\%20Probabilistic\%20location\%20and\%20routing.pdf},
 	author = {Rhea, Sean C. and John Kubiatowicz}
 }
-@inproceedings {586136,
+@conference {586136,
 	title = {Query-flood DoS attacks in gnutella},
 	booktitle = {CCS {\textquoteright}02: Proceedings of the 9th ACM conference on Computer and communications security},
 	year = {2002},
@@ -13361,7 +13362,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/p115-daswani_0.pdf},
 	author = {Daswani, Neil and Hector Garcia-Molina}
 }
-@inproceedings {Douceur:2002:RSD:850928.851884,
+@conference {Douceur:2002:RSD:850928.851884,
 	title = {Reclaiming Space from Duplicate Files in a Serverless Distributed File System},
 	booktitle = {ICDCS{\textquoteright}02 - Proceedings of the 22nd International Conference on Distributed Computing Systems (ICDCS{\textquoteright}02)},
 	series = {ICDCS {\textquoteright}02},
@@ -13379,7 +13380,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ICDCS\%2702\%20-\%20Reclaiming\%20space\%20for\%20duplicate\%20files.pdf},
 	author = {John R. Douceur and Adya, Atul and Bolosky, William J. and Simon, Dan and Marvin Theimer}
 }
-@inproceedings {Dingledine02reliablemix,
+@conference {Dingledine02reliablemix,
 	title = {Reliable MIX Cascade Networks through Reputation},
 	booktitle = {Financial Cryptography. Springer-Verlag, LNCS 2357},
 	year = {2002},
@@ -13390,7 +13391,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.19.9316.pdf},
 	author = {Roger Dingledine and Paul Syverson}
 }
-@inproceedings {casc-rep,
+@conference {casc-rep,
 	title = {Reliable MIX Cascade Networks through Reputation},
 	booktitle = {Proceedings of Financial Cryptography (FC {\textquoteright}02)},
 	year = {2002},
@@ -13406,7 +13407,7 @@ We further investigate this intriguing proposal. Specifically, we
 	author = {Roger Dingledine and Paul Syverson},
 	editor = {Matt Blaze}
 }
-@inproceedings {Cohen02replicationstrategies,
+@conference {Cohen02replicationstrategies,
 	title = {Replication Strategies in Unstructured Peer-to-Peer Networks},
 	booktitle = {Proceedings of the 2002 SIGCOMM conference},
 	volume = {Volume 32 ,  Issue 4},
@@ -13421,7 +13422,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/replication.pdf},
 	author = {Edith Cohen and S Shenker}
 }
-@inproceedings {Damiani02areputation-based_0,
+@conference {Damiani02areputation-based_0,
 	title = {A Reputation-Based Approach for Choosing Reliable Resources in Peer-to-Peer Networks},
 	booktitle = {In Proceedings of the 9th ACM Conference on Computer and Communications Security},
 	year = {2002},
@@ -13432,7 +13433,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_section = {http://seclab.dti.unimi.it/Papers/ccs02.ps  },
 	author = {Ernesto Damiani and Sabrina De Capitani di Vimercati and Stefano Paraboschi and Pierangela Samarati and Fabio Violante}
 }
-@inproceedings {Damiani02areputation-based,
+@conference {Damiani02areputation-based,
 	title = {A Reputation-Based Approach for Choosing Reliable Resources in Peer-to-Peer Networks},
 	booktitle = {In Proceedings of the 9th ACM Conference on Computer and Communications Security},
 	year = {2002},
@@ -13443,7 +13444,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_section = {http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.7.1784\&rep=rep1\&type=pdf},
 	author = {Ernesto Damiani and Sabrina De Capitani di Vimercati and Stefano Paraboschi and Pierangela Samarati and Fabio Violante}
 }
-@inproceedings {beimel-robust,
+@conference {beimel-robust,
 	title = {Robust information-theoretic private information retrieval},
 	booktitle = {Proceedings of the 3rd Conference on Security in Communication Networks},
 	series = {Lecture Notes in Computer Science},
@@ -13460,7 +13461,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/BS.pdf},
 	author = {Amos Beimel and Yoav Stahl}
 }
-@inproceedings {633045,
+@conference {633045,
 	title = {Scalable application layer multicast},
 	booktitle = {SIGCOMM {\textquoteright}02: Proceedings of the 2002 conference on Applications, technologies, architectures, and protocols for computer communications},
 	year = {2002},
@@ -13499,7 +13500,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/jsac.pdf},
 	author = {Miguel Castro and Peter Druschel and Anne-Marie Kermarrec and Antony Rowstron}
 }
-@inproceedings {Douceur:2002:SDS:784592.784803,
+@conference {Douceur:2002:SDS:784592.784803,
 	title = {A Secure Directory Service based on Exclusive Encryption},
 	booktitle = {ACSAC{\textquoteright}02 - Proceedings of the 18th Annual Computer Security Applications Conference},
 	series = {ACSAC {\textquoteright}02},
@@ -13534,7 +13535,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/osdi2002.pdf},
 	author = {Miguel Castro and Peter Druschel and Ganesh, Ayalvadi and Antony Rowstron and Dan S. Wallach}
 }
-@inproceedings {Karlof02securerouting,
+@conference {Karlof02securerouting,
 	title = {Secure Routing in Wireless Sensor Networks: Attacks and Countermeasures},
 	booktitle = {In First IEEE International Workshop on Sensor Network Protocols and Applications},
 	year = {2002},
@@ -13545,7 +13546,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/sensor-route-security_0.pdf},
 	author = {Chris Karlof and David Wagner}
 }
-@inproceedings {687810,
+@conference {687810,
 	title = {Security Considerations for Peer-to-Peer Distributed Hash Tables},
 	booktitle = {IPTPS {\textquoteright}01: Revised Papers from the First International Workshop on Peer-to-Peer Systems},
 	year = {2002},
@@ -13560,7 +13561,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/173.pdf},
 	author = {Emil Sit and Robert Morris}
 }
-@inproceedings {camenisch2002ssep,
+@conference {camenisch2002ssep,
 	title = {A Signature Scheme with Efficient Protocols},
 	booktitle = {Proceedings of SCN {\textquoteright}02, Third Conference on Security in Communication Networks},
 	year = {2002},
@@ -13575,7 +13576,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/camenisch2002ssep.pdf},
 	author = {Jan Camenisch and Anna Lysyanskaya}
 }
-@inproceedings {Byers02simpleload,
+@conference {Byers02simpleload,
 	title = {Simple Load Balancing for Distributed Hash Tables},
 	year = {2002},
 	pages = {80{\textendash}87},
@@ -13586,7 +13587,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.12.277.pdf},
 	author = {Byers, John W. and Jeffrey Considine and Michael Mitzenmacher}
 }
-@inproceedings {Capkun02smallworlds,
+@conference {Capkun02smallworlds,
 	title = {Small Worlds in Security Systems: an Analysis of the PGP Certificate Graph},
 	booktitle = {In Proceedings of The ACM New Security Paradigms Workshop},
 	year = {2002},
@@ -13617,7 +13618,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_section = {http://portal.acm.org/citation.cfm?id=567178$\#$},
 	author = {Mens, Tom}
 }
-@inproceedings {TrafHTTP,
+@conference {TrafHTTP,
 	title = {Statistical Identification of Encrypted Web Browsing Traffic},
 	booktitle = {Proceedings of the 2002 IEEE Symposium on Security and Privacy},
 	year = {2002},
@@ -13640,7 +13641,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.16.1456.pdf},
 	author = {Gabriel Montenegro}
 }
-@inproceedings {wallach02p2psecurity,
+@conference {wallach02p2psecurity,
 	title = {A Survey of Peer-to-Peer Security Issues},
 	booktitle = {ISSS},
 	year = {2002},
@@ -13668,7 +13669,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/CMU-CS-99-148.pdf},
 	author = {Mootaz Elnozahy and Lorenzo Alvisi and Yi-Min Wang and Johnson, David B.}
 }
-@inproceedings {Douceur:2002:SA:646334.687813,
+@conference {Douceur:2002:SA:646334.687813,
 	title = {The Sybil Attack},
 	booktitle = {IPTPS{\textquoteright}01 - Revised Papers from the First International Workshop on Peer-to-Peer Systems},
 	series = {Revised Papers from the First International Workshop on Peer-to-Peer Systems},
@@ -13685,7 +13686,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/IPTPS\%2702\%20-\%20Douceur\%20-\%20The\%20Sybil\%20Attack.pdf},
 	author = {John R. Douceur}
 }
-@inproceedings {tarzan:ccs02,
+@conference {tarzan:ccs02,
 	title = {Tarzan: A Peer-to-Peer Anonymizing Network Layer},
 	booktitle = {Proceedings of the 9th ACM Conference on Computer and Communications Security (CCS 2002)},
 	year = {2002},
@@ -13732,7 +13733,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/set.dvi_.pdf},
 	author = {Andrei Serjantov and George Danezis}
 }
-@inproceedings {Serj02,
+@conference {Serj02,
 	title = {Towards an Information Theoretic Metric for Anonymity},
 	booktitle = {Proceedings of Privacy Enhancing Technologies Workshop (PET 2002)},
 	year = {2002},
@@ -13757,7 +13758,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/anonimity.pdf},
 	author = {Claudia Diaz and Stefaan Seys and Joris Claessens and Bart Preneel}
 }
-@inproceedings {Diaz02,
+@conference {Diaz02,
 	title = {Towards measuring anonymity},
 	booktitle = {Proceedings of Privacy Enhancing Technologies Workshop (PET 2002)},
 	year = {2002},
@@ -13773,7 +13774,7 @@ We further investigate this intriguing proposal. Specifically, we
 	author = {Claudia Diaz and Stefaan Seys and Joris Claessens and Bart Preneel},
 	editor = {Roger Dingledine and Paul Syverson}
 }
-@inproceedings {633027,
+@conference {633027,
 	title = {Understanding BGP misconfiguration},
 	booktitle = {SIGCOMM {\textquoteright}02: Proceedings of the 2002 conference on Applications, technologies, architectures, and protocols for computer communications},
 	year = {2002},
@@ -13789,7 +13790,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/bgpmisconfig.pdf},
 	author = {Mahajan, Ratul and Wetherall, David and Anderson, Thomas}
 }
-@inproceedings {kesdogan:pet2002,
+@conference {kesdogan:pet2002,
 	title = {Unobservable Surfing on the World Wide Web: Is Private Information Retrieval an alternative to the MIX based Approach?},
 	booktitle = {Proceedings of Privacy Enhancing Technologies workshop (PET 2002)},
 	year = {2002},
@@ -13803,7 +13804,7 @@ We further investigate this intriguing proposal. Specifically, we
 	author = {Dogan Kesdogan and Mark Borning and Michael Schmeink},
 	editor = {Roger Dingledine and Paul Syverson}
 }
-@inproceedings {651321,
+@conference {651321,
 	title = {Venti: A New Approach to Archival Storage},
 	booktitle = {FAST {\textquoteright}02: Proceedings of the Conference on File and Storage Technologies},
 	year = {2002},
@@ -13818,7 +13819,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/venti-fast.pdf},
 	author = {Quinlan, Sean and Dorward, Sean}
 }
-@inproceedings {571857,
+@conference {571857,
 	title = {Viceroy: a scalable and dynamic emulation of the butterfly},
 	booktitle = {PODC {\textquoteright}02: Proceedings of the twenty-first annual symposium on Principles of distributed computing},
 	year = {2002},
@@ -13842,7 +13843,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.26.1365.pdf},
 	author = {Joseph Hall and Jason D. Hartline and Anna R. Karlin and Jared Saia and John Wilkes}
 }
-@inproceedings {Wright01ananalysis,
+@conference {Wright01ananalysis,
 	title = {An Analysis of the Degradation of Anonymous Protocols},
 	booktitle = {Network and Distributed System Security Symposium},
 	year = {2001},
@@ -13852,7 +13853,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/wright02.pdf},
 	author = {Matthew Wright and Micah Adler and Brian Neil Levine and Clay Shields}
 }
-@inproceedings {747491,
+@conference {747491,
 	title = {Application-Level Multicast Using Content-Addressable Networks},
 	booktitle = {NGC {\textquoteright}01: Proceedings of the Third International COST264 Workshop on Networked Group Communication},
 	year = {2001},
@@ -13868,7 +13869,7 @@ We further investigate this intriguing proposal. Specifically, we
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/can-mcast.pdf},
 	author = {Sylvia Paul Ratnasamy and Handley, Mark and Richard Karp and S Shenker}
 }
-@inproceedings {gup,
+@conference {gup,
 	title = {Authentic Attributes with Fine-Grained Anonymity Protection},
 	booktitle = {Proceedings of Financial Cryptography (FC 2000)},
 	year = {2001},
@@ -13898,7 +13899,7 @@ We also present a scheme resilient to even pseudonymous profiling yet preserving
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Group\%20Decision\%20and\%20Negociation\%20-\%20Automated\%20Negociation.pdf},
 	author = {Nicholas R Jennings and Peyman Faratin and Alessio R. Lomuscio and Simon Parsons and Carles Sierra and Michael Wooldridge}
 }
-@inproceedings {378347,
+@conference {378347,
 	title = {Bayeux: an architecture for scalable and fault-tolerant wide-area data dissemination},
 	booktitle = {NOSSDAV {\textquoteright}01: Proceedings of the 11th international workshop on Network and operating systems support for digital audio and video},
 	year = {2001},
@@ -13925,7 +13926,7 @@ We also present a scheme resilient to even pseudonymous profiling yet preserving
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/BD.pdf},
 	author = {Amos Beimel and Shlomi Dolev}
 }
-@inproceedings {Stoica01chord:a,
+@conference {Stoica01chord:a,
 	title = {Chord: A Scalable Peer-to-Peer Lookup Service for Internet Applications},
 	booktitle = {Proceedings of the 2001 conference on Applications, technologies, architectures, and protocols for computer communications},
 	year = {2001},
@@ -13952,7 +13953,7 @@ We also present a scheme resilient to even pseudonymous profiling yet preserving
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cliquenet-iptp.pdf},
 	author = {Emin G{\"u}n Sirer and Milo Polte and Mark Robson}
 }
-@inproceedings {Douceur01competitivehill-climbing,
+@conference {Douceur01competitivehill-climbing,
 	title = {Competitive Hill-Climbing Strategies for Replica Placement in a Distributed File System},
 	booktitle = {In DISC},
 	year = {2001},
@@ -13962,7 +13963,7 @@ We also present a scheme resilient to even pseudonymous profiling yet preserving
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/hill\%20climbing.pdf},
 	author = {John R. Douceur and Roger Wattenhofer}
 }
-@inproceedings {Michiardi01core:a,
+@conference {Michiardi01core:a,
 	title = {CORE: A Collaborative Reputation Mechanism to enforce node cooperation in Mobile Ad hoc Networks},
 	year = {2001},
 	pages = {107{\textendash}121},
@@ -13972,7 +13973,7 @@ We also present a scheme resilient to even pseudonymous profiling yet preserving
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/michpi-020801.pdf},
 	author = {Pietro Michiardi and Refik Molva}
 }
-@inproceedings {Cattaneo:2001:DIT:647054.715628,
+@conference {Cattaneo:2001:DIT:647054.715628,
 	title = {The Design and Implementation of a Transparent Cryptographic File System for UNIX},
 	booktitle = {Proceedings of the FREENIX Track: 2001 USENIX Annual Technical Conference},
 	year = {2001},
@@ -14006,7 +14007,7 @@ In this paper, we propose a new cryptographic le system, which we call TCFS , as
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.107.244.pdf},
 	author = {Luby, Michael and Michael Mitzenmacher and M. Amin Shokrollahi and Daniel A. Spielman}
 }
-@inproceedings {PShuffle,
+@conference {PShuffle,
 	title = {An Efficient Scheme for Proving a Shuffle},
 	booktitle = {Proceedings of {CRYPTO} 2001},
 	year = {2001},
@@ -14020,7 +14021,7 @@ In this paper, we propose a new cryptographic le system, which we call TCFS , as
 	author = {Jun Furukawa and Kazue Sako},
 	editor = {Joe Kilian}
 }
-@inproceedings {cl01a,
+@conference {cl01a,
 	title = {An Efficient System for Non-transferable Anonymous Credentials with Optional Anonymity Revocation},
 	booktitle = {Proceedings of the International Conference on the Theory and Application of Cryptographic Techniques (EUROCRYPT {\textquoteright}01)},
 	year = {2001},
@@ -14034,7 +14035,7 @@ In this paper, we propose a new cryptographic le system, which we call TCFS , as
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cl01a.pdf},
 	author = {Jan Camenisch and Anna Lysyanskaya}
 }
-@inproceedings {747489,
+@conference {747489,
 	title = {Extremum Feedback for Very Large Multicast Groups},
 	booktitle = {NGC {\textquoteright}01: Proceedings of the Third International COST264 Workshop on Networked Group Communication},
 	year = {2001},
@@ -14060,7 +14061,7 @@ In this paper, we propose a new cryptographic le system, which we call TCFS , as
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Freedom_Security2-1.pdf},
 	author = {Adam Back and Ian Goldberg and Adam Shostack}
 }
-@inproceedings {2001_2,
+@conference {2001_2,
 	title = {A Generalisation, a Simplification and Some Applications of Paillier{\textquoteright}s Probabilistic Public-Key System},
 	booktitle = {Proceedings of the 4th International Workshop on Practice and Theory in Public Key Cryptography: Public Key Cryptography},
 	year = {2001},
@@ -14084,7 +14085,7 @@ We then show how these building blocks can be used for applying the scheme to ef
 	abstract = {A brief description of the gnutella protocol },
 	www_section = {http://www9.limewire.com/developer/gnutella_protocol_0.4.pdf}
 }
-@inproceedings {Cabrera01herald:achieving,
+@conference {Cabrera01herald:achieving,
 	title = {Herald: Achieving a Global Event Notification Service},
 	booktitle = {In HotOS VIII},
 	year = {2001},
@@ -14108,7 +14109,7 @@ We then show how these building blocks can be used for applying the scheme to ef
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/errorsIT.pdf},
 	author = {Luby, Michael and Michael Mitzenmacher and M. Amin Shokrollahi and Daniel A. Spielman}
 }
-@inproceedings {Golle01incentivesfor,
+@conference {Golle01incentivesfor,
 	title = {Incentives for Sharing in Peer-to-Peer Networks},
 	booktitle = {EC{\textquoteright}01: Proceedings of the Second International Workshop on Electronic Commerce},
 	year = {2001},
@@ -14139,7 +14140,7 @@ Our construction strictly improves upon previous constructions and resolves some
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/beimel01informationtheoretic.pdf},
 	author = {Amos Beimel and Yuval Ishai}
 }
-@inproceedings {Department01instrumentingthe,
+@conference {Department01instrumentingthe,
 	title = {Instrumenting The World With Wireless Sensor Networks},
 	booktitle = {In International Conference on Acoustics, Speech, and Signal Processing (ICASSP 2001)},
 	year = {2001},
@@ -14150,7 +14151,7 @@ Our construction strictly improves upon previous constructions and resolves some
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.3.3027.pdf},
 	author = {Deborah Estrin and Gregory J. Pottie and L. Girod and Mani Srivastava}
 }
-@inproceedings {2001_3,
+@conference {2001_3,
 	title = {Investigating the energy consumption of a wireless network interface in an ad hoc networking environment},
 	booktitle = { INFOCOM 2001. Twentieth Annual Joint Conference of the IEEE Computer and Communications Societies. Proceedings. IEEE },
 	year = {2001},
@@ -14164,7 +14165,7 @@ Our construction strictly improves upon previous constructions and resolves some
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/infocom01investigating.pdf},
 	author = {Feeney, Laura Marie and Nilsson, Martin}
 }
-@inproceedings {502052,
+@conference {502052,
 	title = {A low-bandwidth network file system},
 	booktitle = {SOSP {\textquoteright}01: Proceedings of the eighteenth ACM symposium on Operating systems principles},
 	year = {2001},
@@ -14197,7 +14198,7 @@ Our construction strictly improves upon previous constructions and resolves some
 	author = {Cramer, Ronald and Damg{\'a}rd, Ivan and Nielsen, JesperB},
 	editor = {Pfitzmann, Birgit}
 }
-@inproceedings {jakobsson-optimally,
+@conference {jakobsson-optimally,
 	title = {An Optimally Robust Hybrid Mix Network (Extended Abstract)},
 	booktitle = {Proceedings of Principles of Distributed Computing - {PODC} {\textquoteright}01},
 	year = {2001},
@@ -14210,7 +14211,7 @@ Our construction strictly improves upon previous constructions and resolves some
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.24.8205.pdf},
 	author = {Jakobsson, Markus and Ari Juels}
 }
-@inproceedings {Druschel01past:a,
+@conference {Druschel01past:a,
 	title = {PAST: A large-scale, persistent peer-to-peer storage utility},
 	booktitle = {In HotOS VIII},
 	year = {2001},
@@ -14221,7 +14222,7 @@ Our construction strictly improves upon previous constructions and resolves some
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.1.1674.pdf},
 	author = {Peter Druschel and Antony Rowstron}
 }
-@inproceedings {697650,
+@conference {697650,
 	title = {Pastry: Scalable, Decentralized Object Location, and Routing for Large-Scale Peer-to-Peer Systems},
 	booktitle = {Middleware {\textquoteright}01: Proceedings of the IFIP/ACM International Conference on Distributed Systems Platforms Heidelberg},
 	year = {2001},
@@ -14238,7 +14239,7 @@ Pastry is completely decentralized, scalable, and self-organizing; it automatica
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/pastry.pdf},
 	author = {Antony Rowstron and Peter Druschel}
 }
-@inproceedings {Rowstron01pastry:scalable,
+@conference {Rowstron01pastry:scalable,
 	title = {Pastry: Scalable, decentralized object location and routing for large-scale peer-to-peer systems},
 	booktitle = {Middleware{\textquoteright}01 - Proceedings of the IFIP/ACM International Conference on Distributed Systems Platforms},
 	series = {Lecture Notes in Computer Science},
@@ -14309,7 +14310,7 @@ This compilation represents the collected wisdom of today{\textquoteright}s peer
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.130.6088.pdf},
 	author = {Jean-Pierre Hubaux and Levente Butty{\'a}n and Srdan Capkun}
 }
-@inproceedings {501437,
+@conference {501437,
 	title = {The quest for security in mobile ad hoc networks},
 	booktitle = {MobiHoc {\textquoteright}01: Proceedings of the 2nd ACM international symposium on Mobile ad hoc networking \& computing},
 	year = {2001},
@@ -14325,7 +14326,7 @@ This compilation represents the collected wisdom of today{\textquoteright}s peer
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Quest01.pdf},
 	author = {Jean-Pierre Hubaux and Levente Butty{\'a}n and Srdan Capkun}
 }
-@inproceedings {patterns-failure,
+@conference {patterns-failure,
 	title = {Real World Patterns of Failure in Anonymity Systems},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2001)},
 	year = {2001},
@@ -14348,7 +14349,7 @@ This compilation represents the collected wisdom of today{\textquoteright}s peer
 	www_section = {http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.19.7912\&rep=rep1\&type=pdf},
 	author = {Roger Dingledine and Michael J. Freedman and David Hopwood and David Molnar}
 }
-@inproceedings {mix-acc,
+@conference {mix-acc,
 	title = {A Reputation System to Increase MIX-net Reliability},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2001)},
 	year = {2001},
@@ -14382,7 +14383,7 @@ This compilation represents the collected wisdom of today{\textquoteright}s peer
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ron-sosp2001.pdf},
 	author = {Andersen, David and Hari Balakrishnan and Frans M. Kaashoek and Robert Morris}
 }
-@inproceedings {Scarlata01responderanonymity,
+@conference {Scarlata01responderanonymity,
 	title = {Responder Anonymity and Anonymous Peer-to-Peer File Sharing},
 	booktitle = {Network Protocols, 2001. Ninth International Conference on },
 	year = {2001},
@@ -14394,7 +14395,7 @@ This compilation represents the collected wisdom of today{\textquoteright}s peer
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/APFS.pdf},
 	author = {Vincent Scarlata and Brian Neil Levine and Clay Shields}
 }
-@inproceedings {383072,
+@conference {383072,
 	title = {A scalable content-addressable network},
 	booktitle = {SIGCOMM {\textquoteright}01: Proceedings of the 2001 conference on Applications, technologies, architectures, and protocols for computer communications},
 	year = {2001},
@@ -14435,7 +14436,7 @@ This compilation represents the collected wisdom of today{\textquoteright}s peer
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/081199.pdf},
 	author = {Eric Friedman and Paul Resnick}
 }
-@inproceedings {strong-eternity,
+@conference {strong-eternity,
 	title = {The Strong Eternity Service},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2001)},
 	year = {2001},
@@ -14451,7 +14452,7 @@ This compilation represents the collected wisdom of today{\textquoteright}s peer
 	author = {Tonda Benes},
 	editor = {Ira S. Moskowitz}
 }
-@inproceedings {Waldman01tangler:a,
+@conference {Waldman01tangler:a,
 	title = {Tangler: A Censorship-Resistant Publishing System Based On Document Entanglements},
 	booktitle = {In Proceedings of the 8th ACM Conference on Computer and Communications Security},
 	year = {2001},
@@ -14461,7 +14462,7 @@ This compilation represents the collected wisdom of today{\textquoteright}s peer
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/tangler.pdf},
 	author = {Marc Waldman and David Mazi{\`e}res}
 }
-@inproceedings {waldman01tangler,
+@conference {waldman01tangler,
 	title = {Tangler: a censorship-resistant publishing system based on document entanglements},
 	booktitle = {Proceedings of the 8th ACM Conference on Computer and Communications Security (CCS 2001)},
 	year = {2001},
@@ -14499,7 +14500,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Laffont\%20\%26\%20Martimort\%20-\%20The\%20Theory\%20of\%20Incentives.pdf},
 	author = {Jean-Jacques Laffont and David Martimort}
 }
-@inproceedings {back01,
+@conference {back01,
 	title = {Traffic Analysis Attacks and Trade-Offs in Anonymity Providing Systems},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 2001)},
 	year = {2001},
@@ -14516,7 +14517,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	author = {Adam Back and Ulf M{\"o}ller and Anton Stiglic},
 	editor = {Ira S. Moskowitz}
 }
-@inproceedings {shuffle:ccs01,
+@conference {shuffle:ccs01,
 	title = {A Verifiable Secret Shuffle and its Application to E-Voting},
 	booktitle = {Proceedings of the 8th ACM Conference on Computer and Communications Security (CCS 2001)},
 	year = {2001},
@@ -14541,7 +14542,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/SRC-RR-168.pdf},
 	author = {Allan Heydon and Roy Levin and Timothy Mann and Yuan Yu}
 }
-@inproceedings {502054,
+@conference {502054,
 	title = {Wide-area cooperative storage with CFS},
 	booktitle = {SOSP {\textquoteright}01: Proceedings of the eighteenth ACM symposium on Operating systems principles},
 	year = {2001},
@@ -14557,7 +14558,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cfs_sosp.pdf},
 	author = {Dabek, Frank and Frans M. Kaashoek and David Karger and Robert Morris and Ion Stoica}
 }
-@inproceedings {Heimbigner00adaptingpublish/subscribe,
+@conference {Heimbigner00adaptingpublish/subscribe,
 	title = {Adapting Publish/Subscribe Middleware to Achieve Gnutella-like Functionality},
 	booktitle = {In Proc. of SAC},
 	year = {2000},
@@ -14576,14 +14577,14 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/terminology.pdf},
 	author = {Andreas Pfitzmann and Marit Hansen}
 }
-@inproceedings {DBLP:conf/diau/PfitzmannK00,
+@conference {DBLP:conf/diau/PfitzmannK00,
 	title = {Anonymity, Unobservability, and Pseudonymity - A Proposal for Terminology},
 	booktitle = {Workshop on Design Issues in Anonymity and Unobservability},
 	year = {2000},
 	pages = {1-9},
 	author = {Andreas Pfitzmann and Marit K{\"o}hntopp}
 }
-@inproceedings {mitkuro,
+@conference {mitkuro,
 	title = {Attack for Flash MIX},
 	booktitle = {Proceedings of ASIACRYPT 2000},
 	year = {2000},
@@ -14596,7 +14597,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.20.6972.pdf},
 	author = {Masashi Mitomo and Kaoru Kurosawa}
 }
-@inproceedings {rao-pseudonymity,
+@conference {rao-pseudonymity,
 	title = {Can Pseudonymity Really Guarantee Privacy?},
 	booktitle = {Proceedings of the 9th USENIX Security Symposium},
 	year = {2000},
@@ -14610,7 +14611,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/rao.pdf},
 	author = {Josyula R. Rao and Pankaj Rohatgi}
 }
-@inproceedings {339337,
+@conference {339337,
 	title = {A case for end system multicast (keynote address)},
 	booktitle = {SIGMETRICS {\textquoteright}00: Proceedings of the 2000 ACM SIGMETRICS international conference on Measurement and modeling of computer systems},
 	year = {2000},
@@ -14627,7 +14628,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/jsac-2001.pdf},
 	author = {Chu, Yang-hua and Rao, Sanjay G. and Zhang, Hui}
 }
-@inproceedings {disad-free-routes,
+@conference {disad-free-routes,
 	title = {The disadvantages of free MIX routes and how to overcome them},
 	booktitle = {Proceedings of Designing Privacy Enhancing Technologies: Workshop on Design Issues in Anonymity and Unobservability},
 	year = {2000},
@@ -14642,7 +14643,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/disad-free-routes.pdf},
 	author = {Oliver Berthold and Andreas Pfitzmann and Ronny Standtke}
 }
-@inproceedings {820485,
+@conference {820485,
 	title = {Energy-Efficient Communication Protocol for Wireless Microsensor Networks},
 	booktitle = {HICSS {\textquoteright}00: Proceedings of the 33rd Hawaii International Conference on System Sciences-Volume 8},
 	year = {2000},
@@ -14657,7 +14658,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.90.8499.pdf},
 	author = {Heinzelman, Wendi Rabiner and Chandrakasan, Anantha and Hari Balakrishnan}
 }
-@inproceedings {514164,
+@conference {514164,
 	title = {Enforcing service availability in mobile ad-hoc WANs},
 	booktitle = {MobiHoc {\textquoteright}00: Proceedings of the 1st ACM international symposium on Mobile ad hoc networking \& computing},
 	year = {2000},
@@ -14689,7 +14690,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.65.4280_0.pdf},
 	author = {Bolosky, William J. and John R. Douceur and Ely, David and Marvin Theimer}
 }
-@inproceedings {Pei00fisheyestate,
+@conference {Pei00fisheyestate,
 	title = {Fisheye State Routing in Mobile Ad Hoc Networks},
 	booktitle = {In ICDCS Workshop on Wireless Networks and Mobile Computing},
 	year = {2000},
@@ -14700,7 +14701,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/05_75_fisheye-state-routing-in_0.pdf},
 	author = {Guangyu Pei and Mario Gerla and Tsu-Wei Chen}
 }
-@inproceedings {freehaven-berk,
+@conference {freehaven-berk,
 	title = {The Free Haven Project: Distributed Anonymous Storage Service},
 	booktitle = {Proceedings of Designing Privacy Enhancing Technologies: Workshop on Design Issues in Anonymity and Unobservability},
 	year = {2000},
@@ -14725,7 +14726,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/freedom2-arch.pdf},
 	author = {Philippe Boucher and Adam Shostack and Ian Goldberg}
 }
-@inproceedings {Clarke00freenet:a_0,
+@conference {Clarke00freenet:a_0,
 	title = {Freenet: A Distributed Anonymous Information Storage and Retrieval System},
 	booktitle = {Designing Privacy Enhancing Technologies, International Workshop on Design Issues in Anonymity and Unobservability, ,, Proceedings 2001},
 	year = {2000},
@@ -14737,7 +14738,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/freenet.pdf},
 	author = {Ian Clarke and Sandberg, Oskar and Brandon Wiley and Theodore W. Hong}
 }
-@inproceedings {freenet,
+@conference {freenet,
 	title = {Freenet: A Distributed Anonymous Information Storage and Retrieval System},
 	booktitle = {Proceedings of Designing Privacy Enhancing Technologies: Workshop on Design Issues in Anonymity and Unobservability},
 	year = {2000},
@@ -14749,7 +14750,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.10.4919_0.pdf},
 	author = {Ian Clarke and Sandberg, Oskar and Brandon Wiley and Theodore W. Hong}
 }
-@inproceedings {Clarke00freenet:a,
+@conference {Clarke00freenet:a,
 	title = {Freenet: A Distributed Anonymous Information Storage and Retrieval System},
 	year = {2000},
 	pages = {46{\textendash}66},
@@ -14759,7 +14760,7 @@ This book focuses on the principal-agent model, the "simple" situation where a p
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.10.4919.pdf},
 	author = {Ian Clarke and Sandberg, Oskar and Brandon Wiley and Theodore W. Hong}
 }
-@inproceedings {desmedt,
+@conference {desmedt,
 	title = {How To Break a Practical MIX and Design a New One},
 	booktitle = {Proceedings of EUROCRYPT 2000},
 	year = {2000},
@@ -14774,7 +14775,7 @@ A part of this research was done while the author visited the Tokyo Institute of
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.29.1814.pdf},
 	author = {Yvo Desmedt and Kaoru Kurosawa}
 }
-@inproceedings {hybrid-mix,
+@conference {hybrid-mix,
 	title = {A Length-Invariant Hybrid MIX},
 	booktitle = {Proceedings of ASIACRYPT 2000},
 	year = {2000},
@@ -14788,7 +14789,7 @@ A part of this research was done while the author visited the Tokyo Institute of
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.87.7718.pdf},
 	author = {Miyako Ohkubo and Masayuki Abe}
 }
-@inproceedings {379239,
+@conference {379239,
 	title = {OceanStore: an architecture for global-scale persistent storage},
 	booktitle = {ASPLOS-IX: Proceedings of the ninth international conference on Architectural support for programming languages and operating systems},
 	year = {2000},
@@ -14803,7 +14804,7 @@ A part of this research was done while the author visited the Tokyo Institute of
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/p190-kubi.pdf},
 	author = {John Kubiatowicz and Bindel, David and Chen, Yan and Czerwinski, Steven and Eaton, Patrick and Geels, Dennis and Gummadi, Ramakrishna and Rhea, Sean C. and Weatherspoon, Hakim and Wells, Chris and Ben Y. Zhao}
 }
-@inproceedings {onion-discex00,
+@conference {onion-discex00,
 	title = {Onion Routing Access Configurations},
 	booktitle = {Proceedings of the DARPA Information Survivability Conference and Exposition (DISCEX 2000)},
 	volume = {1},
@@ -14817,7 +14818,7 @@ A part of this research was done while the author visited the Tokyo Institute of
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/onion-discex00.pdf},
 	author = {Paul Syverson and Michael Reed and David Goldschlag}
 }
-@inproceedings {Jannotti:2000:ORM:1251229.1251243,
+@conference {Jannotti:2000:ORM:1251229.1251243,
 	title = {Overcast: reliable multicasting with on overlay network},
 	booktitle = {OSDI{\textquoteright}00. Proceedings of the 4th conference on Symposium on Operating System Design \& Implementation},
 	series = {OSDI{\textquoteright}00},
@@ -14837,7 +14838,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/OSDI\%2700\%20-\%20Overcast.pdf},
 	author = {Jannotti, John and Gifford, David K. and Johnson, Kirk L. and Frans M. Kaashoek and O{\textquoteright}Toole Jr., James W.}
 }
-@inproceedings {Song00practicaltechniques,
+@conference {Song00practicaltechniques,
 	title = {Practical Techniques for Searches on Encrypted Data},
 	booktitle = { Security and Privacy, 2000. S\&P 2000. Proceedings. 2000 IEEE Symposium on},
 	year = {2000},
@@ -14848,7 +14849,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/encrypteddata.pdf},
 	author = {Dawn Xiaodong Song and David Wagner and Adrian Perrig}
 }
-@inproceedings {Shields00aprotocol,
+@conference {Shields00aprotocol,
 	title = {A Protocol for Anonymous Communication Over the Internet},
 	booktitle = {In ACM Conference on Computer and Communications Security},
 	year = {2000},
@@ -14874,7 +14875,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.5.3353.pdf},
 	author = {Ian Goldberg}
 }
-@inproceedings {publius,
+@conference {publius,
 	title = {Publius: A robust, tamper-evident, censorship-resistant and source-anonymous web publishing system},
 	booktitle = {Proceedings of the 9th USENIX Security Symposium},
 	year = {2000},
@@ -14910,7 +14911,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Fuhrmann2001a.pdf},
 	author = {Thomas Fuhrmann}
 }
-@inproceedings {Minsky00setreconciliation,
+@conference {Minsky00setreconciliation,
 	title = {Set Reconciliation with Nearly Optimal Communication Complexity},
 	booktitle = {International Symposium on Information Theory},
 	year = {2000},
@@ -14919,7 +14920,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/reconcile.pdf},
 	author = {Yaron Minsky and Ari Trachtenberg and Richard Zippel}
 }
-@inproceedings {Papadopouli00sevendegrees,
+@conference {Papadopouli00sevendegrees,
 	title = {Seven Degrees of Separation in Mobile Ad Hoc Networks},
 	booktitle = {In IEEE GLOBECOM},
 	year = {2000},
@@ -14930,7 +14931,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/globecom00.pdf},
 	author = {Maria Papadopouli and Henning G. Schulzrinne}
 }
-@inproceedings {335325,
+@conference {335325,
 	title = {The small-world phenomenon: an algorithm perspective},
 	booktitle = {STOC {\textquoteright}00: Proceedings of the thirty-second annual ACM symposium on Theory of computing},
 	year = {2000},
@@ -14946,7 +14947,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/swn.pdf},
 	author = {Kleinberg, Jon}
 }
-@inproceedings {onion-routing:pet2000,
+@conference {onion-routing:pet2000,
 	title = {Towards an Analysis of Onion Routing Security},
 	booktitle = {Proceedings of Designing Privacy Enhancing Technologies: Workshop on Design Issues in Anonymity and Unobservability},
 	year = {2000},
@@ -14962,7 +14963,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.34.5547.pdf},
 	author = {Paul Syverson and Gene Tsudik and Michael Reed and Carl Landwehr}
 }
-@inproceedings {raymond00,
+@conference {raymond00,
 	title = {Traffic Analysis: Protocols, Attacks, Design Issues, and Open Problems},
 	booktitle = {Proceedings of Designing Privacy Enhancing Technologies: Workshop on Design Issues in Anonymity and Unobservability},
 	year = {2000},
@@ -14998,7 +14999,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_section = {http://books.google.com/books?hl=es\&lr=\&id=5kNC4fqssYQC\&oi=fnd\&pg=PR15\&dq=trust-region+methods\&ots=j1JMMQ3QJY\&sig=ncLlD3mqZ4KEQ1Z9V2qId4rNffo$\#$v=onepage\&q\&f=false},
 	author = {Andrew R. Conn and Nicholas I. M. Gould and Philippe L. Toint}
 }
-@inproceedings {web-mix:pet2000,
+@conference {web-mix:pet2000,
 	title = {Web MIXes: A system for anonymous and unobservable Internet access},
 	booktitle = {Proceedings of Designing Privacy Enhancing Technologies: Workshop on Design Issues in Anonymity and Unobservability},
 	year = {2000},
@@ -15049,7 +15050,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.73.6464.pdf},
 	author = {Shlomi Dolev and Rafail Ostrovsky}
 }
-@inproceedings {Nisan:1999:AMD:301250.301287,
+@conference {Nisan:1999:AMD:301250.301287,
 	title = {Algorithmic Mechanism Design},
 	booktitle = {STOC{\textquoteright}99. Proceedings of the thirty-first Annual ACM Symposium On Theory of Computing},
 	series = {STOC {\textquoteright}99},
@@ -15067,7 +15068,7 @@ Results based on simulations confirm that Overcast provides its added functional
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/STOC\%2799\%20-\%20Nisan\%20\%26\%20Ronen\%20-\%20Algorithmic\%20mechanism\%20design.pdf},
 	author = {Nisan, Noam and Ronen, Amir}
 }
-@inproceedings {Nisan:1999:ASA:1764891.1764893,
+@conference {Nisan:1999:ASA:1764891.1764893,
 	title = {Algorithms for Selfish Agents},
 	booktitle = {STAC{\textquoteright}99. Symposium on Theoretical Aspects of Computer Science},
 	series = {STACS{\textquoteright}99},
@@ -15103,7 +15104,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/ij_23-alife99.pdf},
 	author = {Dorigo, Marco and Di Caro, Gianni and Gambardella, Luca M.}
 }
-@inproceedings {1039861,
+@conference {1039861,
 	title = {Burt: The Backup and Recovery Tool},
 	booktitle = {LISA {\textquoteright}99: Proceedings of the 13th USENIX conference on System administration},
 	year = {1999},
@@ -15143,7 +15144,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	url = {http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.32.3665\&rep=rep1\&type=pdf},
 	author = {Ian Clarke}
 }
-@inproceedings {301333,
+@conference {301333,
 	title = {Flash mixing},
 	booktitle = {PODC {\textquoteright}99: Proceedings of the eighteenth annual ACM symposium on Principles of distributed computing},
 	year = {1999},
@@ -15156,7 +15157,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/flash-mix.pdf},
 	author = {Jakobsson, Markus}
 }
-@inproceedings {syverson99,
+@conference {syverson99,
 	title = {Group Principals and the Formalization of Anonymity},
 	booktitle = {Proceedings of the World Congress on Formal Methods (1)},
 	year = {1999},
@@ -15170,7 +15171,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/1999syverson-fm99.pdf},
 	author = {Paul Syverson and Stuart Stubblebine}
 }
-@inproceedings {758535,
+@conference {758535,
 	title = {New Sequences of Linear Time Erasure Codes Approaching the Channel Capacity},
 	booktitle = {AAECC-13: Proceedings of the 13th International Symposium on Applied Algebra, Algebraic Algorithms and Error-Correcting Codes},
 	year = {1999},
@@ -15185,7 +15186,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/new_sequences_of_linear_time_erasure_cod_64778.pdf},
 	author = {M. Amin Shokrollahi}
 }
-@inproceedings {313556,
+@conference {313556,
 	title = {Next century challenges: scalable coordination in sensor networks},
 	booktitle = {MobiCom {\textquoteright}99: Proceedings of the 5th annual ACM/IEEE international conference on Mobile computing and networking},
 	year = {1999},
@@ -15212,7 +15213,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/onionrouting.pdf},
 	author = {David Goldschlag and Michael Reed and Paul Syverson}
 }
-@inproceedings {1268712,
+@conference {1268712,
 	title = {Operation-based update propagation in a mobile file system},
 	booktitle = {ATEC {\textquoteright}99: Proceedings of the annual conference on USENIX Annual Technical Conference},
 	year = {1999},
@@ -15225,7 +15226,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/lee.pdf},
 	author = {Lee, Yui-Wah and Leung, Kwong-Sak and Satyanarayanan, Mahadev}
 }
-@inproceedings {1999_1,
+@conference {1999_1,
 	title = {Public-key Cryptosystems Based on Composite Degree Residuosity Classes},
 	booktitle = {Proceedings of the 17th International Conference on Theory and Application of Cryptographic Techniques},
 	year = {1999},
@@ -15251,7 +15252,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_section = {http://econpapers.repec.org/RePEc:bla:restud:v:66:y:1999:i:1:p:3-21},
 	author = {Mirrlees, James A.}
 }
-@inproceedings {314722,
+@conference {314722,
 	title = {Analysis of random processes via And-Or tree evaluation},
 	booktitle = {SODA {\textquoteright}98: Proceedings of the ninth annual ACM-SIAM symposium on Discrete algorithms},
 	year = {1998},
@@ -15290,7 +15291,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/crowds.pdf},
 	author = {Michael K. Reiter and Aviel D. Rubin}
 }
-@inproceedings {nym-alias-net,
+@conference {nym-alias-net,
 	title = {The Design, Implementation and Operation of an Email Pseudonym Server},
 	booktitle = {Proceedings of the 5th ACM Conference on Computer and Communications Security (CCS 1998)},
 	year = {1998},
@@ -15304,7 +15305,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/nym-alias-net.pdf},
 	author = {David Mazi{\`e}res and Frans M. Kaashoek}
 }
-@inproceedings {285258,
+@conference {285258,
 	title = {A digital fountain approach to reliable distribution of bulk data},
 	booktitle = {SIGCOMM{\textquoteright}98: Proceedings of SIGCOMM{\textquoteright}98 Conference on Applications, Technologies, Architectures, and Protocols for Computer Communication},
 	year = {1998},
@@ -15362,7 +15363,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_section = {http://www.eskimo.com/~weidai/pipenet.txt},
 	author = {Dai, Wei}
 }
-@inproceedings {tau-indy,
+@conference {tau-indy,
 	title = {A Random Server Model for Private Information Retrieval or How to Achieve Information Theoretic PIR Avoiding Database Replication},
 	booktitle = {Proceedings of the Second International Workshop on Randomization and Approximation Techniques in Computer Science (RANDOM {\textquoteright}98)},
 	year = {1998},
@@ -15401,7 +15402,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_section = {http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.11.2201\&rep=rep1\&type=pdf},
 	author = {Oded Goldreich}
 }
-@inproceedings {stop-and-go,
+@conference {stop-and-go,
 	title = {Stop-and-Go MIXes: Providing Probabilistic Anonymity in an Open System},
 	booktitle = {Proceedings of Information Hiding Workshop (IH 1998)},
 	year = {1998},
@@ -15415,7 +15416,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/stop-and-go.pdf},
 	author = {Dogan Kesdogan and Jan Egner and Roland B{\"u}schkes}
 }
-@inproceedings {abe,
+@conference {abe,
 	title = {Universally Verifiable mix-net With Verification Work Independent of The Number of mix Servers},
 	booktitle = {Proceedings of EUROCRYPT 1998},
 	year = {1998},
@@ -15428,7 +15429,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_section = {http://www.springerlink.com/content/hl8838u4l9354544/},
 	author = {Masayuki Abe}
 }
-@inproceedings {CPIR,
+@conference {CPIR,
 	title = {Computationally private information retrieval (extended abstract)},
 	booktitle = {Proceedings of the twenty-ninth annual ACM symposium on Theory of Computing (STOC {\textquoteright}97)},
 	year = {1997},
@@ -15458,7 +15459,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/fault.dvi_.pdf},
 	author = {Wakaha Ogata and Kaoru Kurosawa and Kazue Sako and Kazunori Takatani}
 }
-@inproceedings {Luby:1997:PLC:258533.258573,
+@conference {Luby:1997:PLC:258533.258573,
 	title = {Practical Loss-Resilient Codes},
 	booktitle = {STOC 1997 - Proceedings of the 29th annual ACM symposium on Theory of computing},
 	series = {STOC {\textquoteright}97},
@@ -15476,7 +15477,7 @@ This exposition presents a model to formally study such algorithms. This model, 
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/STOC\%2797\%20-\%20Practical\%20Loss-Resilient\%20Codes.pdf},
 	author = {Luby, Michael and Michael Mitzenmacher and M. Amin Shokrollahi and Daniel A. Spielman and Stemann, Volker}
 }
-@inproceedings {1997_0,
+@conference {1997_0,
 	title = {Privacy-enhancing Technologies for the Internet},
 	booktitle = {Compcon {\textquoteright}97. Proceedings, IEEE},
 	year = {1997},
@@ -15520,7 +15521,7 @@ for future loss recovery. With the adaptive algorithm, our reliable multicast de
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.41.4031.pdf},
 	author = {Ian Goldberg and David Wagner}
 }
-@inproceedings {716407_0,
+@conference {716407_0,
 	title = {An Empirical Study of Delta Algorithms},
 	booktitle = {ICSE {\textquoteright}96: Proceedings of the SCM-6 Workshop on System Configuration Management},
 	year = {1996},
@@ -15534,7 +15535,7 @@ for future loss recovery. With the adaptive algorithm, our reliable multicast de
 	www_section = {http://www.springerlink.com/content/584k258285p18x4g/},
 	author = {Hunt, James J. and Vo, Kiem-Phong and Tichy, Walter F.}
 }
-@inproceedings {716407,
+@conference {716407,
 	title = {An Empirical Study of Delta Algorithms},
 	booktitle = {ICSE {\textquoteright}96: Proceedings of the SCM-6 Workshop on System Configuration Management},
 	year = {1996},
@@ -15548,7 +15549,7 @@ for future loss recovery. With the adaptive algorithm, our reliable multicast de
 	www_section = {http://www.springerlink.com/content/584k258285p18x4g/},
 	author = {Hunt, James J. and Vo, Kiem-Phong and Tichy, Walter F.}
 }
-@inproceedings {1267576,
+@conference {1267576,
 	title = {Establishing identity without certification authorities},
 	booktitle = {SSYM{\textquoteright}96: Proceedings of the 6th conference on USENIX Security Symposium, Focusing on Applications of Cryptography},
 	year = {1996},
@@ -15562,7 +15563,7 @@ for future loss recovery. With the adaptive algorithm, our reliable multicast de
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.31.7263.pdf},
 	author = {Ellison, Carl M.}
 }
-@inproceedings {Anderson96theeternity,
+@conference {Anderson96theeternity,
 	title = {The Eternity Service},
 	booktitle = {Pragocrypt{\textquoteright}96 - Proceedings of the 1st International Conference on the Theory and Applications of Crytology},
 	year = {1996},
@@ -15574,7 +15575,7 @@ for future loss recovery. With the adaptive algorithm, our reliable multicast de
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/eternity.pdf},
 	author = {Ross Anderson}
 }
-@inproceedings {onion-routing:ih96,
+@conference {onion-routing:ih96,
 	title = {Hiding Routing Information},
 	booktitle = {Proceedings of Information Hiding: First International Workshop},
 	year = {1996},
@@ -15591,7 +15592,7 @@ in the communication chain. This implies that neither the respondent nor his pro
 	author = {David Goldschlag and Michael Reed and Paul Syverson},
 	editor = {Ross Anderson}
 }
-@inproceedings {Fargier:1996:MCS:1892875.1892901,
+@conference {Fargier:1996:MCS:1892875.1892901,
 	title = {Mixed constraint satisfaction: a framework for decision problems under incomplete knowledge},
 	booktitle = {AAAI{\textquoteright}96 - Proceedings of the 13th National Conference on Artificial Intelligence},
 	series = {AAAI{\textquoteright}96},
@@ -15608,7 +15609,7 @@ in the communication chain. This implies that neither the respondent nor his pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/AAAI\%2796\%20-\%20Mixed\%20constraint\%20satisfaction.pdf},
 	author = {Fargier, H{\'e}l{\`e}ne and Lang, J{\'e}r{\^o}me and Schiex, Thomas}
 }
-@inproceedings {Gulcu96mixingemail,
+@conference {Gulcu96mixingemail,
 	title = {Mixing email with babel},
 	booktitle = {Symposium on Network and Distributed System Security},
 	year = {1996},
@@ -15638,7 +15639,7 @@ in the communication chain. This implies that neither the respondent nor his pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.39.8384.pdf},
 	author = {Mark Stemm and Paul Gauthier and Daishi Harada and Katz, Randy H.}
 }
-@inproceedings {672869,
+@conference {672869,
 	title = {Balanced Distributed Search Trees Do Not Exist},
 	booktitle = {WADS {\textquoteright}95: Proceedings of the 4th International Workshop on Algorithms and Data Structures},
 	year = {1995},
@@ -15677,7 +15678,7 @@ in the communication chain. This implies that neither the respondent nor his pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.120.7766.pdf},
 	author = {Nithya Ramanathan and Tom Schoellhammer and Deborah Estrin and Mark Hansen and Tom Harmon and Eddie Kohler and Mani Srivastava}
 }
-@inproceedings {cooper,
+@conference {cooper,
 	title = {Preserving Privacy in a Network of Mobile Computers},
 	booktitle = {Proceedings of the 1995 IEEE Symposium on Security and Privacy},
 	year = {1995},
@@ -15689,7 +15690,7 @@ in the communication chain. This implies that neither the respondent nor his pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/cooper.pdf},
 	author = {David A. Cooper and Kenneth P. Birman}
 }
-@inproceedings {pir,
+@conference {pir,
 	title = {Private Information Retrieval},
 	booktitle = {Proceedings of the IEEE Symposium on Foundations of Computer Science},
 	year = {1995},
@@ -15702,7 +15703,7 @@ in the communication chain. This implies that neither the respondent nor his pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/pir.pdf},
 	author = {Benny Chor and Oded Goldreich and Eyal Kushilevitz and Madhu Sudan}
 }
-@inproceedings {SK,
+@conference {SK,
 	title = {Receipt-Free MIX-Type Voting Scheme - A Practical Solution to the Implementation of a Voting Booth},
 	booktitle = {Proceedings of EUROCRYPT 1995},
 	year = {1995},
@@ -15725,7 +15726,7 @@ in the communication chain. This implies that neither the respondent nor his pro
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.40.8955.pdf},
 	author = {Alan Demers and Karin Petersen and Mike Spreitzer and Douglas Terry and Marvin Theimer and Brent Welch}
 }
-@inproceedings {1267093,
+@conference {1267093,
 	title = {File system design for an NFS file server appliance},
 	booktitle = {WTEC{\textquoteright}94: Proceedings of the USENIX Winter 1994 Technical Conference on USENIX Winter 1994 Technical Conference},
 	year = {1994},
@@ -15740,7 +15741,7 @@ This paper describes WAFL (Write Anywhere File Layout), which is a file system d
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.40.3691.pdf},
 	author = {Hitz, Dave and Lau, James and Malcolm, Michael}
 }
-@inproceedings {Manber94findingsimilar,
+@conference {Manber94findingsimilar,
 	title = {Finding Similar Files in a Large File System},
 	booktitle = {USENIX WINTER 1994 TECHNICAL CONFERENCE},
 	year = {1994},
@@ -15774,7 +15775,7 @@ This paper describes WAFL (Write Anywhere File Layout), which is a file system d
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/JPE\%20\%281993\%29\%20-\%20Gode\%20\%26\%20Sunder\%20-\%20Allocative\%20Efficiency.pdf},
 	author = {Dhananjay K. Gode and Shyam Sunder}
 }
-@inproceedings {rackoff93cryptographic,
+@conference {rackoff93cryptographic,
 	title = {Cryptographic Defense Against Traffic Analysis},
 	booktitle = {Proceedings of ACM Symposium on Theory of Computing},
 	year = {1993},
@@ -15788,7 +15789,7 @@ This paper describes WAFL (Write Anywhere File Layout), which is a file system d
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/rackoff93cryptographic.pdf},
 	author = {Charles Rackoff and Daniel R. Simon}
 }
-@inproceedings {PIK,
+@conference {PIK,
 	title = {Efficient anonymous channel and all/nothing election scheme},
 	booktitle = {Proceedings of EUROCRYPT 1993},
 	year = {1993},
@@ -15826,7 +15827,7 @@ Elliptic Curve Public Key Cryptosystems is a valuable reference resource for res
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.53.7112.pdf},
 	author = {Jochen Liedtke}
 }
-@inproceedings {1993_2,
+@conference {1993_2,
 	title = {SURF-2: A program for dependability evaluation of complex hardware and software systems},
 	year = {1993},
 	abstract = {SURF-2, a software tool for evaluating system dependability, is described. It is especially designed for an evaluation-based system design approach in which multiple design solutions need to be compared from the dependability viewpoint. System behavior may be modeled either by Markov chains or by generalized stochastic Petri nets. The tool supports the evaluation of different measures of dependability, including pointwise measures, asymptotic measures, mean sojourn times and, by superposing a reward structure on the behavior model, reward measures such as expected performance or cost},
@@ -15834,7 +15835,7 @@ Elliptic Curve Public Key Cryptosystems is a valuable reference resource for res
 	doi = {10.1109/FTCS.1993.627372 },
 	www_section = {http://www.pubzone.org/dblp/conf/ftcs/BeoumesKALAMBS93}
 }
-@inproceedings {DBLP:conf/eurocrypt/ChaumP92,
+@conference {DBLP:conf/eurocrypt/ChaumP92,
 	title = {Transferred Cash Grows in Size},
 	booktitle = {EUROCRYPT{\textquoteright}92 Workshop on the Theory and Application of of Cryptographic Techniques},
 	series = {Lecture Notes in Computer Science},
@@ -15865,7 +15866,7 @@ Elliptic Curve Public Key Cryptosystems is a valuable reference resource for res
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/Tech\%20report\%20-\%20DCOP\%20as\%20a\%20formal\%20model\%20of\%20PARC.pdf},
 	author = {Makoto Yokoo and Edmund H. Durfee}
 }
-@inproceedings {Deswarte91intrusiontolerance,
+@conference {Deswarte91intrusiontolerance,
 	title = {Intrusion Tolerance in Distributed Computing Systems},
 	booktitle = {In Proceedings of the IEEE Symposium on Research in Security and Privacy},
 	year = {1991},
@@ -15875,7 +15876,7 @@ Elliptic Curve Public Key Cryptosystems is a valuable reference resource for res
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.56.9968.pdf},
 	author = {Yves Deswarte and Laurent Blain and Jean-charles Fabre}
 }
-@inproceedings {ISDN-mixes,
+@conference {ISDN-mixes,
 	title = {ISDN-mixes: Untraceable communication with very small bandwidth overhead},
 	booktitle = {Proceedings of the GI/ITG Conference on Communication in Distributed Systems},
 	year = {1991},
@@ -15889,7 +15890,7 @@ Elliptic Curve Public Key Cryptosystems is a valuable reference resource for res
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.43.4892.pdf},
 	author = {Andreas Pfitzmann and Birgit Pfitzmann and Michael Waidner}
 }
-@inproceedings {Waidner:1990:DCD:111563.111630,
+@conference {Waidner:1990:DCD:111563.111630,
 	title = {The dining cryptographers in the disco: unconditional sender and recipient untraceability with computationally secure serviceability},
 	booktitle = {EUROCRYPT{\textquoteright}89 - Proceedings of the workshop on the theory and application of cryptographic techniques on Advances in cryptology},
 	series = {EUROCRYPT {\textquoteright}89},
@@ -15928,7 +15929,7 @@ We also sketch applications of these signatures to a payment system, solving dis
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/10.1.1.85.9211.pdf},
 	author = {Pugh, William}
 }
-@inproceedings {1988_0,
+@conference {1988_0,
 	title = {Completeness Theorems for Non-cryptographic Fault-tolerant Distributed Computation},
 	booktitle = {Proceedings of the Twentieth Annual ACM Symposium on Theory of Computing},
 	year = {1988},
@@ -15955,7 +15956,7 @@ We also sketch applications of these signatures to a payment system, solving dis
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/dcnet-jcrypt88.pdf},
 	author = {David Chaum}
 }
-@inproceedings {1988_1,
+@conference {1988_1,
 	title = {Founding Crytpography on Oblivious Transfer},
 	booktitle = {Proceedings of the Twentieth Annual ACM Symposium on Theory of Computing},
 	year = {1988},
@@ -15970,7 +15971,7 @@ We also sketch applications of these signatures to a payment system, solving dis
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/oblivious_transfer.pdf},
 	author = {Kilian, Joe}
 }
-@inproceedings {1987,
+@conference {1987,
 	title = {How to Play ANY Mental Game or A Completeness Theorem for Protocols with Honest Majority},
 	booktitle = {Proceedings of the Nineteenth Annual ACM Symposium on Theory of Computing},
 	year = {1987},
@@ -16000,7 +16001,7 @@ We also sketch applications of these signatures to a payment system, solving dis
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/024-DatabasesPaper.pdf},
 	author = {Andrew D. Birrell and Michael B. Jones and Edward P. Wobber}
 }
-@inproceedings {Stumm:1987:SDR:55482.55508,
+@conference {Stumm:1987:SDR:55482.55508,
 	title = {Strategies for decentralized resource management},
 	booktitle = {SIGCOMM{\textquoteright}87. Proceedings of the ACM Workshop on Frontiers in Computer Communications Technology},
 	series = {SIGCOMM {\textquoteright}87},
@@ -16051,7 +16052,7 @@ We also sketch applications of these signatures to a payment system, solving dis
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/r5rs.pdf},
 	author = {Rees, Jonathan and Clinger, William and Richard Kelsey}
 }
-@inproceedings {Tanenbaum86usingsparse,
+@conference {Tanenbaum86usingsparse,
 	title = {Using Sparse Capabilities in a Distributed Operating System},
 	year = {1986},
 	pages = {558{\textendash}563},
@@ -16076,7 +16077,7 @@ We also sketch applications of these signatures to a payment system, solving dis
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/pods06_paper01.pdf},
 	author = {Fischer, Michael J. and Lynch, Nancy A. and Paterson, Michael S.}
 }
-@inproceedings {pfitzmann85,
+@conference {pfitzmann85,
 	title = {Networks Without User Observability {\textendash} Design Options},
 	booktitle = {Proceedings of EUROCRYPT 1985},
 	year = {1985},
@@ -16091,7 +16092,7 @@ Therefore, we summarize basic concepts to keep the recipient and sender or at le
 	www_section = {http://www.semper.org/sirene/publ/PfWa_86anonyNetze.html},
 	author = {Andreas Pfitzmann and Michael Waidner}
 }
-@inproceedings {ElGamal:1985:PKC:19478.19480,
+@conference {ElGamal:1985:PKC:19478.19480,
 	title = {A Public Key Cryptosystem and a Signature Scheme Based on Discrete Logarithms},
 	booktitle = {Proceedings of CRYPTO 84 on Advances in cryptology},
 	year = {1985},
@@ -16165,7 +16166,7 @@ Therefore, we summarize basic concepts to keep the recipient and sender or at le
 	www_pdf_url = {https://gnunet.org/git/bibliography.git/tree/docs/byz.pdf},
 	author = {Lamport, Leslie and Shostak, Robert and Pease, Marshall}
 }
-@inproceedings {1982,
+@conference {1982,
 	title = {Protocols for Secure Computations},
 	booktitle = {Proceedings of the 23rd Annual Symposium on Foundations of Computer Science},
 	year = {1982},
@@ -16206,7 +16207,7 @@ The technique can also be used to form rosters of untraceable digital pseudonyms
 	www_section = {http://www.computer.org/portal/web/csdl/doi/10.1109/SP.1980.10006},
 	author = {Ralph C. Merkle}
 }
-@inproceedings {1979,
+@conference {1979,
 	title = {Compact Encodings of List Structure},
 	year = {1979},
 	publisher = {ACM  New York, NY, USA},

	gnunetbib Bibliography (BibTeX, based on AnonBib)
	Log \| Files \| Refs \| README \| LICENSE