commit b563082ad87448066f950fe581b47f1533b78341 Merge: 306f2f0 5f46a59 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 12 10:51:08 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
tor-commits@lists.torproject.org