commit 5c0b72bce234088834297436ff20fc6942e935a3 Merge: b00d30e dd007eb Author: Nicolas Vigier <boklm@torproject.org> Date: Fri May 3 21:24:40 2019 +0200 Merge remote-tracking branch 'gk/bug_29731_v2' projects/tor/build | 2 +- projects/tor/config | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-)