commit 37cf6ff77398dd699e21889f7e6d6796207a862b
parent 4f2927b2c09da3c85626d6b8342e48a279f31f57
Author: Nick Mathewson <nickm@torproject.org>
Date: Fri, 28 Feb 2014 08:30:16 -0500
Merge remote-tracking branch 'hopper/master'
Conflicts:
anonbib.bib
Diffstat:
4 files changed, 68 insertions(+), 44 deletions(-)
diff --git a/BibTeX.py b/BibTeX.py
@@ -10,6 +10,7 @@ import cStringIO
import re
import sys
import os
+import copy
import config
@@ -160,10 +161,15 @@ def splitEntriesBy(entries, field):
result = {}
for ent in entries:
key = ent.get(field)
- try:
- result[key].append(ent)
- except:
- result[key] = [ent]
+ if field in config.MULTI_VAL_FIELDS:
+ key = [k.strip() for k in key.split(',')]
+ else:
+ key = [key]
+ for k in key:
+ try:
+ result[k].append(ent)
+ except:
+ result[k] = [ent]
return result
def splitSortedEntriesBy(entries, field):
@@ -195,7 +201,12 @@ def sortEntriesBy(entries, field, default):
v = ent.get(field, default)
if v.startswith("<span class='bad'>"):
v = default
- tmp.append((txtize(v), i, ent))
+ if field in config.MULTI_VAL_FIELDS:
+ for v_j in v.split(','):
+ ent_j = copy.deepcopy(ent)
+ ent_j.__setitem__(field, v_j.strip())
+ tmp.append((txtize(v_j.strip()), i, ent_j))
+ else: tmp.append((txtize(v), i, ent))
tmp.sort()
return [ t[2] for t in tmp ]
diff --git a/anonbib.bib b/anonbib.bib
@@ -22,7 +22,8 @@
@string{censorship = "Communications Censorship"}
@string{credentials = "E-Cash / Anonymous Credentials"}
@string{misc = "Misc"}
-
+@string{torperf = "Tor Performance"}
+@string{and = ", "}
#
# Proposed new sections: application privacy, data anonymization, ...
#
@@ -3028,7 +3029,7 @@ Sudan},
publisher = {Springer},
location = {Ottawa, Canada},
bookurl = {http://petworkshop.org/2007/},
- www_section = comm,
+ www_section = comm # and # torperf,
www_pdf_url = {http://petworkshop.org/2007/papers/PET2007_preproc_Improving_efficiency.pdf},
www_tags = {selected},
www_remarks = {Introduces Diffie-Hellman-based handshakes to build
@@ -3849,7 +3850,7 @@ www_pdf_url = "http://pasiphae.cs.rpi.edu/~edmanm/isi07.pdf",
year = {2008},
month = {February},
publisher = {Internet Society},
- www_section = comm ,
+ www_section = comm # and # torperf,
www_pdf_url = "http://www.crhc.uiuc.edu/~nikita/papers/tuneup-cr.pdf",
www_tags = {selected},
}
@@ -3903,7 +3904,7 @@ www_pdf_url = "http://pasiphae.cs.rpi.edu/~edmanm/isi07.pdf",
publisher={IEEE CS Press},
www_tags = {selected},
www_pdf_url = {http://www.uni-bamberg.de/fileadmin/uni/fakultaeten/wiai_lehrstuehle/praktische_informatik/Dateien/Publikationen/loesing2008performance.pdf},
- www_section = {Anonymous communication},
+ www_section = comm # and # torperf,
}
@inproceedings{PanchenkoPR08,
@@ -3921,7 +3922,7 @@ www_pdf_url = "http://pasiphae.cs.rpi.edu/~edmanm/isi07.pdf",
publisher = {IEEE Computer Society},
www_tags = {},
www_ps_url = {http://www.pimenidis.org/research/papers/PaPiRe08.ps},
- www_section = {Anonymous communication},
+ www_section = comm # and # torperf,
}
@inproceedings{PanchenkoP06,
@@ -4022,7 +4023,7 @@ www_pdf_url = "http://pasiphae.cs.rpi.edu/~edmanm/isi07.pdf",
publisher = {Springer-Verlag},
www_pdf_url = {https://www.cosic.esat.kuleuven.be/publications/article-890.pdf},
www_tags = {selected},
- www_section = {misc},
+ www_section = misc,
}
@InProceedings{diaz-esorics2008,
@@ -4037,7 +4038,7 @@ www_pdf_url = "http://pasiphae.cs.rpi.edu/~edmanm/isi07.pdf",
series = {Lecture Notes in Computer Science},
location = {Malaga,ES},
publisher = {Springer-Verlag},
- www_section = {misc},
+ www_section = misc,
www_pdf_url = {https://www.cosic.esat.kuleuven.be/publications/article-1051.pdf},
}
%% pages = {18},
@@ -4058,7 +4059,7 @@ www_pdf_url = "http://pasiphae.cs.rpi.edu/~edmanm/isi07.pdf",
www_tags = {selected},
www_pdf_url = {https://www.cosic.esat.kuleuven.be/publications/article-925.pdf},
- www_section = {traffic},
+ www_section = traffic,
}
@inproceedings{torspinISC08,
@@ -4178,7 +4179,7 @@ www_pdf_url = "http://pasiphae.cs.rpi.edu/~edmanm/isi07.pdf",
location = {Leuven, Belgium},
bookurl = {http://petsymposium.org/2008/},
pages = {115--132},
- www_section = {traffic},
+ www_section = traffic,
www_tags = {selected},
www_pdf_url = {http://www.cl.cam.ac.uk/~sjm217/papers/pets08metrics.pdf},
}
@@ -4194,7 +4195,7 @@ www_pdf_url = "http://pasiphae.cs.rpi.edu/~edmanm/isi07.pdf",
location = {Leuven, Belgium},
bookurl = {http://petsymposium.org/2008/},
pages = {133--150},
- www_section = {traffic},
+ www_section = traffic,
www_tags = {selected},
www_pdf_url = {http://research.microsoft.com/~gdane/papers/bridge.pdf},
www_important = 1,
@@ -4427,7 +4428,7 @@ Omer Reingold",
month = {September},
www_abstract_url = {http://hdl.handle.net/10012/4011},
www_pdf_url = {http://uwspace.uwaterloo.ca/bitstream/10012/4011/1/thesis.pdf},
- www_section = comm,
+ www_section = comm # and # torperf,
www_tags = {selected},
}
@@ -4557,7 +4558,7 @@ Omer Reingold",
year = 2010,
month = {January},
editor = {Radu Sion},
- www_section = comm,
+ www_section = comm # and # torperf,
www_pdf_url = "http://freehaven.net/anonbib/papers/incentives-fc10.pdf",
www_tags={selected},
}
@@ -4569,7 +4570,7 @@ Omer Reingold",
year = 2010,
month = {January},
editor = {Radu Sion},
- www_section = comm,
+ www_section = comm # and # torperf,
www_pdf_url = "http://www.cypherpunks.ca/~iang/pubs/SphinxOR.pdf",
www_tags={selected},
}
@@ -4645,7 +4646,7 @@ Omer Reingold",
pages = {73--93},
crossref = {DBLP:conf/pet/2009},
www_pdf_url = {http://micah.cis.upenn.edu/papers/pets09.pdf},
- www_section = comm,
+ www_section = comm # and # torperf,
www_tags={selected},
}
@@ -4832,7 +4833,7 @@ Omer Reingold",
crossref = {DBLP:conf/ccs/2009},
www_tags = {selected},
www_pdf_url = {http://www-users.cs.umn.edu/~hopper/torsk-ccs.pdf},
- www_section = comm
+ www_section = comm # and # torperf,
}
@inproceedings{DBLP:conf/ccs/VassermanJTHK09,
@@ -4888,7 +4889,7 @@ Omer Reingold",
crossref = {DBLP:conf/ccs/2010},
www_tags = {selected},
www_pdf_url = {http://www-users.cs.umn.edu/~hopper/braids_ccs.pdf},
- www_section = comm
+ www_section = comm # and # torperf,
}
@inproceedings{ccs10-scheduling,
@@ -4897,7 +4898,7 @@ Omer Reingold",
crossref = {DBLP:conf/ccs/2010},
www_tags = {selected},
www_pdf_url = {http://www.cypherpunks.ca/~iang/pubs/ewma-ccs.pdf},
- www_section = comm
+ www_section = comm # and # torperf,
}
@inproceedings{ccs10-dissent,
@@ -4999,7 +5000,7 @@ Omer Reingold",
volume = {5536},
series = {Lecture Notes in Computer Science},
isbn = {978-3-642-01956-2},
- www_section = comm,
+ www_section = comm # and # torperf,
www_tags = {selected},
www_pdf_url = {http://www.uni-bamberg.de/fileadmin/uni/fakultaeten/wiai_lehrstuehle/praktische_informatik/Dateien/Publikationen/acns09-llw.pdf},
}
@@ -5509,7 +5510,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
booktitle = {Proceedings of the USENIX Workshop on Cyber Security Experimentation and Test (CSET 2011)},
year = {2011},
month = {August},
- www_section = comm,
+ www_section = comm # and # torperf,
www_pdf_url = {http://www.usenix.org/events/cset11/tech/final_files/Bauer.pdf},
www_tags={selected},
}
@@ -5532,7 +5533,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
booktitle = {Proceedings of the 20th USENIX Security Symposium},
year = {2011},
month = {August},
- www_section = comm,
+ www_section = comm # and # torperf,
www_pdf_url = {http://www.usenix.org/events/sec11/tech/full_papers/Mittal.pdf},
www_tags={selected},
}
@@ -5558,7 +5559,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
location = {Waterloo, Canada},
www_tags = {selected},
www_pdf_url = {http://freehaven.net/anonbib/papers/pets2011/p8-alsabah.pdf},
- www_section = comm
+ www_section = comm # and # torperf,
}
@inproceedings{pets2011-i2p,
@@ -5600,7 +5601,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
booktitle = {Proceedings of 2011 Annual Computer Security Applications Conference (ACSAC'11), Orlando, FL, USA},
year = {2011},
month = {December},
- www_section = comm,
+ www_section = comm # and # torperf,
www_pdf_url = {https://security.cs.georgetown.edu/papers/tortoise.pdf},
www_tags={selected},
}
@@ -5678,7 +5679,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
pages={247--262},
year={2011},
organization={IEEE},
- www_section={misc},
+ www_section=misc,
www_pdf_url={http://infoscience.epfl.ch/record/164572/files/ShokriTLH_SP11.pdf}
}
@@ -5689,7 +5690,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
pages={57--76},
year={2011},
publisher={Springer},
- www_section={misc},
+ www_section=misc,
www_pdf_url={http://infoscience.epfl.ch/record/164777/files/ShokriTDHL_PETS11.pdf}
}
@@ -5711,7 +5712,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
year = {2012},
month = {May},
www_tags = {selected},
- www_section = comm,
+ www_section = comm # and # torperf,
www_pdf_url = {http://www.cs.ucr.edu/~harsha/papers/oakland12.pdf},
}
@@ -5734,7 +5735,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
year = {2012},
month = {February},
www_tags = {selected},
- www_section = comm,
+ www_section = comm # and # torperf,
www_pdf_url = {http://www.cypherpunks.ca/~iang/pubs/Congestion_Aware_FC12.pdf},
}
@@ -5775,7 +5776,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
publisher = {Internet Society},
www_tags={selected},
www_pdf_url = {http://www.internetsociety.org/sites/default/files/09_3.pdf},
- www_section = comm
+ www_section = comm # and # torperf,
}
@inproceedings{flashproxy-pets12,
@@ -5844,7 +5845,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
booktitle = {Proceedings of the USENIX Workshop on Cyber Security Experimentation and Test (CSET 2012)},
year = {2012},
month = {August},
- www_section = comm,
+ www_section = comm # and # torperf,
www_pdf_url = {http://www-users.cs.umn.edu/~jansen/papers/tormodel-cset2012.pdf},
www_tags={selected},
}
@@ -5857,7 +5858,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
booktitle = {Proceedings of the ACM Sigmetrics/Performance Workshop on Privacy and Anonymity for the Digital Economy},
www_tags = {selected},
www_pdf_url = {http://pade12.mytestbed.net/pade12-final6.pdf},
- www_section = comm
+ www_section = comm # and # torperf,
}
@phdthesis{koot2012,
@@ -5913,7 +5914,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
month = {August},
www_tags = {selected},
www_pdf_url = {http://www-users.cs.umn.edu/~jansen/papers/throttling-sec2012.pdf},
- www_section = traffic
+ www_section = traffic # and # torperf,
}
@inproceedings{wpes12-cogs,
@@ -5939,7 +5940,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
publisher = {ACM},
www_tags = {selected},
www_pdf_url = {http://freehaven.net/anonbib/papers/torchestra-wpes.pdf},
- www_section = comm
+ www_section = comm # and # torperf,
}
@inproceedings{ccs2012-classification,
@@ -5949,7 +5950,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
Communications Security (CCS 2012)},
Month = {October},
year = {2012},
- www_section = comm,
+ www_section = comm # and # torperf,
www_tags = {selected},
www_pdf_url = {https://cs.uwaterloo.ca/~iang/pubs/difftor-ccs.pdf},
}
@@ -6039,7 +6040,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
Booktitle = {Proceedings of the 31st IEEE International Performance Computing and Communications Conference (IPCCC 2012)},
Month = {December},
year = {2012},
- www_section = comm,
+ www_section = comm # and # torperf,
www_tags = {selected},
www_pdf_url = {http://lorre.uni.lu/~andriy/papers/ipccc12-tor-performance.pdf},
}
@@ -6067,7 +6068,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
publisher = {Internet Society},
www_tags={selected},
www_pdf_url = {http://www-users.cs.umn.edu/~jansen/papers/lira-ndss2013.pdf},
- www_section = comm
+ www_section = comm # and # torperf,
}
@inproceedings{ndss13-rbridge,
@@ -6091,7 +6092,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
publisher = {Internet Society},
www_tags={selected},
www_pdf_url = {https://security.cs.georgetown.edu/~msherr/papers/tor-relaystudy.pdf},
- www_section = comm
+ www_section = comm # and # torperf,
}
@inproceedings{ndss13-website-fingerprinting,
@@ -6265,7 +6266,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
month={July},
year={2013},
www_tags = {selected},
- www_section= comm,
+ www_section= comm # and # torperf,
www_pdf_url= {http://www.cypherpunks.ca/~iang/pubs/conflux-pets.pdf},
}
@@ -6585,7 +6586,7 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
Communications Security (CCS 2013)},
Month = {November},
year = {2013},
- www_section = comm,
+ www_section = comm # and # torperf,
www_tags = {selected},
www_pdf_url = {http://www.cypherpunks.ca/~iang/pubs/pctcp-ccs.pdf},
}
@@ -6695,3 +6696,14 @@ www_pdf_url = {http://www.cs.gmu.edu/~xwangc/Publications/DSN2009-Anonymity-Came
www_section = {Anonymous Communication},
www_pdf_url = {https://www-users.cs.umn.edu/~jansen/publications/jansen-phd-dissertation.pdf},
}
+
+@inproceedings{nowlanreducing,
+ title={Reducing Latency in Tor Circuits with Unordered Delivery},
+ author={Nowlan, Michael F and Wolinsky, David and Ford, Bryan},
+ booktitle={3rd USENIX Workshop on Free and Open Communications on the Internet},
+ organization={USENIX},
+ year = 2013,
+ www_section = comm # and # torperf,
+ www_pdf_url = "http://dedis.cs.yale.edu/2010/anon/papers/foci13.pdf",
+}
+
diff --git a/anonbib.cfg b/anonbib.cfg
@@ -228,7 +228,7 @@ TAG_SHORT_TITLES = { "": "Anonymity Bibliography",
# Directories where tag pages get generated.
TAG_DIRECTORIES = { '': "full",
"selected": "" }
-
+MULTI_VAL_FIELDS = [ "www_section" ]
# Make cached stuff group-writable. Make sure that your cache directories
# are sticky!
CACHE_UMASK = 002
diff --git a/config.py b/config.py
@@ -10,7 +10,7 @@ _KEYS = [ "ALL_TAGS",
"DOWNLOAD_CONNECT_TIMEOUT","INITIAL_STRINGS",
"MASTER_BIB", "NO_COLLAPSE_AUTHORS", "OMIT_ENTRIES",
"OUTPUT_DIR", "TEMPLATE_FILE", "BIBTEX_TEMPLATE_FILE",
- "REQUIRE_KEY", "TAG_TITLES", "TAG_DIRECTORIES", "TAG_SHORT_TITLES",
+ "REQUIRE_KEY", "TAG_TITLES", "TAG_DIRECTORIES", "TAG_SHORT_TITLES", "MULTI_VAL_FIELDS"
]
for _k in _KEYS:
@@ -54,3 +54,4 @@ AUTHOR_RE_LIST = []
NO_COLLAPSE_AUTHORS_RE_LIST = []
ALPHABETIZE_AUTHOR_AS_RE_LIST = []
+
