Merge branch 'bug27658_029' into maint-0.2.9
commitc02f2d9eb45786c552dcc33c102e9964d95f66c1
authorNick Mathewson <nickm@torproject.org>
Thu, 13 Sep 2018 15:45:58 +0000 (13 11:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 13 Sep 2018 15:45:58 +0000 (13 11:45 -0400)
tree8b093a8bba5ebf4eab4dcf3188a88125932b12d6
parent198b6354e6c58ab4276461b5215487b8e9c15683
parent73a37d1e547d996515e2a0ffea8331bb535d2841
Merge branch 'bug27658_029' into maint-0.2.9