[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.6'

[nickm]

commit 5190ff25a2934560e1c44e283306f24bc062047b
Merge: f31dc84 b117a06
Author: Nick Mathewson <ni...@torproject.org>
Date:   Wed Mar 25 14:10:37 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.6'

_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits