commit 8fb8c239827affa5d53ca4861ae9a61076476ae0 Merge: 543abfa cd53480 Author: Philipp Winter <phw@torproject.org> Date: Sun Oct 13 02:10:56 2013 +0200 Merge branch 'issue-9911-hsdir-typo'. js/models/relay.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)