commit 0512b59d0cc4c68952454e85551659742930cb6d Merge: e4a246e 54f63e3 Author: Nicolas Vigier boklm@torproject.org Date: Mon Dec 10 16:10:11 2018 +0100

Merge remote-tracking branch 'gk/bug_25779_v4'

projects/tor/build | 10 +++++++--- projects/tor/config | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-)