]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
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)
1  2 
src/common/compat_libevent.c
src/common/compat_libevent.h
src/or/connection.c

Simple merge
Simple merge
Simple merge