commit 32bd533ddac5bd7d594a81119449b3d30206eedd Merge: d5e4a63 b3a225f Author: Nick Mathewson <nickm at torproject.org> Date: Tue May 19 14:59:39 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6'