]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a793f1f 1471e57)
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
authorNick Mathewson <nickm@torproject.org>
Thu, 20 Jan 2011 20:00:24 +0000 (15:00 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 20 Jan 2011 20:00:24 +0000 (15:00 -0500)
1  2 
src/or/policies.c patch | diff1 | diff2 | blob | history

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