Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
commit32341ac467d5fe51fa674eed4ca20db61ff5486b
authorNick Mathewson <nickm@torproject.org>
Wed, 6 Apr 2011 20:13:22 +0000 (6 16:13 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 6 Apr 2011 20:13:22 +0000 (6 16:13 -0400)
treeebf2e0eb03a837bcf625981ba60abc606941a5e5
parent0cdd2629418f019bda5fa2daa271aae4f7131fa6
parent02d93caa09656b1ef73838608258afad5c090105
Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
src/or/router.c