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

[nickm@xxxxxxxxxxxxxx]

commit 289b184e112885d4feb9569c77d322995b9417c7
Merge: 5dff4ae dce708d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Nov 25 12:25:44 2015 -0500

    Merge branch 'bug17654_try1'

 src/or/connection_or.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