See branch ticket26062_034_01 ONLY for 034.

Following teor's comment from legacy/trac#19665 (moved):

We should split off 59a32e5b4ff210b95bbed294cdc787cb75539da5 into a separate ticket and backport it to 0.2.9 and later. Otherwise, relays with the control port open will warn based on the client required protocols list.

Here is the 029 branch for the backport and should be merged forward up to 033: ticket26062_029_01. There is a possible very trivial conflict since we added HTTPTunnelPort_set later on. I'll let that exercise to the mergerer :).

Trac:
Keywords: N/A deleted, tor-client added
Status: assigned to needs_review
Reviewer: N/A to nickm

lgtm; merged to 029 and forward!

Trac:
Resolution: N/A to fixed
Status: needs_review to closed

Trac:
Keywords: tor-client deleted, tor-client tor-httptunnel added