commit b421b3f621986318e28d4cc44c28aae7fa909b86 Merge: d9827e4 4a2afd5 Author: Roger Dingledine <arma at torproject.org> Date: Mon Feb 13 15:41:56 2017 -0500 Merge branch 'maint-0.2.9'