Pulls in upstream changes from v3.0.6
Needed to re-cut v3.0.6-jito because of an improperly handled error case in new auto-configuration code. This code is now commented out and will be fixed in a future version.
Fixes:
- #996 : Disable autoconfig code path