Merge remote-tracking branch 'origin/maint-0.2.5'

This commit is contained in:
Nick Mathewson 2015-01-07 07:50:14 -05:00
commit 49dca8b1be
2 changed files with 6 additions and 1 deletions

5
changes/bug14125 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (dirauth):
- Enlarge the buffer to read bw-auth generated files to avoid an
issue when parsing the file in dirserv_read_measured_bandwidths().
Bugfix on 0.2.2.1-alpha, fixes #14125.

View File

@ -2260,7 +2260,7 @@ int
dirserv_read_measured_bandwidths(const char *from_file,
smartlist_t *routerstatuses)
{
char line[256];
char line[512];
FILE *fp = tor_fopen_cloexec(from_file, "r");
int applied_lines = 0;
time_t file_time, now;