commit 56d63982e4b40a6500033e2b579b0d0b50a27ab6 Merge: 0c0fb1fd a1a677f3 Author: Nicolas Vigier <boklm at torproject.org> Date: Thu Nov 16 14:32:14 2017 +0100 Merge branch 'master' into staging