]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8afbc15 50049df)
Merge remote-tracking branch 'public/feature16734'
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Aug 2015 19:14:49 +0000 (15:14 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Aug 2015 19:14:49 +0000 (15:14 -0400)
1  2 
src/common/compat.c patch | diff1 | diff2 | blob | history

diff --cc src/common/compat.c
Simple merge
Mirror of https://git.torproject.org/tor.git