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

Conflicts:
	sample/http-server.c
This commit is contained in:
Nick Mathewson 2014-08-29 14:32:10 -04:00
commit 8bf769c47a

View File

@ -277,7 +277,7 @@ send_document_cb(struct evhttp_request *req, void *arg)
#endif
evbuffer_add_printf(evb, "</ul></body></html>\n");
#ifdef _WIN32
CloseHandle(d);
FindClose(d);
#else
closedir(d);
#endif