Merge branch 'maint-0.2.1' into maint-0.2.2

Conflicts:
	src/or/main.c
	src/or/router.c

diff --cc src/or/main.c
index bc639dbdd8cd2471eab4e4e9578b60ed352d5b11,3c879dcd0e362ec6ac8b2c1cd27fab680746ee51..289d805503f35811e2a8bb48958abffdee5625d1
--- 1/src/or/main.c
--- 2/src/or/main.c
+++ b/src/or/main.c
@@@ -937,18 -866,14 +937,19 @@@ run_scheduled_events(time_t now
        now + DESCRIPTOR_FAILURE_RESET_INTERVAL;
    }
  
-   /** 1b. Every MAX_SSL_KEY_LIFETIME seconds, we change our TLS context. */
 +  if (options->UseBridges)
 +    fetch_bridge_descriptors(options, now);
 +
+   /** 1b. Every MAX_SSL_KEY_LIFETIME_INTERNAL seconds, we change our
+    * TLS context. */
    if (!last_rotated_x509_certificate)
      last_rotated_x509_certificate = now;
-   if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME < now) {
+   if (last_rotated_x509_certificate+MAX_SSL_KEY_LIFETIME_INTERNAL < now) {
      log_info(LD_GENERAL,"Rotating tls context.");
 -    if (tor_tls_context_new(get_identity_key(),
 -                            MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) {
 +    if (tor_tls_context_init(public_server_mode(options),
 +                             get_tlsclient_identity_key(),
 +                             is_server ? get_server_identity_key() : NULL,
-                              MAX_SSL_KEY_LIFETIME) < 0) {
++                             MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) {
        log_warn(LD_BUG, "Error reinitializing TLS context");
        /* XXX is it a bug here, that we just keep going? -RD */
      }

diff --cc src/or/or.h
Simple merge

diff --cc src/or/router.c
index 2165e6ea90c211586c066578b589ecc2c54cff8a,2afde746d453c20c4260836edf791cb7865d006f..365e888af94fe5269b0620211204dcb56ac4bb05
--- 1/src/or/router.c
--- 2/src/or/router.c
+++ b/src/or/router.c
@@@ -521,12 -456,10 +521,12 @@@ init_keys(void
        crypto_free_pk_env(prkey);
        return -1;
      }
 -    set_identity_key(prkey);
 -    /* Create a TLS context; default the client nickname to "client". */
 -    if (tor_tls_context_new(get_identity_key(),
 -                            MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) {
 +    set_client_identity_key(prkey);
 +    /* Create a TLS context. */
 +    if (tor_tls_context_init(0,
 +                             get_tlsclient_identity_key(),
 +                             NULL,
-                              MAX_SSL_KEY_LIFETIME) < 0) {
++                             MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) {
        log_err(LD_GENERAL,"Error creating TLS context for Tor client.");
        return -1;
      }
@@@ -619,10 -537,8 +619,10 @@@
    tor_free(keydir);
  
    /* 3. Initialize link key and TLS context. */
 -  if (tor_tls_context_new(get_identity_key(),
 -                          MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) {
 +  if (tor_tls_context_init(public_server_mode(options),
 +                           get_tlsclient_identity_key(),
 +                           get_server_identity_key(),
-                            MAX_SSL_KEY_LIFETIME) < 0) {
++                           MAX_SSL_KEY_LIFETIME_ADVERTISED) < 0) {
      log_err(LD_GENERAL,"Error initializing TLS context");
      return -1;
    }