[tor-commits] [tor/master] Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes