diff --git a/src/or/directory.c b/src/or/directory.c index 7fe78954c6..21f4446936 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -581,7 +581,10 @@ directory_send_command(connection_t *conn, const char *platform, } if (strlen(proxystring) + strlen(url) >= 4096) { - warn(LD_BUG,"Bug: squid does not like URLs longer than 4095 bytes, this one is %d bytes long: %s%s", (int)(strlen(proxystring) + strlen(url)), proxystring, url); + warn(LD_BUG, + "Bug: squid does not like URLs longer than 4095 bytes, this " + "one is %d bytes long: %s%s", + (int)(strlen(proxystring) + strlen(url)), proxystring, url); } tor_snprintf(request, sizeof(request), "%s %s", httpcommand, proxystring); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 03fe208221..2f177a4c65 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -3313,12 +3313,12 @@ router_list_client_downloadable(void) static void update_router_descriptor_client_downloads(time_t now) { - /* Max amount of hashes to download per request. - * Since squid does not like URLs >= 4096 bytes we limit it to 96. - * 4096 - strlen(http://255.255.255.255/tor/server/d/.z) == 4058 - * 4058/41 (40 for the hash and 1 for the + that separates them) => 98 - * So use 96 because it's a nice number. - */ + /* Max amount of hashes to download per request. + * Since squid does not like URLs >= 4096 bytes we limit it to 96. + * 4096 - strlen(http://255.255.255.255/tor/server/d/.z) == 4058 + * 4058/41 (40 for the hash and 1 for the + that separates them) => 98 + * So use 96 because it's a nice number. + */ #define MAX_DL_PER_REQUEST 96 #define MIN_DL_PER_REQUEST 4 #define MIN_REQUESTS 3