[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm@xxxxxxxxxxxxxx]

commit 657067ef9d89c5dd62036e3df78b4bdf62130f42
Merge: 05e2750 3a0d42f
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jun 14 20:36:54 2016 -0400

    Merge branch 'maint-0.2.8'
    
    This is an "ours" merge to avoid taking a version bump.

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