]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 59fa0c2 75388f6)
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Wed, 17 Jun 2015 13:18:45 +0000 (09:18 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 17 Jun 2015 13:18:45 +0000 (09:18 -0400)
1  2 
src/or/main.c patch | diff1 | diff2 | blob | history

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