commit d6fab2afd7f37a3a31063654a8f5451d5d290bcf Merge: c6416f3 3202ac6 Author: Nick Mathewson <ni...@torproject.org> Date: Mon Oct 20 10:33:53 2014 -0400
Merge remote-tracking branch 'origin/maint-0.2.5'
This is an "ours" merge so we can leave the version in master alone.
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
