]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c389447 d59c406)
Merge remote-tracking branch 'public/bug15546'
authorNick Mathewson <nickm@torproject.org>
Thu, 23 Apr 2015 13:50:29 +0000 (09:50 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 23 Apr 2015 13:50:29 +0000 (09:50 -0400)
1  2 
src/or/control.c patch | diff1 | diff2 | blob | history

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