practracker: Make it happy after rebase

Signed-off-by: David Goulet <dgoulet@torproject.org>

diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt
index af3ab3304278a716406e5c71b0c31af54b80bb16..75a8b509678e870a7189b0388733f35c8b809000 100644 (file)
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@ -39,29 +39,15 @@ problem function-size /src/app/config/config.c:options_init_from_torrc() 207
 problem function-size /src/app/config/config.c:options_init_from_string() 171
 problem function-size /src/app/config/config.c:options_init_logs() 145
 problem function-size /src/app/config/config.c:parse_bridge_line() 104
-<<<<<<< HEAD
 problem function-size /src/app/config/config.c:parse_transport_line() 189
 problem function-size /src/app/config/config.c:parse_dir_authority_line() 150
 problem function-size /src/app/config/config.c:parse_dir_fallback_line() 101
 problem function-size /src/app/config/config.c:parse_port_config() 446
 problem function-size /src/app/config/config.c:parse_ports() 168
 problem function-size /src/app/config/config.c:getinfo_helper_config() 113
-problem include-count /src/app/main/main.c 67
-problem function-size /src/app/main/main.c:dumpstats() 102
-problem function-size /src/app/main/main.c:tor_init() 133
-=======
-problem function-size /src/app/config/config.c:parse_transport_line() 191
-problem function-size /src/app/config/config.c:parse_dir_authority_line() 151
-problem function-size /src/app/config/config.c:parse_dir_fallback_line() 102
-problem function-size /src/app/config/config.c:parse_port_config() 452
-problem function-size /src/app/config/config.c:parse_ports() 170
-problem function-size /src/app/config/config.c:getinfo_helper_config() 116
-problem function-size /src/app/config/confparse.c:config_assign_value() 205
-problem function-size /src/app/config/confparse.c:config_get_assigned_option() 129
 problem include-count /src/app/main/main.c 68
 problem function-size /src/app/main/main.c:dumpstats() 102
-problem function-size /src/app/main/main.c:tor_init() 141
->>>>>>> hs-v3: Add consensus parameters for DoS defenses
+problem function-size /src/app/main/main.c:tor_init() 137
 problem function-size /src/app/main/main.c:sandbox_init_filter() 291
 problem function-size /src/app/main/main.c:run_tor_main_loop() 105
 problem function-size /src/app/main/ntmain.c:nt_service_install() 126
@@ -220,23 +206,13 @@ problem function-size /src/feature/nodelist/authcert.c:trusted_dirs_load_certs_f
 problem function-size /src/feature/nodelist/authcert.c:authority_certs_fetch_missing() 295
 problem function-size /src/feature/nodelist/fmt_routerstatus.c:routerstatus_format_entry() 162
 problem function-size /src/feature/nodelist/microdesc.c:microdesc_cache_rebuild() 134
-<<<<<<< HEAD
-problem include-count /src/feature/nodelist/networkstatus.c 62
+problem include-count /src/feature/nodelist/networkstatus.c 63
 problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_check_consensus_signature() 175
 problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_set_current_consensus() 289
 problem function-size /src/feature/nodelist/node_select.c:router_pick_directory_server_impl() 122
 problem function-size /src/feature/nodelist/node_select.c:compute_weighted_bandwidths() 203
 problem function-size /src/feature/nodelist/node_select.c:router_pick_trusteddirserver_impl() 112
 problem function-size /src/feature/nodelist/nodelist.c:compute_frac_paths_available() 190
-=======
-problem include-count /src/feature/nodelist/networkstatus.c 63
-problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_check_consensus_signature() 176
-problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_set_current_consensus() 293
-problem function-size /src/feature/nodelist/node_select.c:router_pick_directory_server_impl() 123
-problem function-size /src/feature/nodelist/node_select.c:compute_weighted_bandwidths() 206
-problem function-size /src/feature/nodelist/node_select.c:router_pick_trusteddirserver_impl() 114
-problem function-size /src/feature/nodelist/nodelist.c:compute_frac_paths_available() 193
->>>>>>> hs-v3: Add consensus parameters for DoS defenses
 problem file-size /src/feature/nodelist/routerlist.c 3239
 problem function-size /src/feature/nodelist/routerlist.c:router_rebuild_store() 148
 problem function-size /src/feature/nodelist/routerlist.c:router_add_to_routerlist() 168