commit 91d4bb0b000e1bdaf8569339a9b843c50e13e47e Merge: 8836c1e 0844a26 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 11 18:57:55 2014 -0500

Merge branch 'bug10777_netunreach_024' into maint-0.2.4

changes/10777_netunreach | 7 +++++++ src/or/reasons.c | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-)