Fixed egress port counter in tor.p4

Also, count both packets and bytes

Change-Id: I6c25a83738f295d1018c5075f9e3f2c9e4e90ce6
diff --git a/tools/test/p4src/tor/p4c-out/tor.json b/tools/test/p4src/tor/p4c-out/tor.json
index e48c28b..8a1ebcf 100644
--- a/tools/test/p4src/tor/p4c-out/tor.json
+++ b/tools/test/p4src/tor/p4c-out/tor.json
@@ -826,7 +826,7 @@
       "source_info" : {
         "filename" : "packetio.p4",
         "line" : 49,
-        "column" : 34,
+        "column" : 46,
         "source_fragment" : "egress_port_counter"
       },
       "size" : 510,
@@ -838,7 +838,7 @@
       "source_info" : {
         "filename" : "packetio.p4",
         "line" : 50,
-        "column" : 34,
+        "column" : 46,
         "source_fragment" : "ingress_port_counter"
       },
       "size" : 510,
@@ -1887,7 +1887,7 @@
                   "op" : "&",
                   "left" : {
                     "type" : "field",
-                    "value" : ["standard_metadata", "egress_spec"]
+                    "value" : ["standard_metadata", "egress_port"]
                   },
                   "right" : {
                     "type" : "hexstr",
@@ -1914,7 +1914,7 @@
             "filename" : "packetio.p4",
             "line" : 56,
             "column" : 6,
-            "source_fragment" : "egress_port_counter.count((bit<32>) standard_metadata.egress_spec)"
+            "source_fragment" : "egress_port_counter.count((bit<32>) standard_metadata.egress_port)"
           }
         }
       ]