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

src/or/config.h

@@ -102,6 +102,5 @@ int addressmap_register_auto(const char *from, const char *to,
                              addressmap_entry_source_t addrmap_source,
                              const char **msg);
 
-
 #endif