]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 642cff5 866a282)
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Thu, 14 Jul 2011 21:22:23 +0000 (17:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 14 Jul 2011 21:22:23 +0000 (17:22 -0400)
Conflicts:
src/or/control.c

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