• Show log

    Commit

  • Hash : 4b70286e
    Author : Nick Mathewson
    Date : 2012-05-02T17:12:23

    Merge remote-tracking branch 'origin/patches-2.0'
    
    Conflicts:
    	ChangeLog
    	README
    	evdns.c
    	sample/dns-example.c