]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fc27ac fd26c1d)
Merge remote-tracking branch 'rl1987/feature17950'
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Jan 2016 13:54:51 +0000 (08:54 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Jan 2016 13:54:51 +0000 (08:54 -0500)
1  2 
src/common/address.c patch | diff1 | diff2 | blob | history

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