Merge remote-tracking branch 'origin/maint-0.2.2'

src/common/compat.c

@@ -2163,7 +2163,6 @@ correct_tm(int islocal, const time_t *timep, struct tm *resultbuf,
   return r;
 }
 
-
 /** @{ */
 /** As localtime_r, but defined for platforms that don't have it:
  *

src/or/rendclient.c

@@ -278,7 +278,7 @@ rend_client_send_introduction(origin_circuit_t *introcirc,
   introcirc->_base.purpose = CIRCUIT_PURPOSE_C_INTRODUCE_ACK_WAIT;
 
   return 0;
-perm_err:
+ perm_err:
   if (!introcirc->_base.marked_for_close)
     circuit_mark_for_close(TO_CIRCUIT(introcirc), END_CIRC_REASON_INTERNAL);
   circuit_mark_for_close(TO_CIRCUIT(rendcirc), END_CIRC_REASON_INTERNAL);