From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 13 Nov 2018 21:48:21 +0000 (-0500)
Subject: Merge branch 'bug28183_029' into maint-0.3.5
X-Git-Tag: tor-0.3.5.5-alpha~15^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=021187f91503814f13dd73b9ed835c20c57f945d;p=thirdparty%2Ftor.git

Merge branch 'bug28183_029' into maint-0.3.5
---

021187f91503814f13dd73b9ed835c20c57f945d
diff --cc src/lib/sandbox/sandbox.c
index 48e37ba127,3b21322d31..6f074bb4e1
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@@ -1803,4 -2013,4 +1804,5 @@@ voi
  sandbox_disable_getaddrinfo_cache(void)
  {
  }
 -#endif
++
 +#endif /* !defined(USE_LIBSECCOMP) */