]> granicus.if.org Git - libevent/commit
Merge remote-tracking branch 'origin/patches-2.0'
authorNick Mathewson <nickm@torproject.org>
Thu, 19 Sep 2013 14:45:58 +0000 (10:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 Sep 2013 14:45:58 +0000 (10:45 -0400)
commitee063766f6dfc297778283caf81515bbfe3e97f3
treed230ec4194ed13150529db327b7ba31de750d9f2
parent0a051ef93cb869111cb470daa90451f387f7da8c
parent5cb3865a40d1c42ecf7a3dd2dc4a42e0d5b13d49
Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
evutil_rand.c
evutil_rand.c