]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 546f5b3 dfc0614)
Merge branch 'maint-0.2.9' into maint-0.3.0
authorNick Mathewson <nickm@torproject.org>
Wed, 5 Jul 2017 20:11:48 +0000 (16:11 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 5 Jul 2017 20:11:48 +0000 (16:11 -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