Merge remote branch 'public/bug1859_021' into maint-0.2.1
commit491abbc65e535b5308d6c57ab9ab3900ac2dd2d2
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 22:19:41 +0000 (22 17:19 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Feb 2011 22:19:41 +0000 (22 17:19 -0500)
tree63f1dc9a7f92bd931d14cd78aa37fd8ba3a59e81
parent7605985b3ff71cee7fabdf023baf298b218d04c1
parent2392290c1887b732fd2309e57ce04ab71b9b4e69
Merge remote branch 'public/bug1859_021' into maint-0.2.1
src/or/connection_edge.c
src/or/rendclient.c
src/or/routerlist.c