commit eb4604c35a97a27d2a16786c81a5499c46914dad Merge: 062497f 9d1801b Author: Nick Mathewson <nickm@torproject.org> Date: Sun Jul 12 16:37:59 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.6' This is an 'ours' merge, to avoid taking the bump to 0.2.6.10-dev