[tor-commits] [tor/master] Merge remote-tracking branch 'rransom-tor/bug3332-v2'

[nickm at torproject.org]

commit a857f61e278aa5e5980722f9d458424b8790e9b1
Merge: 875a551 44eafa9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 15 11:33:40 2011 -0400

    Merge remote-tracking branch 'rransom-tor/bug3332-v2'

 changes/bug3332      |    9 +++++++++
 src/or/directory.c   |   17 +++++++++++++++++
 src/or/rendclient.c  |    4 ++++
 src/or/rendservice.c |    3 +++
 4 files changed, 33 insertions(+), 0 deletions(-)

diff --cc src/or/rendservice.c
index af1a290,80fa357..4413ae9
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@@ -903,8 -903,9 +903,9 @@@ rend_service_introduce(origin_circuit_
    time_t now = time(NULL);
    char diffie_hellman_hash[DIGEST_LEN];
    time_t *access_time;
 -  or_options_t *options = get_options();
 +  const or_options_t *options = get_options();
  
+   tor_assert(!(circuit->build_state->onehop_tunnel));
    tor_assert(circuit->rend_data);
  
    base32_encode(serviceid, REND_SERVICE_ID_LEN_BASE32+1,