Merge remote-tracking branch 'origin/maint-0.2.4'
commit0ee449ca92dc7f25517a63b63f4d521fdd48410b
authorNick Mathewson <nickm@torproject.org>
Tue, 11 Feb 2014 23:58:58 +0000 (11 18:58 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 11 Feb 2014 23:58:58 +0000 (11 18:58 -0500)
tree620c7c78bfaefec8dd3fb411cd4881bfa66895ae
parentc3720c05fa44b3790ab0dc37e2506ee482796e21
parent91d4bb0b000e1bdaf8569339a9b843c50e13e47e
Merge remote-tracking branch 'origin/maint-0.2.4'
src/or/relay.c