Commit f9182d7249562a2aa547135d2f15ffe3e03c77fa

Nick Mathewson 2012-11-02T11:46:14

Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation Conflicts: http.c signal.c