[tor-commits] [tor/master] Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7

[nickm at torproject.org]

commit 67877f55add6022c024952d453043b0cb59b75d7
Merge: ed80684 5c42358
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Feb 15 07:51:48 2017 -0500

    Merge branch 'maint-0.2.7' of git-rw.torproject.org:/tor into maint-0.2.7