Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0
commitb5f3a3d6a76ffd7727833c2b1901629c9f23a99d
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:34:21 +0000 (19 11:34 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:34:21 +0000 (19 11:34 -0500)
tree46752753cfa126cd4b069b73fe380a86d373e44e
parent26873bc4edb057041e5cc130ec90f4fbc2d8beb8
parent384c5c618835a82d1d5455faff52e3f819683f43
Merge remote-tracking branch 'tor-github/pr/707' into maint-0.4.0