summaryrefslogtreecommitdiff
path: root/evutil_time.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-08-02 12:09:08 -0400
committerNick Mathewson <nickm@torproject.org>2012-08-02 12:09:08 -0400
commita64c56470d6ff698b87db1660656d4795d845239 (patch)
treeb3a2437338f4c7654773e84425e5c8fa308676fa /evutil_time.c
parent403b0d6e023e4953446d14b477de09f716ee4240 (diff)
parentca80ea61b5f0cf0e3f2e1cef756e7405e22d310b (diff)
downloadlibevent-a64c56470d6ff698b87db1660656d4795d845239.tar.gz
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts: evutil_rand.c
Diffstat (limited to 'evutil_time.c')
0 files changed, 0 insertions, 0 deletions