commit ab3826f8333cec974c4b020ef30acda678ebe318 Merge: fa4a815 a5ed8b1 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Oct 15 10:38:09 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.7'