Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0
commit97e1539f7f70898ac928f598bf711b7c317d29b7
authorNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:53:02 +0000 (19 11:53 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 Feb 2019 16:53:02 +0000 (19 11:53 -0500)
tree02e1087968580aa78c2b86c2a063902097c89d55
parent4df31adef7ada9221de7e39430a34234dd3fc6cb
parent6fdd34acd69e6e54562855acffa23df0cec2aee2
Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0