commit d5cbc58094ec740e768d5fa88a51c20c645ed70e Merge: 689562a c2dcd9b Author: Nick Mathewson <nickm at torproject.org> Date: Thu Mar 12 12:53:31 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6'