Merge remote-tracking branch 'public/bug8475_023' into maint-0.2.4
commit34120549878aa05969b66d9564cdd902adeeb6be
authorNick Mathewson <nickm@torproject.org>
Wed, 20 Mar 2013 18:47:13 +0000 (20 14:47 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 20 Mar 2013 18:47:13 +0000 (20 14:47 -0400)
tree614245aba5c6469a1e385aee16ad461ea20ea64e
parent5c5198e713365fecf44741ae6f287c2ebdef18f6
parent1b28f366b8796a9e6d27af74146dbc7836100263
Merge remote-tracking branch 'public/bug8475_023' into maint-0.2.4
src/or/relay.c