]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug17852_revised'
authorNick Mathewson <nickm@torproject.org>
Tue, 16 Feb 2016 16:34:06 +0000 (11:34 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 16 Feb 2016 16:34:06 +0000 (11:34 -0500)
1  2 
src/common/compat.c
src/common/util.c
src/ext/eventdns.c

Simple merge
Simple merge
Simple merge