commit 4614f8e6816d559f8fbe9ae0f42d751d3fb95c77 Merge: c35d481 8f46580 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Nov 22 18:29:50 2016 -0500 Merge remote-tracking branch 'teor/fix-mingw-pagesize' changes/bug20530 | 4 ++++ configure.ac | 8 ++++++++ src/common/compat.c | 10 +++++++++- 3 files changed, 21 insertions(+), 1 deletion(-)