[tor-commits] [tor/master] Merge branch 'maint-0.2.9'

[nickm at torproject.org]

commit 3e3040a5d911e6c4ae59114a0f98daf09ee299bc
Merge: 7236e42 9994404
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 16:31:40 2016 -0500

    Merge branch 'maint-0.2.9'
    
    Conflicts:
    	src/or/rendservice.c

 changes/20460              |  4 +--
 changes/bug20484           |  5 +++
 changes/bug20529           |  4 +++
 changes/bug20587           |  1 -
 changes/bug20588           |  2 +-
 changes/geoip-november2016 |  2 +-
 doc/tor.1.txt              |  4 +++
 src/common/util.c          | 12 +++++---
 src/or/rendservice.c       | 76 +++++++++++++++++++++++++++++++---------------
 src/test/test.h            |  1 +
 src/test/test_hs.c         | 55 +++++++++++++++++++--------------
 src/test/testing_common.c  | 34 ++++++++++++++++++---
 12 files changed, 139 insertions(+), 61 deletions(-)

diff --cc src/test/test.h
index 15ccf5c,25336ac..49b4499
--- a/src/test/test.h
+++ b/src/test/test.h
@@@ -73,9 -73,8 +73,10 @@@
      {print_ = (I64_PRINTF_TYPE) value_;}, {}, TT_EXIT_TEST_FUNCTION)
  
  const char *get_fname(const char *name);
+ const char *get_fname_rnd(const char *name);
  struct crypto_pk_t *pk_generate(int idx);
 +void init_pregenerated_keys(void);
 +void free_pregenerated_keys(void);
  
  #define US2_CONCAT_2__(a, b) a ## __ ## b
  #define US_CONCAT_2__(a, b) a ## _ ## b