]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1019b8 110765f)
Merge commit '110765f5564a588c5f019d32b5e6f66cc7806c41'
authorNick Mathewson <nickm@torproject.org>
Fri, 8 Jan 2016 23:08:28 +0000 (15:08 -0800)
committerNick Mathewson <nickm@torproject.org>
Fri, 8 Jan 2016 23:08:28 +0000 (15:08 -0800)
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