]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.7'
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Feb 2016 19:05:54 +0000 (14:05 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Feb 2016 19:05:54 +0000 (14:05 -0500)
1  2 
src/common/compat.h

Simple merge