commit 657067ef9d89c5dd62036e3df78b4bdf62130f42 Merge: 05e2750 3a0d42f Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 14 20:36:54 2016 -0400
Merge branch 'maint-0.2.8'
This is an "ours" merge to avoid taking a version bump.
tor-commits@lists.torproject.org