[tor-commits] [tor/master] Merge branch 'bug21074_029'

[nickm@xxxxxxxxxxxxxx]

commit 60dfdd9b154ed694a1eee202393b5eb6f664c03d
Merge: 5970836af 0bfd5a659
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Jan 17 09:07:50 2018 -0500

    Merge branch 'bug21074_029'

 src/common/compat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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