]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34fa4ad fda61e0)
Merge remote-tracking branch 'yawning/feature15435'
authorNick Mathewson <nickm@torproject.org>
Wed, 1 Apr 2015 17:34:14 +0000 (13:34 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 Apr 2015 17:34:14 +0000 (13:34 -0400)
1  2 
src/common/util.c patch | diff1 | diff2 | blob | history

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