]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug18184'
authorNick Mathewson <nickm@torproject.org>
Wed, 10 Feb 2016 20:36:48 +0000 (15:36 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 10 Feb 2016 20:36:48 +0000 (15:36 -0500)
1  2 
configure.ac
src/win32/orconfig.h

diff --cc configure.ac
Simple merge
Simple merge