From: Brian Warner <warner@lothar.com>
Date: Wed, 29 Jul 2015 00:38:09 +0000 (-0700)
Subject: Merge branch '2436.less-scary.3'
X-Git-Tag: allmydata-tahoe-1.10.2b1~3
X-Git-Url: https://git.rkrishnan.org/?p=tahoe-lafs%2Ftahoe-lafs.git;a=commitdiff_plain;h=28399b689203a0841880cc03b378dcc0a696d8a3

Merge branch '2436.less-scary.3'

This reverts and improves the earlier fix for ticket:2436
---

28399b689203a0841880cc03b378dcc0a696d8a3