commit 51e36026e5b04384bf3311354ef0cd5a5cbf2d59 Merge: 1525eee 2bcb596 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 24 13:24:57 2015 -0500
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
tor-commits@lists.torproject.org