commit 14d2ff1a3eb212afd75089920e080da193def379 Merge: 7bdbcda 741d2dc Author: Nick Mathewson <nickm at torproject.org> Date: Fri Nov 13 08:42:31 2015 -0500 Merge commit '741d2dc685a0e380bc4d8fbcda5a33b70272b3f7'