]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/remove_old_libevent_autoconf_stuff'
authorNick Mathewson <nickm@torproject.org>
Thu, 23 Apr 2015 14:27:01 +0000 (10:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 23 Apr 2015 14:27:01 +0000 (10:27 -0400)
1  2 
configure.ac
src/or/config.c

diff --cc configure.ac
Simple merge
diff --cc src/or/config.c
Simple merge