Merge branch 'bug8546_squashed'

Conflicts:
	src/or/connection.c
	src/or/or.h
	src/or/relay.c
This commit is contained in:
Nick Mathewson
2015-01-16 09:31:50 -05:00
10 changed files with 175 additions and 253 deletions
+6
View File
@@ -0,0 +1,6 @@
o Code simplification and refactoring:
- Move fields related to isolating and configuring client ports
into a shared structure. Previously, they were duplicated across
port_cfg_t, listener_connection_t, and edge_connection_t.
Failure to copy one of them correctly had been the cause of at
least one bug in the past.