]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 2 Aug 2012 16:09:08 +0000 (12:09 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 2 Aug 2012 16:09:08 +0000 (12:09 -0400)
commita64c56470d6ff698b87db1660656d4795d845239
treeb3a2437338f4c7654773e84425e5c8fa308676fa
parent403b0d6e023e4953446d14b477de09f716ee4240
parentca80ea61b5f0cf0e3f2e1cef756e7405e22d310b
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
evutil_rand.c
configure.in
evutil_rand.c