commit a6a97236fcb7733272be57cbf9185dfbf93db947 Merge: d4f3cfe99a 90707c9264 Author: David Goulet <dgoulet@torproject.org> Date: Wed Aug 26 11:04:53 2020 -0400 Merge branch 'tor-gitlab/mr/135' src/feature/client/bridges.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)