From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 2 Dec 2011 21:17:52 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.9-alpha~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57ff9913b25ff640f4ae45dc9b60bc28c30f53b8;p=thirdparty%2Ftor.git

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.
---

57ff9913b25ff640f4ae45dc9b60bc28c30f53b8