]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9edee3 6171bdd)
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Dec 2011 21:17:52 +0000 (16:17 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Dec 2011 21:17:52 +0000 (16:17 -0500)
Conflicts:
src/or/connection_or.c

The conflict in src/or/connection_or.c is resolved by taking the
version in master, since e27a26d5 already fixed bug 4531 on master.
This merge just adds the changes file from 0.2.2.


Trivial merge
Mirror of https://git.torproject.org/tor.git