Merge branch 'maint-0.2.2' into release-0.2.2

  o Major bugfixes:

    - Fix an edge case where if we fetch or publish a hidden service

      descriptor, we might build a 4-hop circuit and then use that circuit

      for exiting afterwards -- even if the new last hop doesn't obey our

      ExitNodes config option. Fixes bug 5283; bugfix on 0.2.0.10-alpha.

  o Minor bugfixes

    - Fix a build warning with Clang 3.1 related to our use of vasprint.

      Fix for bug 5969. Bugfix on 0.2.2.11-alpha.

  o Compilation improvements:

    - Tell GCC and Clang to check for any errors in format strings passed

      to the tor_v*(print|scan)f functions.

  o Major bugfixes (security):

    - When waiting for a client to renegotiate, don't allow it to add

      any bytes to the input buffer. This fixes a DoS issue. Fix for

      bugs 6007 and 5934; bugfix on 0.2.0.20-rc.

  o Major bugfixes:

    - Work around a bug in OpenSSL that broke renegotiation with

      TLS 1.1 and TLS 1.2.  Without this workaround, all attempts

      to speak the v2 Tor network protocol when both sides were

      using OpenSSL 1.0.1 would fail.  Fix for bug 6033, which is

      not a bug in Tor.

int tor_snprintf(char *str, size_t size, const char *format, ...)

  CHECK_PRINTF(3,4) ATTR_NONNULL((1,3));

int tor_vsnprintf(char *str, size_t size, const char *format, va_list args)

  ATTR_NONNULL((1,3));

  CHECK_PRINTF(3,0) ATTR_NONNULL((1,3));

int tor_asprintf(char **strp, const char *fmt, ...)

  CHECK_PRINTF(2,3);

int tor_vasprintf(char **strp, const char *fmt, va_list args);

int tor_vasprintf(char **strp, const char *fmt, va_list args)

  CHECK_PRINTF(2,0);

const void *tor_memmem(const void *haystack, size_t hlen, const void *needle,

                       size_t nlen)  ATTR_PURE ATTR_NONNULL((1,3));