From: Roger Dingledine <arma@torproject.org>
Date: Mon, 28 Jul 2014 08:14:39 +0000 (-0400)
Subject: Merge branch 'maint-0.2.5'
X-Git-Tag: tor-0.2.6.1-alpha~216
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3f4a96528ad52c480a360bf7782446f5a06f622;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.5'

Conflicts:
	configure.ac
	contrib/win32build/tor-mingw.nsi.in
	src/win32/orconfig.h
---

e3f4a96528ad52c480a360bf7782446f5a06f622