David Sommerseth <openvpn.l...@topphemmelig.net> wrote: Hi David,
>> David, could you please pull my branch from Berni, and move that patch >> to wherever bugfixes/code cleanups go? It should merge easily into >> all branches. > > Pushed and pulled. I've only put your extra commit into the bugfix2.1 > branch (as a cherry-pick), and merged it into allmerged. > > At some point, you might consider to pull in the bugfix2.1 branch into > your feat_ipv6_payload branch, just to get in those bug fixes. Hm, I thought we (Gert :-) ) were supposed to develop on top of master? I don't have any preference either way, but as soon as we merge bugfix2.1 into feat_ipv6_payload all those commits are there. It doesn't make a difference at the moment (since the patch came from feat_ipv6_payload in the first place), but what's the general wish for the future? What to rebase on? Bernhard
