Both are the most recent commits I have of pre-merge testing. I believe the server commit here was the final commit done in testing before the merge, but my client testing history appears incomplete so I cannot say for sure whether this was the final commit made in client testing or not.
Using the now unsupported autotools to build the latest mainline server (and in doing so, building with enet 1.2 such that this older client could connect), I can connect using this older client, move around, talk, use/activate items, display attributes correctly (aside from display hp/weight bars, but that was broken on account of someone not maintaining this functionality in one of the mainline to testing merges and is a known issue.

Using the now unsupported autotools to build the latest mainline client (and in doing so, building with enet 1.2 to connect to the previously mentioned latest mainline server that was built in the same way), the client can go through the account server correctly but halts when connecting to the game-server.
I cannot build the 3d93f9133541b35bbe2eb1391a5f4d6a3285d22a client with enet 1.3 to check that there are no problems there, but there certainly does seem to be a problem with the client introduced somewhere between 3d93f9133541b35bbe2eb1391a5f4d6a3285d22a and HEAD.
All server compiles were done using sqlite and all server/client runs were done using the same testing data (with stats.xml/attributes.xml root tags changed from stats to attributes or vice versa depending on the version compiled)
Since my local client testing branch history seems incomplete, and Bertram deleted the remote client testing clone, perhaps he could upload the history somewhere so I (and anyone else interested in testing) can have a look to see where the client stopped working?
---Freeyorp