Automated merge.

diff --cc src/retr.c
Simple merge

diff --cc src/url.c
Simple merge

diff --cc src/url.h
index 2fa8d51cd0d64b3687b54ff16e9b064404c9aae9,badd92522b90fc39e2b956fd111be9497a431d78..38eafca4b50997aebba6a5f92574c34a93ad0248
--- 1/src/url.h
--- 2/src/url.h
+++ b/src/url.h
@@@ -83,8 -83,9 +83,9 @@@ struct ur
  /* Function declarations */
  
  char *url_escape (const char *);
+ char *url_escape_unsafe_and_reserved (const char *);
  
 -struct url *url_parse (const char *, int *, struct iri *iri);
 +struct url *url_parse (const char *, int *, struct iri *iri, bool percent_encode);
  char *url_error (const char *, int);
  char *url_full_path (const struct url *);
  void url_set_dir (struct url *, const char *);

diff --cc tests/Test-iri.px
Simple merge