commit 5d41e2223f64517300aad168b2f2479ba00ac10b parent ffd7207025d363b3bb19c3d50a67ed760da03ccb Author: teor <teor@torproject.org> Date: Thu, 14 Mar 2019 06:59:09 +1000 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to ignore the changes to src/common/compat.c, they have already been merged to 0.3.5 in the correct file.
