From daaa2751ed6ea8fe6941b63ea819804d8f0a9fac Mon Sep 17 00:00:00 2001
From: Kris Katterjohn <katterjohn@gmail.com>
Date: Sat, 3 Nov 2018 14:28:27 -0500
Subject: [PATCH 1/2] Include sys/time.h in timers.c and time_fmt.c

This fixes compilation on OpenBSD.

Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
---
 src/lib/encoding/time_fmt.c | 4 ++++
 src/lib/evloop/timers.c     | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/lib/encoding/time_fmt.c b/src/lib/encoding/time_fmt.c
index a921fc681c..233d0dddff 100644
--- a/src/lib/encoding/time_fmt.c
+++ b/src/lib/encoding/time_fmt.c
@@ -26,6 +26,10 @@
 #include <string.h>
 #include <time.h>
 
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 #ifdef _WIN32
 /* For struct timeval */
 #include <winsock2.h>
diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c
index c4e85c7c93..3603bf1a7d 100644
--- a/src/lib/evloop/timers.c
+++ b/src/lib/evloop/timers.c
@@ -39,6 +39,10 @@
 #include "lib/malloc/malloc.h"
 #include "lib/time/compat_time.h"
 
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
 #ifdef _WIN32
 // For struct timeval.
 #include <winsock2.h>

From 67abf55d6b2d2c10a1e666e0295d40890935f304 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 6 Nov 2018 15:17:19 -0500
Subject: [PATCH 2/2] Add a changes file for bug 28303

---
 changes/bug28303 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 changes/bug28303

diff --git a/changes/bug28303 b/changes/bug28303
new file mode 100644
index 0000000000..80f1302e5e
--- /dev/null
+++ b/changes/bug28303
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+    - Fix a pair of missing headers on OpenBSD. Fixes bug 28303;
+      bugfix on 0.3.5.1-alpha. Patch from  Kris Katterjohn.