]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 17:54:19 +0000 (13:54 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 17:54:19 +0000 (13:54 -0400)
commit6b94ffcec532038cdebacd1e9e78a7a6276ad6a5
tree2d583d4a0cfda5ec84633e49df4f558cf2223ad5
parenteb6b0c1f90136b374dfa9afd532fde4020ac7a67
parent66dacfa2a58602d82e0413c8217ec38c9871d5cf
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
configure.ac
configure.ac