Commit Graph

4 Commits

Author SHA1 Message Date
Adam Hamsik
e6b5f245f7 Merge branch 'rofl0r-master'
Conflicts:
	Makefile
	proxychains.lsm
	src/core.h
	src/libproxychains.c
	src/main.c
2012-07-24 14:02:18 +02:00
rofl0r
40bb78b53f fix omission in common.c 2012-07-16 02:42:09 +02:00
rofl0r
e5e87c8f22 put abort functionality into get_config_path to further reduce code duplication 2012-07-08 23:47:56 +02:00
rofl0r
fba5f5694c use config file lookup routine from a common place 2012-07-08 23:32:50 +02:00