commit 3f39c0e63e5b5460ea52b6a217aa4cc658d7a425 Merge: bdc2cef 2126fea Author: Roger Dingledine <arma at torproject.org> Date: Fri Jul 25 12:22:41 2014 -0400 Merge branch 'maint-0.2.5'