commit fdee4dd5016aadf5bf44f42b8bb1cad5f40f5672 Merge: 965f0d891 f58587a68 Author: teor <teor at torproject.org> Date: Wed Apr 3 13:12:17 2019 +1000 Merge remote-tracking branch 'tor-github/pr/863' src/lib/pubsub/pubsub_check.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)