commit 9ff76185d284f1982b5f49b2c652f7a05e71ba2b Merge: 9b90d51 5c42358 Author: Roger Dingledine <arma at torproject.org> Date: Mon Feb 13 15:39:13 2017 -0500 Merge branch 'maint-0.2.7' into maint-0.2.8