]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/bug12985_024' into bug12984_025
authorNick Mathewson <nickm@torproject.org>
Fri, 29 Aug 2014 16:24:52 +0000 (12:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 29 Aug 2014 16:24:52 +0000 (12:24 -0400)
commitb0138cd05540001f084b7bd828b3dcffbaeb5b22
tree2c72638364925302b6fe3c6225c5cef9ddaaf8f7
parent37a76d75dd38a1ebd45627bb6e29e40f60917188
parentb82e166bec5fcc468424af1ff71e2e753ac534a2
Merge remote-tracking branch 'public/bug12985_024' into bug12984_025
src/common/compat_libevent.c
src/common/compat_libevent.h
src/or/connection.c