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

[nickm]

commit dcf8cddab25e5b189eaebf473423c2b31acb4525
Merge: bbad23b ba17cdf
Author: Nick Mathewson <ni...@torproject.org>
Date:   Sun Jan 18 13:49:04 2015 -0500

    Merge remote-tracking branch 'origin/maint-0.2.5'
    
    Conflicts:
        src/test/test_relaycell.c
        src/test/test_util.c




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