sengler/tor-parallel-relay-conn @ 7893f2cd73310aaf20283f72dc05167a23584ac6

David Goulet 29955f13e5 Merge branch 'tor-github/pr/1022'		5 gadi atpakaļ
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	9 gadi atpakaļ
bug30316	0ab4dc7ef7 Move bandwidth-file-headers line to appear in the correct vote section	5 gadi atpakaļ
ticket28878	9e5c27bd2c changes file for ticket 28878	5 gadi atpakaļ
ticket29617	37aae23945 OOM-purge the DNS cache one part at a time	5 gadi atpakaļ