[privoxy-devel] Synchronizing the trunk and branch

[Jon F. <jo...@jo...>]

Hi all,

First of all, congratulations on getting 3.0.0 shipped!!

I haven't been following developments for the past couple of months. 
 What happened to the 3.0/3.1 CVS split?  I know it was my idea, but 
with the benefit of hindsight it wasn't the best timing - there have 
been quite a lot of changes between the branchpoint and 3.0.0.  Has the 
trunk (3.1) been kept up to date with all the changes on the 3.0 branch? 
 If not, what changes need to be moved to 3.1?  What can I do to help?

I know there's been some discussion about what happens to the 3.0 
branch.  My preference is to let it die, and do all the development on 
the trunk (3.1).  We'll only need the 3.0 branch if anyone discovers a 
security vulnerability or a crash in 3.0.0.  Thoughts?

Kind regards,

Jon