--- a/mercurial/hgweb/webcommands.py	Wed Oct 09 11:50:19 2013 -0700
+++ b/mercurial/hgweb/webcommands.py	Wed Oct 09 12:02:32 2013 -0700
@@ -922,7 +922,8 @@
 
             if usetuples:
                 data.append((node, vtx, edges, desc, user, age, branch,
-                             ctx.tags(), ctx.bookmarks()))
+                             [cgi.escape(x) for x in ctx.tags()],
+                             [cgi.escape(x) for x in ctx.bookmarks()]))
             else:
                 edgedata = [dict(col=edge[0], nextcol=edge[1],
                                  color=(edge[2] - 1) % 6 + 1,