commit 6b80ff1b45c6c60a28dcbd40cdc3ab9cb421ed81 Merge: de397d5 3d0c090 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Jul 12 13:34:22 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' This is an "ours" merge to avoid bumping the version number in master.