• Show log

    Commit

  • Hash : 2e6a9850
    Author : Nick Mathewson
    Date : 2012-11-01T18:12:07

    Merge remote-tracking branch 'github/20_win64_compilation' into 21_win64_compilation
    
    Conflicts:
    	event.c
    	http.c
    	sample/event-read-fifo.c
    	test/regress_bufferevent.c