Conflicts:
	src/or/relay.c

(Thanks to toralf for noting that the build was broken, and to
Sebastian for telling me that my fix still wasn't right.)

Anthony G. Basile authored 10 years ago and Nick Mathewson committed 10 years ago

When tor is configured with --enable-bufferevents, the build fails
because compat_libevent.h makes use of the macro MOCK_DECL() which
is defined in testsupport.h, but not included.  We add the include.

Fixes bug 14170.

Tomasz Torcz authored 10 years ago and Nick Mathewson committed 10 years ago

  There were following problems:
  - configure.ac wrongly checked for defined HAVE_SYSTEMD; this
    wasn't working, so the watchdog code was not compiled in.
    Replace library search with explicit version check
  - sd_notify() watchdog call was unsetting NOTIFY_SOCKET from env;
    this means only first "watchdog ping" was delivered, each
    subsequent one did not have socket to be sent to and systemd
    was killing service
  - after those fixes, enable Watchdog in systemd unit with one
    minute intervals

Tomasz Torcz authored 10 years ago and Nick Mathewson committed 10 years ago

  If running under systemd, send back information when reloading
configuration and gracefully shutting down.  This gives administator
more information about current Tor daemon state.

Tomasz Torcz authored 10 years ago and Nick Mathewson committed 10 years ago

  If running under systemd, notify the supervisor about current PID
of Tor daemon.  This makes systemd unit simpler and more robust:
it will do the right thing regardless of RunAsDaemon settings.

teor authored 10 years ago and Nick Mathewson committed 10 years ago

Check for a missing option value in parse_virtual_addr_network
before asserting on the NULL in tor_addr_parse_mask_ports.
This avoids crashing on torrc lines like Vi[rtualAddrNetworkIPv[4|6]]
when no value follows the option.

Bugfix on 0.2.3 (de4cc126 on 24 November 2012), fixes #14142.

apparantly, "pragma GCC diagnostic push/pop" don't exist with older versions.

Fixes bug in 740e5927; bug not in any
released Tor.

When I applied patch fcc78e5f, I somehow broke
stack trace symbols on Linux.  I'll leave it to others to figure out
why that happens.  This should be better.  Really.

Fixes bug 14162; bug not in any released version of Tor.