]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'sysrqb/bug14802_025'
authorNick Mathewson <nickm@torproject.org>
Tue, 10 Feb 2015 06:39:55 +0000 (22:39 -0800)
committerNick Mathewson <nickm@torproject.org>
Tue, 10 Feb 2015 06:39:55 +0000 (22:39 -0800)
1  2 
src/common/compat.c

Simple merge