commit 54d6e5e71e604ffedcb3c0a2aeff4b39bc9e37db Merge: 9bdce9d 21fd94d Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 18 14:27:00 2015 -0400

Merge remote-tracking branch 'public/feature15053'

.gitignore | 4 ++ Doxyfile.in | 6 +-- Makefile.am | 47 ++++++++++++++--------- changes/bug15053 | 4 ++ configure.ac | 8 ++-- doc/include.am | 4 +- scripts/maint/checkOptionDocs.pl | 71 ----------------------------------- scripts/maint/checkOptionDocs.pl.in | 69 ++++++++++++++++++++++++++++++++++ scripts/maint/updateVersions.pl | 59 ----------------------------- scripts/maint/updateVersions.pl.in | 59 +++++++++++++++++++++++++++++ src/common/crypto.c | 4 +- src/common/include.am | 6 +-- src/common/tortls.c | 4 +- src/ext/eventdns.c | 2 +- src/or/buffers.c | 4 +- src/or/dns.c | 2 +- src/or/include.am | 43 +++++++++++---------- src/or/main.c | 2 +- src/or/or.h | 2 +- src/or/routerlist.c | 2 +- src/test/include.am | 10 ++--- src/tools/tor-checkkey.c | 2 +- src/tools/tor-gencert.c | 4 +- src/tools/tor-resolve.c | 4 +- 24 files changed, 220 insertions(+), 202 deletions(-)