[tor-commits] [tor-browser-build/master] Merge remote-tracking branch 'azadi/bug-26251-rev1'

[boklm at torproject.org]

commit 82a0bd2d85fe53b61460a3e3b833f10a0bb01519
Merge: 6d63b2e 6d3f0f5
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Wed Jul 11 12:58:51 2018 +0200

    Merge remote-tracking branch 'azadi/bug-26251-rev1'

 projects/webrtc/build            | 10 ++++-----
 projects/webrtc/webrtc-mac.patch | 45 ++--------------------------------------
 rbm.conf                         |  2 +-
 3 files changed, 8 insertions(+), 49 deletions(-)