Expose parse_client_transport_line() and parse_server_transport_line() for the test suite
Add some mocks needed to unit test ClientTransportPlugin/ServerTransportPlugin config line parsing
Add unit test for ClientTransportPlugin/ServerTransportPlugin config line parsing
Replace all calls to parse_client_transport_line() or parse_server_transport_line() with new parse_transport_line() stub
Merge and refactor redundant parse_client_transport_line() and parse_server_transport_line() functions
Add comments and rename intro_nodes list in rend_services_introduce()

(No changes file needed: this patch just adds comments and renames
variables. This is ticket 13646. message taken from the ticket. -Nick)
Check descriptor ID in addition to HS ID when saving a v2 hs descriptor

Fixes bug 13214; reported by 'special'.
Merge remote-tracking branch 'public/bug13214_025_squashed'
Introducing helper function to validate DNS name strings.
Introducing helper function to validate IPv4 address strings.
Validating SOCKS5 hostname more correctly.
Adding helper function that checks if string is a valid IPv6 address.
Checking if FQDN is actually IPv6 address string and handling that case.
Adding changes file for 13315.
Sending 'Not allowed' error message before closing the connection.
Use correct argument types for inet_pton.

(I blame whoever decided that using a void* for a union was a good
idea.)
fix indentation
Merge branch 'bug13315_squashed'

Conflicts:
	src/or/buffers.c
Update verbiage in README to mention autogen.sh

Closes ticket 13190
Merge remote-tracking branch 'andrea/ticket6456'

Somewhat tricky conflicts:
	src/or/config.c

Also, s/test_assert/tt_assert in test_config.c