]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b8fe8ee 5b36f0d)
Merge remote-tracking branch 'public/bug9963_v2_024'
authorNick Mathewson <nickm@torproject.org>
Fri, 18 Apr 2014 19:25:36 +0000 (15:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 18 Apr 2014 19:25:36 +0000 (15:25 -0400)
1  2 
src/or/control.c patch | diff1 | diff2 | blob | history

diff --cc src/or/control.c
index c91705257df15491c1e9a9a896535a04c68cdbfa,27aeab186e8ae4b1d31f0bb3db44c845dcb66209..2815b7901e2826e53ac7b6beeaf12783aa787e1a
mode 100755,100644..100755
--- 1/src/or/control.c
--- 2/src/or/control.c
+++ b/src/or/control.c
Mirror of https://git.torproject.org/tor.git