Unfortunately, patch needs to be rebased, could you please post an updated version?
pgsql-hackers by date:
Соглашаюсь с условиями обработки персональных данных