commit 253f8140c862c24762181a6c6dc6bbba97d4e96c Merge: 8c2ee16 6b740aa Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 2 11:14:08 2016 -0400
Merge branch 'maint-0.2.8'
(This is an "ours" merge to avoid taking the version number bump.)
tor-commits@lists.torproject.org