[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug17417_take2'

[nickm@xxxxxxxxxxxxxx]

commit 19e10f95c105a698d3593a1ecfa88a7449a21127
Merge: 8acaac4 e2f9c7d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon Oct 26 09:18:48 2015 -0400

    Merge remote-tracking branch 'rl1987/bug17417_take2'

 src/test/test_tortls.c |    1 +
 1 file changed, 1 insertion(+)

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