summaryrefslogtreecommitdiff
path: root/src/trunnel/trunnel-local.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-07-30 14:27:29 -0400
committerNick Mathewson <nickm@torproject.org>2020-07-30 14:27:29 -0400
commitc2d5ec5e43c2690656ea5a5a384683108782d149 (patch)
tree0f9f9cd201c2d970170e98a5e94d713737a2e234 /src/trunnel/trunnel-local.h
parentc4742b89b23d58958ee0d5ca324dac5948c94bf6 (diff)
parentcdb0e6c2522aac372c9a816300dacfd62856dd48 (diff)
downloadtor-c2d5ec5e43c2690656ea5a5a384683108782d149.tar.gz
tor-c2d5ec5e43c2690656ea5a5a384683108782d149.zip
Merge branch 'maint-0.4.2' into bug40076_042
Diffstat (limited to 'src/trunnel/trunnel-local.h')
-rw-r--r--src/trunnel/trunnel-local.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/trunnel/trunnel-local.h b/src/trunnel/trunnel-local.h
index c4118fce4c..80da371560 100644
--- a/src/trunnel/trunnel-local.h
+++ b/src/trunnel/trunnel-local.h
@@ -14,5 +14,6 @@
#define trunnel_reallocarray tor_reallocarray
#define trunnel_assert tor_assert
#define trunnel_memwipe(mem, len) memwipe((mem), 0, (len))
+#define trunnel_abort tor_abort_
#endif