commit 3ef40f69937abc105877189fbecd78df67dd2d8e Merge: 4af82fb 5bea660 Author: Nick Mathewson <[email protected]> Date: Tue Nov 15 11:42:38 2011 -0500
Merge remote-tracking branch 'origin/maint-0.2.2'
changes/bug4349 | 4 ++++
src/or/connection_or.c | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
