]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/fix-mingw-pagesize'
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Nov 2016 23:29:50 +0000 (18:29 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Nov 2016 23:29:50 +0000 (18:29 -0500)
1  2 
configure.ac
src/common/compat.c

diff --cc configure.ac
Simple merge
Simple merge