commit 0ee449ca92dc7f25517a63b63f4d521fdd48410b
Merge: c3720c0 91d4bb0
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue Feb 11 18:58:58 2014 -0500
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/10777_netunreach | 7 +++++++
changes/bug10777_internal_024 | 4 ++++
src/or/reasons.c | 5 +++--
src/or/relay.c | 6 ++++--
4 files changed, 18 insertions(+), 4 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
