commit bc7a5eeeda58c68b3c8434fd66c404aae269dbb0 Merge: c0a6c34 42e131e Author: Nick Mathewson <[email protected]> Date: Thu Feb 11 12:12:02 2016 -0500
Merge remote-tracking branch 'weasel/bug18261'
changes/bug18261 | 6 ++++++
src/or/connection.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
