]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Wed, 19 Nov 2014 22:26:42 +0000 (17:26 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 19 Nov 2014 22:26:42 +0000 (17:26 -0500)
commit0872d8e3cf3281fc5831375252db9e39de12e927
treee5375ae2b2bea3ef0ac9be40f39b97881e0c228d
parent6c146f9c83e24dc3ae74f56f93d4e7caf570e98b
parentdca902ceba4d2440520d357ccc2e00b8aa59eb8b
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
src/or/config.c