Merge remote-tracking branch 'origin/maint-0.2.4'
commit6178aaea0698d7f62754c2aa1574ad7fd4fa781d
authorNick Mathewson <nickm@torproject.org>
Fri, 20 Sep 2013 15:01:10 +0000 (20 11:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 20 Sep 2013 15:01:10 +0000 (20 11:01 -0400)
treed60df65fdf156d8caffb572acb79ff76a37c47d1
parentee01e41937947eb77c02f552d59090c0ea280f98
parent07bb17185681f875be461c4fea6c661fae2dfde9
Merge remote-tracking branch 'origin/maint-0.2.4'
doc/tor.1.txt
src/or/config.c
src/or/connection_or.c
src/or/or.h
src/or/rendclient.c
src/or/rendservice.c