]> granicus.if.org Git - libevent/commitdiff
Merge branch '21_ifaddr'
authorNick Mathewson <nickm@torproject.org>
Wed, 7 Dec 2011 23:17:34 +0000 (18:17 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 7 Dec 2011 23:17:34 +0000 (18:17 -0500)

Trivial merge