]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug18977_026_v2' into maint-0.2.7
authorNick Mathewson <nickm@torproject.org>
Thu, 12 May 2016 19:33:35 +0000 (15:33 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 May 2016 19:33:35 +0000 (15:33 -0400)
1  2 
src/common/compat.c
src/common/util.c

Simple merge
Simple merge