commit a98fe1c251eb9ded6e4aab6a62e9b7165ae4cc89 Merge: 8701e87 d556fe5 Author: gus gus@torproject.org Date: Mon Sep 23 14:19:18 2019 -0400

Merge branch 'aadibajpai'

content/onion-services/setup/contents.lr | 4 ++-- databags/pagenav+en.ini | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)