From: Roger Dingledine <arma@torproject.org>
Date: Thu, 30 Sep 2010 21:55:01 +0000 (-0400)
Subject: Merge branch 'maint-0.2.2'
X-Git-Tag: tor-0.2.3.1-alpha~346
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe9402271a7a9ef21827b66311622adaadd0574a;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.2'

Conflicts:

	configure.in
	contrib/tor-mingw.nsi.in
	src/win32/orconfig.h
---

fe9402271a7a9ef21827b66311622adaadd0574a