]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commit3149bfc254025485496cb6959d4efb5331612cec
tree37c3e084ac450d5e032f8dfce59ced3fb18183b8
parentbd731683070351d640e40f1a4d6320e0fe4b727e
parent699acd8d54bd685b135d3a8e758d05dd0802b820
Merge branch 'bug16288_027_03_squashed'
src/common/compat.c
src/common/compat.h