From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 1 May 2014 15:51:22 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug10849_025'
X-Git-Tag: tor-0.2.5.5-alpha~111
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1bbd3811c1c98e6a630ab96f15a376910a576626;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug10849_025'

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

1bbd3811c1c98e6a630ab96f15a376910a576626