]> granicus.if.org Git - libevent/commitdiff
Merge branch '21_http_error_cb_squashed'
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 19:13:24 +0000 (15:13 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Apr 2013 19:13:24 +0000 (15:13 -0400)

Trivial merge