]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug16288_027_03_squashed'
authorNick Mathewson <nickm@torproject.org>
Thu, 25 Jun 2015 15:30:52 +0000 (11:30 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 25 Jun 2015 15:30:52 +0000 (11:30 -0400)
1  2 
src/common/compat.c
src/common/compat.h

Simple merge
Simple merge