diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-01-16 15:07:58 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-01-16 15:07:58 -0500 |
commit | 2bd40a8eb0be195022558addb868edf56162f9dc (patch) | |
tree | 7e234f80696dd17f212afba95b75e81a632bd03e /src/or/dirserv.c | |
parent | 79bb44c219af8f88573fb33954e5d2e16ef8fe42 (diff) | |
parent | 5579bc0eafc7ef426922e23340a5f885f8e8d4e9 (diff) | |
download | tor-2bd40a8eb0be195022558addb868edf56162f9dc.tar.gz tor-2bd40a8eb0be195022558addb868edf56162f9dc.zip |
Merge branch 'bug4889_v2'
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r-- | src/or/dirserv.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e5995697dd..cc8dffb7ff 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2906,9 +2906,7 @@ generate_v2_networkstatus_opinion(void) contact = "(none)"; if (versioning) { - size_t v_len = 64+strlen(client_versions)+strlen(server_versions); - version_lines = tor_malloc(v_len); - tor_snprintf(version_lines, v_len, + tor_asprintf(&version_lines, "client-versions %s\nserver-versions %s\n", client_versions, server_versions); } else { |