Commit ee0185e534691da7e265035a4dfd8915a0ddfc26

Nick Mathewson 2014-01-22T11:55:26

Merge remote-tracking branch 'joakimsoderberg/win32_fixes'