From: Roger Dingledine <arma@torproject.org>
Date: Fri, 25 Jul 2014 16:15:47 +0000 (-0400)
Subject: Merge branch 'maint-0.2.4' into maint-0.2.5
X-Git-Tag: tor-0.2.5.6-alpha~4^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b350ac0860f461028a373a7ff6ce5c1468ef75a6;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.4' into maint-0.2.5

Conflicts:
	src/or/or.h
---

b350ac0860f461028a373a7ff6ce5c1468ef75a6