From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 4 Sep 2013 20:08:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
X-Git-Tag: tor-0.2.5.1-alpha~45^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a60d21a85deacad98fa04d20fb4e83b57ad191d7;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

Conflicts:
	src/or/circuitbuild.c
---

a60d21a85deacad98fa04d20fb4e83b57ad191d7