Merge branch 'bug1751_enabling' into maint-0.2.2
commitc97072ef34c20fdf854444bb28446b53f67ba7bf
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 21:08:03 +0000 (27 17:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 21:08:03 +0000 (27 17:08 -0400)
tree85efe9f94380c938a3842d843cbc93319d837f13
parente3859615429ec8d3939e21cd65fa07cc56bb5d0c
parent6c5b9ba6258c8e79be9f96a3ec377600d0066356
Merge branch 'bug1751_enabling' into maint-0.2.2
src/or/config.c
src/or/or.h