commit a46f4982c2b05256762f96a40f286881d3195753 Merge: 2bfdfc8 354897a Author: Nick Mathewson <nickm at torproject.org> Date: Thu Mar 12 10:54:30 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6'