]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commit57ff9913b25ff640f4ae45dc9b60bc28c30f53b8
tree241ab46ee63be6b2aecf03fb52cff2bdb47c4941
parentd9edee3a3b98eaae5192f1307197d1a33122ec61
parent6171bdd1056e3511b1842ac8a3e17aa349616075
Merge remote-tracking branch 'origin/maint-0.2.2'

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.