[tbb-commits] [tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_30863'

[gk at torproject.org]

commit b4414487740039152a8fa62dde5d8ea13aa34cb2
Merge: 343b8bc a27f6be
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Jun 26 12:18:28 2019 +0000

    Merge remote-tracking branch 'boklm/bug_30863'

 projects/tor-android-service/config     | 2 +-
 projects/tor-onion-proxy-library/config | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)