Merge branch 'maint-0.2.7' into maint-0.2.8
commit55cf1970bce222a32c387652fe5080adb2aa1513
authorNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 18:59:18 +0000 (9 14:59 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 9 May 2016 18:59:18 +0000 (9 14:59 -0400)
treecd64059351cb5adc75755a060f80f6af5973d7b4
parent72601d7e21c88a236d4825a3716556be114601df
parent7fe80c29056d7e98b9443e151343c886cf8c7dd3
Merge branch 'maint-0.2.7' into maint-0.2.8