6 Commits

Author	SHA1	Message	Date
Nick Mathewson	6f20a74d52	Merge branch 'bug8240_v2_squashed' into maint-0.2.4 ... Conflicts: doc/tor.1.txt src/or/circuitbuild.c src/or/config.c src/or/or.h	2013-03-19 16:15:27 -04:00
Nick Mathewson	1827be0bd6	Make a parse_config_line_from_str variant that gives error messages ... Without this patch, there's no way to know what went wrong when we fail to parse a torrc line entirely (that is, we can't turn it into a K,V pair.) This patch introduces a new function that yields an error message on failure, so we can at least tell the user what to look for in their nonfunctional torrc. (Actually, it's the same function as before with a new name: parse_config_line_from_str is now a wrapper macro that the unit tests use.) Fixes bug 7950; fix on 0.2.0.16-alpha (58de695f90) which first introduced the possibility of a torrc value not parsing correctly.	2013-02-19 17:36:17 -05:00
Nick Mathewson	4da083db3b	Update the copyright date to 201.	2013-01-16 01:54:56 -05:00
Nick Mathewson	d995dc8bac	Split the routerset code out of routerlist.c	2012-09-14 10:20:00 -04:00
Nick Mathewson	2eb2536c0a	Remove all remaining spurious or_options_t invocations in confparse.c	2012-09-13 12:20:25 -04:00
Nick Mathewson	7627b2c187	Split the generic config_fmt_t code into a new confparse.c file ... This helps us split up one of our larger files, and sets the stage for refactoring the configuration backend a little	2012-09-13 12:20:25 -04:00