Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0
commitd8409ccb76e1902e81f8f2c7d62babe64efd3e84
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Mar 2019 13:34:15 +0000 (7 08:34 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Mar 2019 13:34:15 +0000 (7 08:34 -0500)
tree50b46fb7e229ae7e3ebf5ba47f73a98a8e83fb93
parent9b4ecbaa7d5a19c2ddbb5e2c442e19c248930a7b
parent78bfe731c3320437901d3801f54ade66a93bd227
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0
.appveyor.yml