commit 72601d7e21c88a236d4825a3716556be114601df Merge: 03fc4cf 1a065ce Author: Nick Mathewson nickm@torproject.org Date: Mon May 9 14:58:38 2016 -0400

Merge commit '1a065cea46a9c179d64d74d012f051135bc4725a' into maint-0.2.8

This is an merge of maint-0.2.7 as an "ours" merge to avoid taking the cherry-picked fix of 18490