Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
commit198b6354e6c58ab4276461b5215487b8e9c15683
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Sep 2018 17:08:57 +0000 (11 13:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Sep 2018 17:08:57 +0000 (11 13:08 -0400)
treee8a8b95f91f9a7b95dde6c0827729cdc94eae9c8
parent19429fac23734070933591774d2436bf92896297
parent7cea5a287fbf0ed1b9ed92e144ff450c4f93f382
Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9
.travis.yml