* debian-merge:
  New upstream version
  Do the release ritual for 0.1.4.
  Revert "Produce an error if pkg-config isn't found."
  Revert "Produce an error if pkg-config's version is old."
  Produce an error if pkg-config's version is old.
  Produce an error if pkg-config isn't found.
  Don't use compiler flags that break the build
  Remove duplicate documentation.
  Disable safelogging in integration tests.
  Fix obfs2 argument parsing.
  Indent obfs2 argument parsing.
  Don't enable bufferevent reads/writes before connecting.
  Fix '--version' when called outside of a git repository.
  Avoid segfault on resolve_address_port(NULL)

* commit 'obfsproxy-0.1.4':
  Do the release ritual for 0.1.4.
  Revert "Produce an error if pkg-config isn't found."
  Revert "Produce an error if pkg-config's version is old."
  Produce an error if pkg-config's version is old.
  Produce an error if pkg-config isn't found.
  Don't use compiler flags that break the build
  Remove duplicate documentation.
  Disable safelogging in integration tests.
  Fix obfs2 argument parsing.
  Indent obfs2 argument parsing.
  Don't enable bufferevent reads/writes before connecting.
  Fix '--version' when called outside of a git repository.
  Avoid segfault on resolve_address_port(NULL)

This reverts commit 5830a400052cfbb397d67aa2149a564af9f2df26.

This reverts commit e0e53de4f5ea91762fd810f2c5755f0c22e578ef,
since it seems that adding pkg-config as a hard dependency is
a bad idea (it's quite hard to install correctly in Windows).

(ticket #5718)