Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2012-03-22 13:48:33 -04:00
commit d1a904d0eb

2
README
View File

@ -121,6 +121,7 @@ fixing bugs:
Brian Koehmstedt Brian Koehmstedt
Marko Kreen Marko Kreen
Valery Kyholodov Valery Kyholodov
Ross Lagerwall
Scott Lamb Scott Lamb
Christopher Layne Christopher Layne
Adam Langley Adam Langley
@ -169,6 +170,7 @@ fixing bugs:
Steve Snyder Steve Snyder
Dug Song Dug Song
Dongsheng Song Dongsheng Song
Hannes Sowa
Ferenc Szalai Ferenc Szalai
Brodie Thiesfield Brodie Thiesfield
Jason Toffaletti Jason Toffaletti