Batch merge for Relay Search patches

Please merge my [[https://gitweb.torproject.org/user/irl/metrics-web.git/log/?h=relaysearch-dev|relaysearch-dev]] branch up to commit 8e0953f.