commit 3b6f924e507d15fc7290649738048db9c79ec70d Merge: 52b2b2c 0fa3811 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 17 14:57:44 2016 -0400
Merge branch 'maint-0.2.8'
("ours" merge to avoid taking version bump)
tor-commits@lists.torproject.org