]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3e8b7f 0c11d8b)
Merge remote-tracking branch 'sebastian/bug14784'
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Apr 2015 15:10:37 +0000 (11:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Apr 2015 15:10:37 +0000 (11:10 -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