Commit 2c827e76e7a9c59429bf8a4bf570eeceef14b0fd

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

Merge branch '21_cve_2014_6272_v2'