Merge remote branch 'sebastian/bug1035' into maint-0.2.2
commit0d78a16c3642f7538266e007da79c39860aac332
authorNick Mathewson <nickm@torproject.org>
Tue, 8 Mar 2011 20:52:43 +0000 (8 15:52 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 8 Mar 2011 20:52:43 +0000 (8 15:52 -0500)
tree5e342568b1f08b14318ddd3b3996aa1125d20787
parent9c72324ae85c3f2cc23fee7d383128fa239b36d0
parent5a4f7fa1e48923730376c0a42121e4c3022eef3b
Merge remote branch 'sebastian/bug1035' into maint-0.2.2
src/or/connection_or.c
src/or/dirserv.c
src/or/rephist.c
src/or/rephist.h