commit 4467e5ce56e657e6063c77b8399a30416084b0da Merge: 29a82b5 fcbb21b Author: Roger Dingledine <arma at torproject.org> Date: Mon Jul 28 04:09:37 2014 -0400 Merge branch 'maint-0.2.4' into maint-0.2.5