Commit 489b07132fcb19eb9588f635d8eefe1cb47f19aa

Nick Mathewson 2015-01-05T09:30:02

Merge branch '20_cve_2014_6272_v2' into patches-2.0