commit 1ec45bb54621208906ce260255086a8456a9646e
Merge: d3a39cf 4473271
Author: Nick Mathewson <[email protected]>
Date:   Mon May 15 11:19:44 2017 -0400

    Merge branch 'bug18100_029'

 changes/bug18100         | 5 +++++
 src/or/connection_edge.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

Reply via email to