Merge branch 'bug1863_bwhist' into maint-0.2.2
commitaa178aae03048caf24ce5df4b2d643c7e7afdc7b
authorNick Mathewson <nickm@torproject.org>
Fri, 25 Feb 2011 16:22:12 +0000 (25 11:22 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 25 Feb 2011 16:22:12 +0000 (25 11:22 -0500)
tree62c06c2a1dc0f278dcd7f6d184bdf90dee81234d
parent16b8b9b00f414343030c29990930c0e52a01fd84
parent0642b927928df4ec556a76fed4b0b4523d515a7d
Merge branch 'bug1863_bwhist' into maint-0.2.2
src/or/config.c
src/or/or.h