commit 4ce3a57fa7e8e82861020bba8b062d106cc3083e Merge: 3e30d4d d7fcaca Author: Nick Mathewson <nickm at torproject.org> Date: Thu Feb 26 15:22:46 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.6'