commit d500c61974ff1cdbccd31a64181aa10cb1e9482f Merge: caa9e6d 3de8afa Author: Nicolas Vigier boklm@torproject.org Date: Thu Feb 21 16:16:35 2019 +0100

Merge remote-tracking branch 'gk/bug_25849_v3'

projects/rust/build | 6 +- projects/rust/config | 4 +- projects/rust/unwind_128.patch | 161 +++++++++++++++++++++++++++++++++++++++++ projects/tor/build | 10 ++- projects/tor/config | 3 +- 5 files changed, 178 insertions(+), 6 deletions(-)