]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug21074_029'
authorNick Mathewson <nickm@torproject.org>
Wed, 17 Jan 2018 14:07:50 +0000 (09:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 17 Jan 2018 14:07:50 +0000 (09:07 -0500)
1  2 
src/common/compat.c

Simple merge