commit 9b825ffc4ffbff946a1fc7f5a4cfedf8e5317e79 Merge: 78b431d 703ad69 Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 28 12:00:50 2014 -0400

Merge branch 'bug8966_v5'

.gitignore | 19 +- Makefile.am | 6 +- changes/ticket8966 | 7 + configure.ac | 12 +- contrib/add-tor | 115 ------- contrib/auto-naming/README | 6 - contrib/bundle.nsi | 67 ---- contrib/check-tor | 41 --- contrib/checkLogs.pl | 51 ---- contrib/checkOptionDocs.pl | 70 ----- contrib/checkSpace.pl | 138 --------- contrib/checksocks.pl | 83 ----- contrib/client-tools/tor-resolve.py | 153 ++++++++++ contrib/client-tools/torify | 61 ++++ contrib/cov-blame | 48 --- contrib/cov-diff | 17 -- contrib/coverage | 46 --- contrib/cross.sh | 195 ------------ contrib/dirauth-tools/add-tor | 115 +++++++ .../dirauth-tools/nagios-check-tor-authority-cert | 86 ++++++ contrib/directory-archive/crontab.sample | 3 - contrib/directory-archive/fetch-all | 77 ----- contrib/directory-archive/fetch-all-functions | 82 ----- contrib/directory-archive/fetch-all-v3 | 111 ------- contrib/directory-archive/sort-into-month-folder | 74 ----- contrib/directory-archive/tar-them-up | 127 -------- contrib/dist/rc.subr | 43 +++ contrib/dist/suse/tor.sh.in | 118 +++++++ contrib/dist/tor.sh.in | 123 ++++++++ contrib/dist/torctl.in | 195 ++++++++++++ contrib/exitlist | 323 -------------------- contrib/findMergedChanges.pl | 73 ----- contrib/format_changelog.py | 162 ---------- contrib/include.am | 28 +- contrib/linux-tor-prio.sh | 192 ------------ contrib/make-signature.sh | 79 ----- contrib/mdd.py | 169 ---------- contrib/nagios-check-tor-authority-cert | 86 ------ contrib/netinst.nsi | 74 ----- contrib/operator-tools/linux-tor-prio.sh | 192 ++++++++++++ contrib/operator-tools/tor-exit-notice.html | 144 +++++++++ contrib/operator-tools/tor.logrotate.in | 14 + contrib/or-tools/check-tor | 41 +++ contrib/or-tools/checksocks.pl | 83 +++++ contrib/or-tools/exitlist | 323 ++++++++++++++++++++ contrib/package_nsis-mingw.sh | 95 ------ contrib/package_nsis-weasel.sh | 90 ------ contrib/package_nsis.sh | 57 ---- contrib/polipo/Makefile.mingw | 100 ------ contrib/polipo/README | 47 --- contrib/polipo/polipo-mingw.nsi | 172 ----------- contrib/rc.subr | 43 --- contrib/redox.py | 228 -------------- contrib/scan-build.sh | 49 --- contrib/sd | 84 ----- contrib/suse/include.am | 1 - contrib/suse/tor.sh.in | 118 ------- contrib/tor-ctrl.sh | 212 ------------- contrib/tor-exit-notice.html | 144 --------- contrib/tor-mingw.nsi.in | 274 ----------------- contrib/tor-resolve.py | 153 ---------- contrib/tor-stress | 27 -- contrib/tor.ico | Bin 82726 -> 0 bytes contrib/tor.logrotate.in | 14 - contrib/tor.nsi.in | 214 ------------- contrib/tor.sh.in | 123 -------- contrib/torctl.in | 195 ------------ contrib/torify | 61 ---- contrib/torinst32.ico | Bin 4286 -> 0 bytes contrib/updateVersions.pl | 59 ---- contrib/win32build/package_nsis-mingw.sh | 95 ++++++ contrib/win32build/tor-mingw.nsi.in | 274 +++++++++++++++++ contrib/win32build/tor.ico | Bin 0 -> 82726 bytes contrib/win32build/tor.nsi.in | 214 +++++++++++++ contrib/xenobite.ico | Bin 1150 -> 0 bytes doc/HACKING | 4 +- doc/tor.1.txt | 2 +- scripts/maint/checkLogs.pl | 51 ++++ scripts/maint/checkOptionDocs.pl | 70 +++++ scripts/maint/checkSpace.pl | 138 +++++++++ scripts/maint/findMergedChanges.pl | 73 +++++ scripts/maint/format_changelog.py | 162 ++++++++++ scripts/maint/redox.py | 228 ++++++++++++++ scripts/maint/updateVersions.pl | 59 ++++ scripts/test/cov-blame | 48 +++ scripts/test/cov-diff | 17 ++ scripts/test/coverage | 46 +++ scripts/test/scan-build.sh | 49 +++ 88 files changed, 3252 insertions(+), 5110 deletions(-)