Fix merge conflicts.
Fix merge conflicts.

darcs-hash:20040923085102-4cc09-2baae000ef336ece5ea3b611a72b9b0b6928a745.gz

strongwillow/polipo,Android-Apps/polipo,TierraDelFuego/opilop,gorakhargosh/polipo,jech/polipo,akkakks/polipo,lkraider/polipo,strongwillow/polipo,nxtreaming/chumen,galeksandrp/polipo,berkley4/polipo,jech/polipo,berkley4/polipo,ssb22/polipo2,galeksandrp/polipo,jech/polipo,ajmgh/polipo,fqtools/polipo,fukusaka/polipo,toke/polipo,galeksandrp/polipo,ssb22/polipo2,dxq-git/polipo,akkakks/polipo,feijilei/polipo,caeies/polipo-caeies,fqtools/polipo,nxtreaming/chumen,dxq-git/polipo,dxq-git/polipo,nxtreaming/chumen,lkraider/polipo,feijilei/polipo,clowwindy/polipo,doublec/namecoin-polipo,danchr/polipo,Psiphon-Inc/polipo,lkraider/polipo,feijilei/polipo,berkley4/polipo,akkakks/polipo,ssb22/polipo2,Android-Apps/polipo,jeromelebel/polipo,fqtools/polipo