commit 0ce8339e490bb99096ff69cac17d648af028c951 Merge: 56b51a8 99035eb Author: Georg Koppen gk@torproject.org Date: Fri May 3 12:54:48 2019 +0000

Merge remote-tracking branch 'pc/bug29627-02'

src/chrome/content/network-settings.js | 16 ++++-- src/modules/tl-bridgedb.jsm | 96 ++++++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 22 deletions(-)